sw/uiconfig/swriter/popupmenu/notebookbar.xml | 14 -
sw/uiconfig/swriter/ui/notebookbar.ui | 235 +++++++++++++++-----------
2 files changed, 146 insertions(+), 103 deletions(-)
New commits:
commit 0d3d7be7632902ebc4844f12dfc820f05be2021a
Author: andreas kainz <kain...@gmail.com>
Date: Wed Apr 18 23:20:43 2018 +0200
NB Implementation: update notebookbar wheel popupmenu for writer
Change-Id: Iaf0df12029298f775ba8c2a7502465e1f7f67159
Reviewed-on: https://gerrit.libreoffice.org/53132
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/popupmenu/notebookbar.xml
b/sw/uiconfig/swriter/popupmenu/notebookbar.xml
index 26168beb00e4..cb6a1267fda3 100644
--- a/sw/uiconfig/swriter/popupmenu/notebookbar.xml
+++ b/sw/uiconfig/swriter/popupmenu/notebookbar.xml
@@ -9,13 +9,15 @@
-->
<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu";>
<menu:menuitem menu:id=".uno:AddDirect"/>
- <menu:menuitem menu:id=".uno:OpenFromWriter"/>
<menu:menuitem menu:id=".uno:RecentFileList"/>
- <menu:menuitem menu:id=".uno:Save"/>
- <menu:menuitem menu:id=".uno:Undo"/>
- <menu:menuitem menu:id=".uno:Redo"/>
- <menu:menuitem menu:id=".uno:Print"/>
- <menu:menuitem menu:id=".uno:Menubar"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:ToolbarMode"/>
+ <menu:menuitem menu:id=".uno:AvailableToolbars"/>
<menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpIndex"/>
+ <menu:menuitem menu:id=".uno:Donation"/>
+ <menu:menuitem menu:id=".uno:About"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:CloseDoc"/>
</menu:menupopup>
commit 3204ed1802704efac582d10e0f484174bebca0be
Author: andreas kainz <kain...@gmail.com>
Date: Wed Apr 18 22:48:25 2018 +0200
NB Implementation: update writer tabbed toolbar
Change-Id: I6e62053836a279c487bc5d3eeba9032b4ec72852
Reviewed-on: https://gerrit.libreoffice.org/53128
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 830ac5dac287..11ed57620371 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -257,13 +257,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="ExportToD">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:ExportTo</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="ExportToPDFD">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -331,17 +324,10 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="SignatureD">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:Signature</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="SignPDFD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:SignPDF</property>
+ <property name="action_name">.uno:SetDocumentProperties</property>
</object>
</child>
</object>
@@ -2145,14 +2131,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="margin_right">5</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="svtlo-ManagedMenuButton"
id="filetab:MenuFile">
- <property name="label" translatable="yes"
context="notebookbar|fileb">_File</property>
+ <property name="label" translatable="yes"
context="notebookbar_compact|fileb">_File</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
@@ -2169,9 +2154,9 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton"
id="helpb:MenuHelp">
- <property name="label" translatable="yes"
context="notebookbar|fileb">_Help</property>
+ <property name="label" translatable="yes"
context="notebookbar_compact|fileb">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
@@ -2206,7 +2191,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="margin_left">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
@@ -2242,16 +2226,14 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="AddDirect">
+ <object class="GtkMenuToolButton" id="New">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
<property
name="action_name">.uno:AddDirect</property>
- <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
</object>
@@ -2390,7 +2372,7 @@
<object class="svtlo-ManagedMenuButton"
id="RecentFilesB">
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="action_name">.uno:RecentFileList</property>
<property
name="image">RecentFilesImg</property>
@@ -4509,6 +4491,7 @@
<property name="label" translatable="yes"
context="notebookbar|HomeLabel">Home</property>
<property name="use_underline">True</property>
<style>
+ <class name="context-default"/>
<class name="context-any"/>
<class name="context-Text"/>
<class name="context-DrawText"/>
@@ -4716,10 +4699,10 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="InsertObjectStarMath2">
+ <object class="GtkToolButton"
id="InsertObject">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertObjectStarMath</property>
+ <property
name="action_name">.uno:InsertObject</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4988,7 +4971,7 @@
</packing>
</child>
<style>
- <class name="priority-5"/>
+ <class name="priority-6"/>
</style>
</object>
<packing>
@@ -5046,7 +5029,7 @@
</packing>
</child>
<style>
- <class name="priority-4"/>
+ <class name="priority-5"/>
</style>
</object>
<packing>
@@ -5231,7 +5214,7 @@
</packing>
</child>
<style>
- <class name="priority-3"/>
+ <class name="priority-4"/>
</style>
</object>
<packing>
@@ -5363,7 +5346,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-3"/>
</style>
</object>
<packing>
@@ -5373,6 +5356,64 @@
</packing>
</child>
<child>
+ <object class="sfxlo-OptionalBox" id="AutoTextSection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom78">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
+ <child>
+ <object class="GtkToolButton" id="EditGlossary1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:EditGlossary</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <style>
+ <class name="priority-2"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
<object class="sfxlo-OptionalBox" id="SymbolSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -5418,14 +5459,14 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="EditGlossary1">
+ <object class="GtkToolButton"
id="InsertObjectStarMath1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:EditGlossary</property>
+ <property
name="action_name">.uno:InsertObjectStarMath</property>
</object>
<packing>
<property name="expand">False</property>
- <property
name="homogeneous">False</property>
+ <property
name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -5488,7 +5529,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -7973,7 +8014,7 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="EditDoc1">
+ <object class="GtkToolButton" id="PrintPreview2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="action_name">.uno:PrintPreview</property>
@@ -8075,13 +8116,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="VisibleSection">
+ <object class="sfxlo-OptionalBox" id="ZoomSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom22">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -8090,10 +8131,10 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="Navigator">
+ <object class="GtkToolButton" id="ZoomOptimal1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Navigator</property>
+ <property
name="action_name">.uno:ZoomOptimal</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8108,61 +8149,57 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB48">
+ <object class="GtkBox" id="GroupB51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin5">
+ <object class="sfxlo-NotebookbarToolBox"
id="LineA28">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Ruler2">
+ <object class="GtkToolButton"
id="Zoom100Percent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Ruler</property>
+ <property
name="action_name">.uno:Zoom100Percent</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property
name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="belowspacing4">
+ <object class="sfxlo-NotebookbarToolBox"
id="LineB29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="GridVisible2">
+ <object class="GtkToolButton" id="ZoomPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:GridVisible</property>
+ <property
name="action_name">.uno:ZoomPage</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property
name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -8174,25 +8211,23 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB46">
+ <object class="GtkBox" id="GroupB50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin6">
+ <object class="sfxlo-NotebookbarToolBox"
id="LineA26">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Menubar">
+ <object class="GtkToolButton"
id="FullScreen1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Menubar</property>
+ <property
name="action_name">.uno:FullScreen</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8202,23 +8237,21 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="belowspacing6">
+ <object class="sfxlo-NotebookbarToolBox"
id="LineB27">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Sidebar2">
+ <object class="GtkToolButton"
id="ZoomPageWidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Sidebar</property>
+ <property
name="action_name">.uno:ZoomPageWidth</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8228,7 +8261,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -8240,7 +8273,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator29">
+ <object class="GtkSeparator" id="separator120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8251,7 +8284,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<style>
@@ -8265,13 +8298,13 @@
</packing>
</child>
<child>
- <object class="sfxlo-OptionalBox" id="ZoomSection">
+ <object class="sfxlo-OptionalBox" id="VisibleSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom24">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -8280,10 +8313,10 @@
<property name="show_arrow">False</property>
<property name="icon_size">3</property>
<child>
- <object class="GtkToolButton" id="ZoomOptimal1">
+ <object class="GtkToolButton" id="Sidebar2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ZoomOptimal</property>
+ <property
name="action_name">.uno:Sidebar</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8298,57 +8331,61 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB51">
+ <object class="GtkBox" id="GroupB48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LineA28">
+ <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Zoom100Percent">
+ <object class="GtkToolButton" id="Ruler2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:Zoom100Percent</property>
+ <property
name="action_name">.uno:Ruler</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property
name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LineB29">
+ <object class="sfxlo-NotebookbarToolBox"
id="belowspacing4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="ZoomPage">
+ <object class="GtkToolButton"
id="GridVisible2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ZoomPage</property>
+ <property
name="action_name">.uno:GridVisible</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property
name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -8360,23 +8397,25 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="GroupB50">
+ <object class="GtkBox" id="GroupB46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LineA26">
+ <object class="sfxlo-NotebookbarToolBox"
id="LeftParaMargin6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="FullScreen1">
+ <object class="GtkToolButton" id="Menubar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:FullScreen</property>
+ <property
name="action_name">.uno:Menubar</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8386,21 +8425,23 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="LineB27">
+ <object class="sfxlo-NotebookbarToolBox"
id="belowspacing6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="ZoomPageWidth">
+ <object class="GtkToolButton" id="Navigator">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ZoomPageWidth</property>
+ <property
name="action_name">.uno:Navigator</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8410,7 +8451,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -8422,7 +8463,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator120">
+ <object class="GtkSeparator" id="separator29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
@@ -8433,7 +8474,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<style>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
