diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-09 11:58:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-09 11:58:54 +0100 |
commit | 7560f765b32bf9969b89b28c6733faa8098f1809 (patch) | |
tree | 36c24f5ed6c1a5446179f72d07f03edfdd642a1d /cui/uiconfig | |
parent | a8dd49b9fc59371ff8edb31082bbd4f1b6179b1c (diff) |
unify strip previews optimal size in one place
Change-Id: I6ae1073d013c9d9bbca39c505955436cd4950d1b
Diffstat (limited to 'cui/uiconfig')
-rw-r--r-- | cui/uiconfig/ui/charnamepage.ui | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/effectspage.ui | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/positionpage.ui | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/textanimtabpage.ui | 73 | ||||
-rw-r--r-- | cui/uiconfig/ui/textattrtabpage.ui | 5 | ||||
-rw-r--r-- | cui/uiconfig/ui/twolinespage.ui | 1 |
6 files changed, 40 insertions, 42 deletions
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index d89402daa8ad..25c67f1a2526 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -748,7 +748,6 @@ <property name="right_padding">12</property> <child> <object class="svxlo-SvxFontPrevWindow" id="preview:border"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 592984fdaa9c..12676c2dc1ae 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -646,7 +646,6 @@ <property name="right_padding">12</property> <child> <object class="svxlo-SvxFontPrevWindow" id="preview:border"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 20927c8f7890..c44bee666417 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -516,7 +516,6 @@ <property name="right_padding">12</property> <child> <object class="svxlo-SvxFontPrevWindow" id="preview:border"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui index dc74c15ce912..8f0c9f9459f0 100644 --- a/cui/uiconfig/ui/textanimtabpage.ui +++ b/cui/uiconfig/ui/textanimtabpage.ui @@ -1,6 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="adjustmentAMOUNT"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustmentCOUNT"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustmentDELAY"> + <property name="upper">300</property> + <property name="step_increment">1</property> + <property name="page_increment">50</property> + </object> + <object class="GtkImage" id="imageDOWN"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-down</property> + </object> + <object class="GtkImage" id="imageLEFT"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-back</property> + </object> + <object class="GtkImage" id="imageRIGHT"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-forward</property> + </object> + <object class="GtkImage" id="imageUP"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-up</property> + </object> <object class="GtkBox" id="TextAnimation"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -25,6 +60,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="spacing">18</property> + <property name="homogeneous">True</property> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> @@ -68,7 +104,7 @@ <object class="GtkBox" id="boxDIRECTION"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> + <property name="halign">start</property> <property name="hexpand">True</property> <property name="spacing">12</property> <child> @@ -505,41 +541,6 @@ </packing> </child> </object> - <object class="GtkAdjustment" id="adjustmentAMOUNT"> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustmentCOUNT"> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustmentDELAY"> - <property name="upper">300</property> - <property name="step_increment">1</property> - <property name="page_increment">50</property> - </object> - <object class="GtkImage" id="imageDOWN"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-down</property> - </object> - <object class="GtkImage" id="imageLEFT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-back</property> - </object> - <object class="GtkImage" id="imageRIGHT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-forward</property> - </object> - <object class="GtkImage" id="imageUP"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-go-up</property> - </object> <object class="GtkListStore" id="liststoreEFFECT"> <columns> <!-- column-name gchararray1 --> diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui index da272cf8ae7f..b5a18ecdc1c0 100644 --- a/cui/uiconfig/ui/textattrtabpage.ui +++ b/cui/uiconfig/ui/textattrtabpage.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">-100</property> <property name="upper">100</property> @@ -364,7 +364,8 @@ <object class="svxlo-SvxRectCtl" id="CTL_POSITION"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="vexpand">True</property> + <property name="halign">start</property> + <property name="valign">center</property> </object> <packing> <property name="expand">True</property> diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui index c931b90d279e..232062c523ca 100644 --- a/cui/uiconfig/ui/twolinespage.ui +++ b/cui/uiconfig/ui/twolinespage.ui @@ -226,7 +226,6 @@ <property name="right_padding">12</property> <child> <object class="svxlo-SvxFontPrevWindow" id="preview:border"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> |