summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdolfo Jayme Barrientos <fitojb@ubuntu.com>2014-11-16 09:45:17 -0600
committerCaolán McNamara <caolanm@redhat.com>2014-11-17 09:18:01 +0000
commitf7393810a7b716be3a2c99c86dc9d78bd834dbfa (patch)
tree5121e90abaaf8005ffc9768c7b0493843fbac0ad
parent70d2919e2d9543ccad8ccf25c827c4f4873af750 (diff)
More HIG fixes in filter, svx
Change-Id: I74df6b8221b4bb18791ec81af266dd58571c4c8c Reviewed-on: https://gerrit.libreoffice.org/12489 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--filter/uiconfig/ui/impswfdialog.ui4
-rw-r--r--filter/uiconfig/ui/pdfsignpage.ui8
-rw-r--r--filter/uiconfig/ui/warnpdfdialog.ui10
-rw-r--r--filter/uiconfig/ui/xmlfiltertabpagegeneral.ui9
-rw-r--r--filter/uiconfig/ui/xmlfiltertabpagetransformation.ui8
-rw-r--r--svx/uiconfig/ui/colorwindow.ui3
-rw-r--r--svx/uiconfig/ui/docrecoverybrokendialog.ui12
-rw-r--r--svx/uiconfig/ui/docrecoveryprogressdialog.ui70
-rw-r--r--svx/uiconfig/ui/fontworkgallerydialog.ui42
-rw-r--r--svx/uiconfig/ui/fontworkspacingdialog.ui1
-rw-r--r--svx/uiconfig/ui/passwd.ui6
-rw-r--r--svx/uiconfig/ui/redlinefilterpage.ui10
12 files changed, 75 insertions, 108 deletions
diff --git a/filter/uiconfig/ui/impswfdialog.ui b/filter/uiconfig/ui/impswfdialog.ui
index e5981fced007..c132db7ffd47 100644
--- a/filter/uiconfig/ui/impswfdialog.ui
+++ b/filter/uiconfig/ui/impswfdialog.ui
@@ -11,7 +11,7 @@
<object class="GtkDialog" id="ImpSWFDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Macromedia Flash (SWF) Options</property>
+ <property name="title" translatable="yes">Flash (SWF) Options</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -129,7 +129,7 @@
</child>
<child>
<object class="GtkCheckButton" id="exportall">
- <property name="label" translatable="yes">Export _all slides (unchecking exports current slide)</property>
+ <property name="label" translatable="yes">Export _all slides (uncheck to export current slide)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/filter/uiconfig/ui/pdfsignpage.ui b/filter/uiconfig/ui/pdfsignpage.ui
index e4794805d4fd..4090c8503157 100644
--- a/filter/uiconfig/ui/pdfsignpage.ui
+++ b/filter/uiconfig/ui/pdfsignpage.ui
@@ -154,7 +154,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Certificate password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password</property>
@@ -168,7 +168,7 @@
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Location:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">location</property>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Contact information:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">contact</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Reason:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">reason</property>
diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui
index f996864dab37..1860e84e99d9 100644
--- a/filter/uiconfig/ui/warnpdfdialog.ui
+++ b/filter/uiconfig/ui/warnpdfdialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.6"/>
<object class="GtkMessageDialog" id="WarnPDFDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="type">popup</property>
- <property name="title" translatable="yes">Problems during PDF export</property>
+ <property name="title" translatable="yes">Problems During PDF Export</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
@@ -19,7 +19,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">24</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
@@ -55,8 +55,6 @@
<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>
@@ -72,8 +70,6 @@
<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>
diff --git a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
index 401758adc1e3..9b0f4773bf25 100644
--- a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
+++ b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui
@@ -19,7 +19,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_Filter name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filtername</property>
@@ -33,7 +33,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_Application:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">application</property>
@@ -47,6 +47,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_Name of file type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">interfacename</property>
@@ -60,7 +61,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">File _extension:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">extension</property>
@@ -74,7 +75,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Comment_s:</property>
<property name="use_underline">True</property>
diff --git a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
index 7b0be852d7db..44d0e77e9983 100644
--- a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
+++ b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
@@ -21,7 +21,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_DocType:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">doc</property>
@@ -48,7 +48,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_XSLT for export:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xsltexport</property>
@@ -75,7 +75,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">XSLT _for import:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xsltimport</property>
@@ -102,7 +102,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Template for _import:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">tempimport</property>
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 10553850ab71..eacca5b3d613 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -34,6 +34,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -92,7 +93,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.1</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Recent</property>
</object>
<packing>
diff --git a/svx/uiconfig/ui/docrecoverybrokendialog.ui b/svx/uiconfig/ui/docrecoverybrokendialog.ui
index 63f1ccbf29c0..dfe17a7e2fa9 100644
--- a/svx/uiconfig/ui/docrecoverybrokendialog.ui
+++ b/svx/uiconfig/ui/docrecoverybrokendialog.ui
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DocRecoveryBrokenDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +89,9 @@ The documents listed below will be saved in the folder noted below if you click
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Documents</property>
+ <property name="label" translatable="yes">Documents:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">filelist:border</property>
</object>
<packing>
<property name="expand">False</property>
@@ -119,8 +122,9 @@ The documents listed below will be saved in the folder noted below if you click
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Save to</property>
+ <property name="label" translatable="yes">_Save to:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">savedir</property>
</object>
<packing>
<property name="expand">False</property>
@@ -133,7 +137,7 @@ The documents listed below will be saved in the folder noted below if you click
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkEntry" id="savedir">
<property name="visible">True</property>
diff --git a/svx/uiconfig/ui/docrecoveryprogressdialog.ui b/svx/uiconfig/ui/docrecoveryprogressdialog.ui
index 26c3dc4bf737..2dd8c653d825 100644
--- a/svx/uiconfig/ui/docrecoveryprogressdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryprogressdialog.ui
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DocRecoveryProgressDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
+ <property name="title" translatable="yes">Documents Are Being Saved</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -28,65 +29,34 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="row_spacing">6</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Progress of saving:</property>
- <property name="use_underline">True</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>
- <object class="GtkDrawingArea" id="progress">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- </object>
- <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>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Progress of saving:</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label1">
+ <child>
+ <object class="GtkDrawingArea" id="progress">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Documents Are Being Saved.</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="hexpand">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/svx/uiconfig/ui/fontworkgallerydialog.ui b/svx/uiconfig/ui/fontworkgallerydialog.ui
index 75122f20bb94..5ab4acf8f7f0 100644
--- a/svx/uiconfig/ui/fontworkgallerydialog.ui
+++ b/svx/uiconfig/ui/fontworkgallerydialog.ui
@@ -73,40 +73,34 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="row_spacing">6</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="svtlo-ValueSet" id="ctlFavorites">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select a Fontwork style:</property>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label1">
+ <child>
+ <object class="svtlo-ValueSet" id="ctlFavorites:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Select a Fontwork Style</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/svx/uiconfig/ui/fontworkspacingdialog.ui b/svx/uiconfig/ui/fontworkspacingdialog.ui
index 7b9af964539d..aec82679d1ab 100644
--- a/svx/uiconfig/ui/fontworkspacingdialog.ui
+++ b/svx/uiconfig/ui/fontworkspacingdialog.ui
@@ -11,6 +11,7 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Fontwork Character Spacing</property>
+ <property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
diff --git a/svx/uiconfig/ui/passwd.ui b/svx/uiconfig/ui/passwd.ui
index c4f9dc5adb00..0a12eea8fc2d 100644
--- a/svx/uiconfig/ui/passwd.ui
+++ b/svx/uiconfig/ui/passwd.ui
@@ -101,7 +101,7 @@
<object class="GtkLabel" id="oldpassL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldpassEntry</property>
@@ -195,7 +195,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Pa_ssword:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">newpassEntry</property>
@@ -209,7 +209,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Confi_rm:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">confirmpassEntry</property>
diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
index f9d950405f72..d6563d802574 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -23,7 +23,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="date">
- <property name="label" translatable="yes">_Date</property>
+ <property name="label" translatable="yes">_Date:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -41,7 +41,7 @@
</child>
<child>
<object class="GtkCheckButton" id="author">
- <property name="label" translatable="yes">_Author</property>
+ <property name="label" translatable="yes">_Author:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -59,7 +59,7 @@
</child>
<child>
<object class="GtkCheckButton" id="action">
- <property name="label" translatable="yes">A_ction</property>
+ <property name="label" translatable="yes">A_ction:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -77,7 +77,7 @@
</child>
<child>
<object class="GtkCheckButton" id="comment">
- <property name="label" translatable="yes">C_omment</property>
+ <property name="label" translatable="yes">C_omment:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -289,7 +289,7 @@
</child>
<child>
<object class="GtkCheckButton" id="range">
- <property name="label" translatable="yes">_Range</property>
+ <property name="label" translatable="yes">_Range:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>