[Libreoffice-commits] .: 7 commits - sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 30 15:56:48 PST 2013
sw/uiconfig/swriter/ui/titlepage.ui | 166 ++++++++++++++++++++++--------------
1 file changed, 103 insertions(+), 63 deletions(-)
New commits:
commit 5679597c8a60578b928174f78fcfb6de38c80de8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 23:17:11 2013 +0000
HIG: align the edit button with the last spinner element
Change-Id: Ia12af43223334156ffe8c9a0e9660e296fd4d68e
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 958eb25..d5509f2 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -537,4 +537,14 @@
<action-widget response="0">PB_HELP</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="NF_PAGE_COUNT"/>
+ <widget name="NF_PAGE_START"/>
+ <widget name="NF_RESTART_NUMBERING"/>
+ <widget name="NF_SET_PAGE_NUMBER"/>
+ <widget name="PB_PAGE_PROPERTIES"/>
+ </widgets>
+ </object>
</interface>
commit 1a220a5791202d7dd881bbcee8e1b4ff1002ac6d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 21:22:45 2013 +0000
HIG: access key for listbox
Change-Id: I20f85de6c529b5a448f87ab73d7373532da7ab8c
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 0c644a1..958eb25 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -462,7 +462,21 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Style:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_PAGE_PROPERTIES</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkComboBox" id="LB_PAGE_PROPERTIES">
<property name="visible">True</property>
@@ -471,7 +485,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -484,7 +498,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
commit c3fc293b584b4e62acb4b35ed389392fe2a81d41
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 21:10:51 2013 +0000
HIG: 6 pixels vertical padding
Change-Id: I8699539b79c5db10f4cf5d79028cabb10cd09164
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index b08f7f6..0c644a1 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -89,6 +89,7 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -289,6 +290,7 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box3">
commit 1236f3188f4befd068cc770781d18522b84ae01d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 21:08:40 2013 +0000
HIG: indent dependent hierarchy by 12 pixels
Change-Id: I5beec3eb7d8ede3c91b63955285a813af16bc43a
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 00d73e5..b08f7f6 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -312,39 +312,46 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel" id="FT_PAGE_COUNT">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_PAGE_COUNT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Page number:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="NF_RESTART_NUMBERING">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="numeric">True</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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="NF_RESTART_NUMBERING">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="invisible_char">â—</property>
- <property name="adjustment">adjustment1</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -369,39 +376,46 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkLabel" id="FT_PAGE_PAGES">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="invisible_char">â—</property>
- <property name="adjustment">adjustment1</property>
- <property name="numeric">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_PAGE_PAGES">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Page number:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="numeric">True</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>
</object>
<packing>
commit cd797f13352081a1c2733fa4c4efa1d708b69035
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 21:06:13 2013 +0000
HIG: radiobuttons/checkboxes use sentence capitalization
Change-Id: I0f2f9d4576b8d1923a19ab703da5fed206ae6526
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 56f0c85..00d73e5 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -212,7 +212,7 @@
</child>
<child>
<object class="GtkRadioButton" id="RB_DOCUMENT_START">
- <property name="label" translatable="yes">Document Start</property>
+ <property name="label" translatable="yes">Document start</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -298,7 +298,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="CB_RESTART_NUMBERING">
- <property name="label" translatable="yes">Reset Page Numbering after title pages</property>
+ <property name="label" translatable="yes">Reset page numbering after title pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -355,7 +355,7 @@
</child>
<child>
<object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER">
- <property name="label" translatable="yes">Set Page Number for first title page</property>
+ <property name="label" translatable="yes">Set page number for first title page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
commit f27fa0d6a8bc28e432efbc73484b27a9042bc003
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 21:02:37 2013 +0000
HIG: end labels with ':'
Change-Id: Ia729050125d3cfc3e51d289c2153f6bdeb76e379
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 0539073..56f0c85 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -102,7 +102,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Number of title pages</property>
+ <property name="label" translatable="yes">Number of title pages:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_PAGE_COUNT</property>
</object>
@@ -118,7 +118,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Place title pages at</property>
+ <property name="label" translatable="yes">Place title pages at:</property>
<accessibility>
<relation type="label-for" target="RB_DOCUMENT_START"/>
<relation type="label-for" target="RB_PAGE_START"/>
@@ -320,7 +320,7 @@
<object class="GtkLabel" id="FT_PAGE_COUNT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number</property>
+ <property name="label" translatable="yes">Page number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
</object>
@@ -377,7 +377,7 @@
<object class="GtkLabel" id="FT_PAGE_PAGES">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number</property>
+ <property name="label" translatable="yes">Page number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
</object>
commit 00cc058f969baa82dd203159efc555d66ab58e63
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 30 20:59:19 2013 +0000
HIG: Leave a 12-pixel horizontal gap between a control and its label
Change-Id: I0e6c8c817290a6d2c27ee5b758a803b30c2b3d2c
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 92acb22..0539073 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -94,7 +94,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">5</property>
+ <property name="column_spacing">12</property>
<property name="row_homogeneous">True</property>
<child>
<object class="GtkLabel" id="label6">
@@ -315,7 +315,7 @@
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="FT_PAGE_COUNT">
<property name="visible">True</property>
@@ -372,7 +372,7 @@
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="FT_PAGE_PAGES">
<property name="visible">True</property>
More information about the Libreoffice-commits
mailing list