[Libreoffice-commits] core.git: sw/uiconfig
Szymon Kłos
eszkadev at gmail.com
Tue Mar 7 20:37:03 UTC 2017
sw/uiconfig/swriter/ui/notebookbar.ui | 484 ++++++++++++++++++----------------
1 file changed, 265 insertions(+), 219 deletions(-)
New commits:
commit 3f982700cc65c2462ed56ade552aabaa652d6874
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Tue Mar 7 21:35:54 2017 +0100
Notebookbar: fix popups
Change-Id: If00c3d2e64b89883dd77efb53dd16e149de03e94
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 9dd39b3..21dbfbe 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -812,13 +812,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Font</property>
- <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box77">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="fontadjust">
<property name="visible">True</property>
@@ -1756,12 +1756,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Break</property>
- <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<child>
<object class="vcllo-SmallButton" id="InsertPagebreak">
<property name="visible">True</property>
@@ -2646,65 +2646,77 @@
<object class="sfxlo-DropdownBox" id="ParaSpacingSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="ulspacing">
- <property name="width_request">200</property>
- <property name="height_request">75</property>
+ <object class="GtkBox" id="box100">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Indent</property>
+ <property name="orientation">horizontal</property>
+ <property name="valign">center</property>
<child>
- <object class="GtkToolButton" id="ULSpacing">
- <property name="use_action_appearance">False</property>
+ <object class="sfxlo-NotebookbarToolBox" id="ulspacing">
+ <property name="width_request">200</property>
+ <property name="height_request">75</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:ULSpacing</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Indent</property>
+ <child>
+ <object class="GtkToolButton" id="ULSpacing">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:ULSpacing</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="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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="sfxlo-NotebookbarToolBox" id="lrspacing">
- <property name="width_request">200</property>
- <property name="height_request">75</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Indent</property>
<child>
- <object class="GtkToolButton" id="LeftRightParaMargin">
- <property name="use_action_appearance">False</property>
+ <object class="sfxlo-NotebookbarToolBox" id="lrspacing">
+ <property name="width_request">200</property>
+ <property name="height_request">75</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:LeftRightParaMargin</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Indent</property>
+ <child>
+ <object class="GtkToolButton" id="LeftRightParaMargin">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:LeftRightParaMargin</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="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -2722,12 +2734,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Setup</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="GtkButton" id="InsertBreak">
<property name="visible">True</property>
@@ -3122,18 +3134,6 @@
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
<object class="sfxlo-DropdownBox" id="box49">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3155,7 +3155,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -3167,7 +3167,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -3192,14 +3192,37 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="vcllo-SmallButton" id="InsertCaptionDialog1">
+ <object class="GtkBox" id="box110">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:InsertCaptionDialog</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="vcllo-SmallButton" id="InsertCaptionDialog1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:InsertCaptionDialog</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3208,7 +3231,7 @@
</packing>
</child>
<style>
- <class name="priority-1"/>
+ <class name="priority-2"/>
</style>
</object>
<packing>
@@ -3268,7 +3291,7 @@
</packing>
</child>
<style>
- <class name="priority-2"/>
+ <class name="priority-1"/>
</style>
</object>
<packing>
@@ -3796,15 +3819,77 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Page View</property>
<child>
- <object class="GtkButton" id="PrintLayout">
+ <object class="GtkBox" id="box122">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:PrintLayout</property>
- <property name="image">PlaceholderImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="PrintLayout">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:PrintLayout</property>
+ <property name="image">PlaceholderImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BrowseView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:BrowseView</property>
+ <property name="image">PlaceholderImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="vcllo-SmallButton" id="PrintPreview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:PrintPreview</property>
+ <property name="image">PrintPreviewImg</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="HideWhitespace">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:HideWhitespace</property>
+ <property name="image">PlaceholderImg1</property>
+ <property name="relief">none</property>
+ <property name="image_position">top</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -3812,57 +3897,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="BrowseView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:BrowseView</property>
- <property name="image">PlaceholderImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="vcllo-SmallButton" id="PrintPreview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:PrintPreview</property>
- <property name="image">PrintPreviewImg</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="HideWhitespace">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:HideWhitespace</property>
- <property name="image">PlaceholderImg1</property>
- <property name="relief">none</property>
- <property name="image_position">top</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
<style>
<class name="priority-3"/>
</style>
@@ -4182,12 +4216,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box90">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="GtkButton" id="TableDialog">
<property name="visible">True</property>
@@ -4282,12 +4316,12 @@
<object class="sfxlo-DropdownBox" id="box96">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box97">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="GtkButton" id="SplitTable1">
<property name="visible">True</property>
@@ -4339,63 +4373,48 @@
<object class="sfxlo-DropdownBox" id="box35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkBox" id="box20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkButton" id="InsertRowsAfter">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:InsertRowsAfter</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="InsertRowsBefore">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:InsertRowsBefore</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
- <object class="GtkBox" id="box41">
+ <object class="GtkBox" id="box12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="orientation">horizontal</property>
+ <property name="valign">center</property>
<child>
- <object class="GtkButton" id="InsertColumnsBefore">
+ <object class="GtkBox" id="box20">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:InsertColumnsBefore</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkButton" id="InsertRowsAfter">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:InsertRowsAfter</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="always_show_image">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="InsertRowsBefore">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:InsertRowsBefore</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4404,13 +4423,40 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="InsertColumnsAfter">
+ <object class="GtkBox" id="box41">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:InsertColumnsAfter</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkButton" id="InsertColumnsBefore">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:InsertColumnsBefore</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="InsertColumnsAfter">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:InsertColumnsAfter</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -4418,53 +4464,53 @@
<property name="position">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="DeleteRows1">
+ <object class="GtkBox" id="box42">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:DeleteRows</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="DeleteColumns1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">.uno:DeleteColumns</property>
- <property name="relief">none</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkButton" id="DeleteRows1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:DeleteRows</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="DeleteColumns1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">.uno:DeleteColumns</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<style>
@@ -4552,12 +4598,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box92">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="GtkButton" id="Protect">
<property name="visible">True</property>
@@ -4925,12 +4971,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box99">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="brightnes">
<property name="visible">True</property>
@@ -5007,12 +5053,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="valign">center</property>
<child>
<object class="GtkBox" id="box100">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="valign">center</property>
<child>
<object class="sfxlo-NotebookbarToolBox" id="gamma">
<property name="visible">True</property>
More information about the Libreoffice-commits
mailing list