officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 6 - svx/uiconfig/ui/sidebarpossize.ui | 53 +++++++--- 2 files changed, 40 insertions(+), 19 deletions(-)
New commits: commit 4df8a5205ef943fe3509ae751a15f6ad11e6bfb6 Author: Samuel Mehrbrodt <[email protected]> Date: Wed Nov 18 14:51:04 2015 +0100 Revert "Flip buttons: Make the tooltip an uno command property" The text should be in the extended tooltips, not in the default ones. This reverts commit 0e41564b2fa5192ef1e8ec5e51ad3c04dfa52afd. diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 33949fd..72858b9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4197,9 +4197,6 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Flip Horizontally</value> </prop> - <prop oor:name="TooltipLabel" oor:type="xs:string"> - <value xml:lang="en-US">Flip the selected object horizontally.</value> - </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> </prop> @@ -4208,9 +4205,6 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Flip Vertically</value> </prop> - <prop oor:name="TooltipLabel" oor:type="xs:string"> - <value xml:lang="en-US">Flip the selected object vertically.</value> - </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> </prop> diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui index db61d5a..eeedf5d 100644 --- a/svx/uiconfig/ui/sidebarpossize.ui +++ b/svx/uiconfig/ui/sidebarpossize.ui @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> <interface> - <requires lib="gtk+" version="3.12"/> - <requires lib="LibreOffice" version="1.0"/> + <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">-180</property> - <property name="upper">359.99000000000001</property> + <property name="upper">359.99</property> <property name="step_increment">5</property> <property name="page_increment">20</property> </object> @@ -39,13 +38,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Horizontal:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -56,6 +57,7 @@ <property name="tooltip_markup" translatable="yes">Enter the value for the horizontal position.</property> <property name="tooltip_text" translatable="yes">Enter the value for the horizontal position.</property> <property name="invisible_char">â¢</property> + <property name="invisible_char_set">True</property> <accessibility> <relation type="labelled-by" target="horizontallabel"/> </accessibility> @@ -68,6 +70,8 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -75,13 +79,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Vertical:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -92,6 +98,7 @@ <property name="tooltip_markup" translatable="yes">Enter the value for the vertical position.</property> <property name="tooltip_text" translatable="yes">Enter the value for the vertical position.</property> <property name="invisible_char">â¢</property> + <property name="invisible_char_set">True</property> <accessibility> <relation type="labelled-by" target="verticallabel"/> </accessibility> @@ -104,6 +111,8 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -111,13 +120,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Width:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -129,6 +140,7 @@ <property name="tooltip_markup" translatable="yes">Enter a width for the selected object.</property> <property name="tooltip_text" translatable="yes">Enter a width for the selected object.</property> <property name="invisible_char">â¢</property> + <property name="invisible_char_set">True</property> <accessibility> <relation type="labelled-by" target="widthlabel"/> </accessibility> @@ -141,6 +153,8 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -148,13 +162,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">H_eight:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -166,6 +182,7 @@ <property name="tooltip_markup" translatable="yes">Enter a height for the selected object.</property> <property name="tooltip_text" translatable="yes">Enter a height for the selected object.</property> <property name="invisible_char">â¢</property> + <property name="invisible_char_set">True</property> <accessibility> <relation type="labelled-by" target="heightlabel"/> </accessibility> @@ -178,6 +195,8 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> @@ -210,9 +229,9 @@ <object class="GtkLabel" id="rotationlabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Rotation:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -280,10 +299,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Flip:</property> <property name="use_underline">True</property> <property name="justify">right</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -296,10 +315,16 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> + <accessibility> + <relation type="labelled-by" target="fliplabel"/> + </accessibility> <child> <object class="GtkToolButton" id="flipvertical"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Flip the selected object vertically.</property> + <property name="tooltip_text" translatable="yes">Flip the selected object vertically.</property> <property name="action_name">.uno:FlipVertical</property> <property name="use_underline">True</property> </object> @@ -312,6 +337,9 @@ <object class="GtkToolButton" id="fliphorizontal"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Flip the selected object horizontally.</property> + <property name="tooltip_text" translatable="yes">Flip the selected object horizontally.</property> <property name="action_name">.uno:FlipHorizontal</property> <property name="use_underline">True</property> </object> @@ -320,9 +348,6 @@ <property name="homogeneous">True</property> </packing> </child> - <accessibility> - <relation type="labelled-by" target="fliplabel"/> - </accessibility> </object> <packing> <property name="expand">True</property> @@ -362,6 +387,8 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
