Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct command for style sidebar #11264

Merged
merged 1 commit into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions browser/css/spreadsheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,6 @@
z-index: -1;
}

/* Sidebar: Style: Hide dialog button
- There is no paragraph style dialog in calc
- The style sidebar pane visible on core side is not implemented in online
*/
[data-docType='spreadsheet'] .unoEditStyle.sidebar {
display: none;
}

/* formulabar */
#formulabar-row {
display: grid;
Expand Down
6 changes: 4 additions & 2 deletions browser/src/control/Control.Menubar.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:RejectAllTrackedChanges', 'text'), id: 'rejectalltrackedchanges', type: 'action'},
{uno: '.uno:PreviousTrackedChange'},
{uno: '.uno:NextTrackedChange'}
]},
{uno: '.uno:EditStyle'}
]}
]},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu',
menu: (window.mode.isTablet() ? [
Expand All @@ -148,6 +147,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Dark Mode'), id: 'toggledarktheme', type: 'action'},
{name: _('Invert Background'), id: 'invertbackground', type: 'action'},
{uno: '.uno:SidebarDeck.PropertyDeck', name: _UNO('.uno:Sidebar')},
{uno: '.uno:SidebarDeck.StyleListDeck', name: _('Style list')},
{uno: '.uno:Navigator', id: 'navigator'},
{type: 'separator'},
{name: _UNO('.uno:ShowAnnotations', 'text'), id: 'showannotations', type: 'action'},
Expand Down Expand Up @@ -767,6 +767,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Invert Background'), id: 'invertbackground', type: 'action'},
{uno: '.uno:SidebarDeck.PropertyDeck', name: _UNO('.uno:Sidebar')},
{uno: '.uno:Navigator', id: 'navigator'},
{uno: '.uno:SidebarDeck.StyleListDeck', name: _('Style list')},
{type: 'separator'},
{name: _UNO('.uno:ToggleSheetGrid', 'spreadsheet', true), uno: '.uno:ToggleSheetGrid', id: 'sheetgrid'},
{name: _('Focus Cell'), type:'action', id: 'columnrowhighlight'},
Expand Down Expand Up @@ -899,6 +900,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:SetOptimalColumnWidth'}]},
{uno: '.uno:FontDialog'},
{uno: '.uno:ParagraphDialog'},
{uno: '.uno:SidebarDeck.StyleListDeck'},
{uno: '.uno:PageFormatDialog'},
{type: 'separator'},
{uno: '.uno:TransformDialog'},
Expand Down
1 change: 0 additions & 1 deletion browser/src/unocommands.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ var unoCommandsArray = {
'EditRegion':{text:{menu:_('~Sections...'),},},
'EditSparkline':{spreadsheet:{menu:_('Edit Sparkline...'),},},
'EditSparklineGroup':{spreadsheet:{menu:_('Edit Sparkline Group...'),},},
'EditStyle':{global:{menu:_('~Edit Style...'),},presentation:{menu:_('E~dit Style...'),},},
'EnterGroup':{global:{menu:_('~Enter Group'),},},
'EntireCell':{text:{context:_('Select Cell'),menu:_('C~ell'),},},
'EntireColumn':{presentation:{menu:_('Select Column'),},text:{menu:_('~Column'),},},
Expand Down