diff options
author | Susobhan Ghosh <susobhang70@gmail.com> | 2016-08-13 19:23:54 +0530 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-08-25 08:37:10 +0000 |
commit | 6f437466f96868cb10187c404ed84fb6d3dcc645 (patch) | |
tree | dfa3a0863f0f7c23556d4ef079054133938cc3ba /sw/uiconfig | |
parent | cid#1371326 Misused comma operator (diff) | |
download | core-6f437466f96868cb10187c404ed84fb6d3dcc645.tar.gz core-6f437466f96868cb10187c404ed84fb6d3dcc645.zip |
tdf#83830: Use SpacingListBox in Header/Footer and Sidebar Wrap Panel
Change-Id: I80ea84b6eaabcf241b313d46695cffdd74174c08
Reviewed-on: https://gerrit.libreoffice.org/28104
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw/uiconfig')
-rw-r--r-- | sw/uiconfig/swriter/ui/pagefooterpanel.ui | 48 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/pageheaderpanel.ui | 48 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/sidebarwrap.ui | 54 |
3 files changed, 5 insertions, 145 deletions
diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui index a709475c73f7..0297daf05786 100644 --- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui +++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui @@ -2,48 +2,6 @@ <!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkListStore" id="spacinglist"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name gint1 --> - <column type="gint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">None</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Extra Small (0.16cm)</col> - <col id="1">91</col> - </row> - <row> - <col id="0" translatable="yes">Small (0.32cm)</col> - <col id="1">181</col> - </row> - <row> - <col id="0" translatable="yes">Small Medium (0.64cm)</col> - <col id="1">363</col> - </row> - <row> - <col id="0" translatable="yes">Medium (0.95cm)</col> - <col id="1">539</col> - </row> - <row> - <col id="0" translatable="yes">Medium Large (1.27cm)</col> - <col id="1">720</col> - </row> - <row> - <col id="0" translatable="yes">Large (1.9cm)</col> - <col id="1">1077</col> - </row> - <row> - <col id="0" translatable="yes">Extra Large (2.54cm)</col> - <col id="1">1440</col> - </row> - </data> - </object> <object class="GtkGrid" id="PageFooterPanel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -131,8 +89,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="footermarginpreset"> - <property name="width_request">150</property> + <object class="svxcorelo-SpacingListBox" id="footermarginpreset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -144,8 +101,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="spacingpreset"> - <property name="width_request">150</property> + <object class="svxcorelo-SpacingListBox" id="spacingpreset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui index 90bfb4fb405a..ae0de2874b83 100644 --- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui +++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui @@ -2,48 +2,6 @@ <!-- Generated with glade 3.16.1 --> <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkListStore" id="spacinglist"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name gint1 --> - <column type="gint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">None</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Extra Small (0.16cm)</col> - <col id="1">91</col> - </row> - <row> - <col id="0" translatable="yes">Small (0.32cm)</col> - <col id="1">181</col> - </row> - <row> - <col id="0" translatable="yes">Small Medium (0.64cm)</col> - <col id="1">363</col> - </row> - <row> - <col id="0" translatable="yes">Medium (0.95cm)</col> - <col id="1">539</col> - </row> - <row> - <col id="0" translatable="yes">Medium Large (1.27cm)</col> - <col id="1">720</col> - </row> - <row> - <col id="0" translatable="yes">Large (1.9cm)</col> - <col id="1">1077</col> - </row> - <row> - <col id="0" translatable="yes">Extra Large (2.54cm)</col> - <col id="1">1440</col> - </row> - </data> - </object> <object class="GtkGrid" id="PageHeaderPanel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -131,8 +89,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="headermarginpreset"> - <property name="width_request">150</property> + <object class="svxcorelo-SpacingListBox" id="headermarginpreset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -144,8 +101,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="spacingpreset"> - <property name="width_request">150</property> + <object class="svxcorelo-SpacingListBox" id="spacingpreset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui index 0b9b2df70a35..c846adfdc5c4 100644 --- a/sw/uiconfig/swriter/ui/sidebarwrap.ui +++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui @@ -2,48 +2,6 @@ <!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> - <object class="GtkListStore" id="spacinglist"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name gint1 --> - <column type="gint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">None</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Extra Small (0.16cm)</col> - <col id="1">91</col> - </row> - <row> - <col id="0" translatable="yes">Small (0.32cm)</col> - <col id="1">181</col> - </row> - <row> - <col id="0" translatable="yes">Small Medium (0.64cm)</col> - <col id="1">363</col> - </row> - <row> - <col id="0" translatable="yes">Medium (0.95cm)</col> - <col id="1">539</col> - </row> - <row> - <col id="0" translatable="yes">Medium Large (1.27cm)</col> - <col id="1">720</col> - </row> - <row> - <col id="0" translatable="yes">Large (1.9cm)</col> - <col id="1">1077</col> - </row> - <row> - <col id="0" translatable="yes">Extra Large (2.54cm)</col> - <col id="1">1440</col> - </row> - </data> - </object> <object class="GtkGrid" id="WrapPropertyPanel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -68,7 +26,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">None</property> <property name="tooltip_text" translatable="yes">None</property> <property name="action_name">.uno:WrapOff</property> <property name="xalign">0</property> @@ -92,7 +49,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">Parallel</property> <property name="tooltip_text" translatable="yes">Parallel</property> <property name="action_name">.uno:WrapOn</property> <property name="xalign">0</property> @@ -116,7 +72,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">Optimal</property> <property name="tooltip_text" translatable="yes">Optimal</property> <property name="action_name">.uno:WrapIdeal</property> <property name="xalign">0</property> @@ -140,7 +95,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">Before</property> <property name="tooltip_text" translatable="yes">Before</property> <property name="action_name">.uno:WrapLeft</property> <property name="xalign">0</property> @@ -164,7 +118,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">After</property> <property name="tooltip_text" translatable="yes">After</property> <property name="action_name">.uno:WrapRight</property> <property name="xalign">0</property> @@ -188,7 +141,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">Through</property> <property name="tooltip_text" translatable="yes">Through</property> <property name="action_name">.uno:WrapThrough</property> <property name="xalign">0</property> @@ -224,7 +176,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_markup" translatable="yes">Click to automatically trim unnecessary parts of the image</property> <property name="tooltip_text" translatable="yes">Click to automatically trim unnecessary parts of the image</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -241,7 +192,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_markup" translatable="yes">Edit the trimmed area of the image</property> <property name="tooltip_text" translatable="yes">Edit the trimmed area of the image</property> </object> <packing> @@ -275,12 +225,10 @@ </packing> </child> <child> - <object class="GtkComboBox" id="spacingLB"> + <object class="svxcorelo-SpacingListBox" id="spacingLB"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_markup" translatable="yes">Set the amount of space between the image and surrounding text</property> <property name="tooltip_text" translatable="yes">Set the amount of space between the image and surrounding text</property> - <property name="model">spacinglist</property> </object> <packing> <property name="expand">False</property> |