cui/uiconfig/ui/colorpage.ui | 11 ++++----- cui/uiconfig/ui/optaccessibilitypage.ui | 1 cui/uiconfig/ui/optadvancedpage.ui | 1 cui/uiconfig/ui/optappearancepage.ui | 1 cui/uiconfig/ui/optfontspage.ui | 11 ++++----- cui/uiconfig/ui/optpathspage.ui | 1 helpcontent2 | 2 - sw/uiconfig/swriter/ui/printoptionspage.ui | 35 ++--------------------------- 8 files changed, 20 insertions(+), 43 deletions(-)
New commits: commit 9e1f5d5bf1bcc8a7ccfd48a6731ed5763bc0b4dc Author: Caolán McNamara <[email protected]> Date: Wed Feb 13 20:41:52 2013 +0000 consistent 6 pixels borders around all option pages and center middle column of writer print options Change-Id: I344d114ec0dd87ef5de5a920acea9f39e0e89dfe diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 59db9a5..72f8b9c 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -6,11 +6,17 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">255</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkBox" id="ColorPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <child> <object class="GtkFrame" id="frame1"> @@ -635,11 +641,6 @@ </packing> </child> </object> - <object class="GtkAdjustment" id="adjustment2"> - <property name="upper">255</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui b/cui/uiconfig/ui/optaccessibilitypage.ui index 10758b6..cdff5cf 100644 --- a/cui/uiconfig/ui/optaccessibilitypage.ui +++ b/cui/uiconfig/ui/optaccessibilitypage.ui @@ -11,6 +11,7 @@ <object class="GtkBox" id="OptAccessibilityPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index 9b3a76e..85c2dd7 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -4,6 +4,7 @@ <object class="GtkBox" id="OptAdvancedPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui index 4277ced..2357088 100644 --- a/cui/uiconfig/ui/optappearancepage.ui +++ b/cui/uiconfig/ui/optappearancepage.ui @@ -4,6 +4,7 @@ <object class="GtkBox" id="OptAppearancePage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui index 2cc9e49..20da64e 100644 --- a/cui/uiconfig/ui/optfontspage.ui +++ b/cui/uiconfig/ui/optfontspage.ui @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/nu01.png</property> + </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9,6 +14,7 @@ <object class="GtkBox" id="OptFontsPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> @@ -377,9 +383,4 @@ </packing> </child> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">svx/res/nu01.png</property> - </object> </interface> diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui index e3f8091..d4c6957 100644 --- a/cui/uiconfig/ui/optpathspage.ui +++ b/cui/uiconfig/ui/optpathspage.ui @@ -6,6 +6,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index 4f5119b..ad81a5f 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -4,6 +4,7 @@ <object class="GtkBox" id="PrintOptionsPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> @@ -12,6 +13,7 @@ <property name="can_focus">False</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> + <property name="column_homogeneous">True</property> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> @@ -32,11 +34,9 @@ <child> <object class="GtkCheckButton" id="graphics"> <property name="label" translatable="yes">Pictures and objects</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -50,11 +50,9 @@ <child> <object class="GtkCheckButton" id="formcontrols"> <property name="label" translatable="yes">Form controls</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -68,11 +66,9 @@ <child> <object class="GtkCheckButton" id="background"> <property name="label" translatable="yes">Page background</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -86,11 +82,9 @@ <child> <object class="GtkCheckButton" id="inblack"> <property name="label" translatable="yes">Print text in black</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -104,11 +98,9 @@ <child> <object class="GtkCheckButton" id="hiddentext"> <property name="label" translatable="yes">Hidden text</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -122,11 +114,9 @@ <child> <object class="GtkCheckButton" id="textplaceholder"> <property name="label" translatable="yes">Text placeholder</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -163,6 +153,7 @@ <object class="GtkFrame" id="pagesframe"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -179,11 +170,9 @@ <child> <object class="GtkCheckButton" id="leftpages"> <property name="label" translatable="yes">Left pages</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -197,11 +186,9 @@ <child> <object class="GtkCheckButton" id="rightpages"> <property name="label" translatable="yes">Right pages</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -215,11 +202,9 @@ <child> <object class="GtkCheckButton" id="brochure"> <property name="label" translatable="yes">Brochure</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -233,12 +218,10 @@ <child> <object class="GtkCheckButton" id="rtl"> <property name="label" translatable="yes">Right to Left</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="margin_left">18</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -291,11 +274,9 @@ <child> <object class="GtkRadioButton" id="none"> <property name="label" translatable="yes">None</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">only</property> @@ -310,11 +291,9 @@ <child> <object class="GtkRadioButton" id="only"> <property name="label" translatable="yes">Comments only</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">end</property> @@ -329,11 +308,9 @@ <child> <object class="GtkRadioButton" id="end"> <property name="label" translatable="yes">End of document</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">endpage</property> @@ -348,11 +325,9 @@ <child> <object class="GtkRadioButton" id="endpage"> <property name="label" translatable="yes">End of page</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">none</property> @@ -451,11 +426,9 @@ <child> <object class="GtkCheckButton" id="blankpages"> <property name="label" translatable="yes">Print automatically inserted blank pages</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -469,11 +442,9 @@ <child> <object class="GtkCheckButton" id="papertray"> <property name="label" translatable="yes">Paper tray from printer settings</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> commit b08df7c0ba16b9aa42af4f7e1d58f480d54fbb8b Author: Caolán McNamara <[email protected]> Date: Wed Feb 13 23:40:05 2013 +0000 Updated core Project: help cfb84454cfafb8a06957230bc3ead85816ca624c diff --git a/helpcontent2 b/helpcontent2 index aab9e88..cfb8445 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aab9e88882b7e799b6246caa6c40ca3d46e6220d +Subproject commit cfb84454cfafb8a06957230bc3ead85816ca624c
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
