Resolves tdf#173101 - Labeling & placement fixes for the File tab
* Save as Template button removed (exists in the Save button menu) * Template made a big button * Redudant "File" label renamed to "Document" Change-Id: Ibab7e4758fd8d12e85003fbcdbc916c287f9ed5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209450 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
committed by
Heiko Tietze
Heiko Tietze
parent
818a469f17
commit
eedc6c3678
@@ -2189,29 +2189,6 @@
|
||||
<property name="margin-bottom">6</property>
|
||||
<property name="row-spacing">3</property>
|
||||
<property name="column-spacing">3</property>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
<property name="action-name">.uno:NewDoc</property>
|
||||
<property name="use-underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileAddDirect">
|
||||
<property name="visible">True</property>
|
||||
@@ -2239,15 +2216,18 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSaveAsTemplate">
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="toolbar-style">both</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<property name="icon_size">3</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileSaveAsTemplate">
|
||||
<object class="GtkToolButton" id="btnFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
<property name="action-name">.uno:SaveAsTemplate</property>
|
||||
<property name="action-name">.uno:NewDoc</property>
|
||||
<property name="use-underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -2258,7 +2238,8 @@
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">1</property>
|
||||
<property name="top-attach">0</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
@@ -2317,7 +2298,7 @@
|
||||
<object class="GtkLabel" id="lbFileFile">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="label" translatable="yes" context="TabbedCalc|labelFileFile">File</property>
|
||||
<property name="label" translatable="yes" context="TabbedCalc|labelFileFile">Document</property>
|
||||
<attributes>
|
||||
<attribute name="style" value="italic"/>
|
||||
<attribute name="scale" value="0.9"/>
|
||||
|
||||
@@ -2365,8 +2365,11 @@
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSearchDialog">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="toolbar-style">both</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<property name="icon_size">3</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
@@ -2382,29 +2385,7 @@
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="action-name">.uno:SaveAsTemplate</property>
|
||||
<property name="use-underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">1</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
@@ -2446,7 +2427,7 @@
|
||||
<property name="can-focus">False</property>
|
||||
<property name="valign">end</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="label" translatable="yes" context="TabbedDraw|labelFileFile">File</property>
|
||||
<property name="label" translatable="yes" context="TabbedDraw|labelFileFile">Document</property>
|
||||
<attributes>
|
||||
<attribute name="style" value="italic"/>
|
||||
<attribute name="scale" value="0.9"/>
|
||||
|
||||
@@ -2397,8 +2397,11 @@
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSearchDialog">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="toolbar-style">both</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<property name="icon_size">3</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
@@ -2414,29 +2417,7 @@
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="action-name">.uno:SaveAsTemplate</property>
|
||||
<property name="use-underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">1</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
@@ -2478,7 +2459,7 @@
|
||||
<property name="can-focus">False</property>
|
||||
<property name="valign">end</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="label" translatable="yes" context="TabbedImpress|labelFileFile">File</property>
|
||||
<property name="label" translatable="yes" context="TabbedImpress|labelFileFile">Document</property>
|
||||
<attributes>
|
||||
<attribute name="style" value="italic"/>
|
||||
<attribute name="scale" value="0.9"/>
|
||||
|
||||
@@ -395,7 +395,6 @@ sc/uiconfig/scalc/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuHome-ParaRightTo
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-PagebreakMode'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-NormalViewMode'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnFileNewDoc'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnFileSaveAsTemplate'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnFileOpen'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnFileSave'] button-no-label
|
||||
sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportTo'] button-no-label
|
||||
|
||||
@@ -260,7 +260,6 @@ sd/uiconfig/sdraw/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-MasterPage'
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-OutputQualityColor'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkRadioMenuItem[@id='MenuView-OutputQualityGrayscale'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkToolButton[@id='btnFileNewDoc'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkToolButton[@id='btnFileSaveAsTemplate'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkToolButton[@id='btnFileOpen'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkToolButton[@id='btnFileSave'] button-no-label
|
||||
sd/uiconfig/sdraw/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportTo'] button-no-label
|
||||
|
||||
@@ -26,7 +26,6 @@ sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkComboBoxText[@id='masters
|
||||
sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='masterlabel'] orphan-label
|
||||
sd/uiconfig/simpress/ui/sidebarslidebackground.ui://GtkLabel[@id='customlabel'] orphan-label
|
||||
sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileNewDoc'] button-no-label
|
||||
sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSaveAsTemplate'] button-no-label
|
||||
sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileOpen'] button-no-label
|
||||
sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileSave'] button-no-label
|
||||
sd/uiconfig/simpress/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportTo'] button-no-label
|
||||
|
||||
@@ -167,7 +167,6 @@ sw/uiconfig/swriter/ui/wordcount.ui://GtkLabel[@id='selectstandardizedpages'] or
|
||||
sw/uiconfig/swriter/ui/wordcount.ui://GtkLabel[@id='docstandardizedpages'] orphan-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkMenuToolButton[@id='btnFileAddDirect'] button-no-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkToolButton[@id='btnFileNewDoc'] button-no-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkToolButton[@id='btnFileSaveAsTemplate'] button-no-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkToolButton[@id='btnFileOpen'] button-no-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkToolButton[@id='btnFileSave'] button-no-label
|
||||
sw/uiconfig/swriter/ui/notebookbar.ui://GtkToolButton[@id='btnFileExportTo'] button-no-label
|
||||
|
||||
@@ -2474,8 +2474,11 @@
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSearchDialog">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="toolbar-style">both</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<property name="icon_size">3</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="vexpand">True</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileNewDoc">
|
||||
<property name="visible">True</property>
|
||||
@@ -2491,29 +2494,7 @@
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="sfxlo-NotebookbarToolBox" id="bxFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="toolbar-style">both-horiz</property>
|
||||
<property name="show-arrow">False</property>
|
||||
<child>
|
||||
<object class="GtkToolButton" id="btnFileSaveAsTemplate">
|
||||
<property name="visible">True</property>
|
||||
<property name="action-name">.uno:SaveAsTemplate</property>
|
||||
<property name="use-underline">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="homogeneous">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left-attach">1</property>
|
||||
<property name="top-attach">1</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
@@ -2555,7 +2536,7 @@
|
||||
<property name="can-focus">False</property>
|
||||
<property name="valign">end</property>
|
||||
<property name="vexpand">True</property>
|
||||
<property name="label" translatable="yes" context="TabbedWriter|labelFileFile">File</property>
|
||||
<property name="label" translatable="yes" context="TabbedWriter|labelFileFile">Document</property>
|
||||
<attributes>
|
||||
<attribute name="style" value="italic"/>
|
||||
<attribute name="scale" value="0.9"/>
|
||||
|
||||
Reference in New Issue
Block a user