[Libreoffice-commits] core.git: cui/uiconfig extras/source sfx2/uiconfig sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Thu Apr 3 06:43:07 PDT 2014
cui/uiconfig/ui/insertplugin.ui | 1
extras/source/glade/libreoffice-catalog.xml.in | 3 ++
sfx2/uiconfig/ui/password.ui | 25 ++++++++----------
sw/uiconfig/swriter/ui/insertfootnote.ui | 1
sw/uiconfig/swriter/ui/inserttable.ui | 33 +++++++++++--------------
sw/uiconfig/swriter/ui/wordcount.ui | 16 ++++++------
6 files changed, 37 insertions(+), 42 deletions(-)
New commits:
commit 2d37dd8d5f79564dbf19546287cb258a1d6aef8c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 3 14:35:36 2014 +0100
Resolves: fdo#76486 Uniform Arrangement of the Help Button
Change-Id: If59c5c4901aeec404099c810a021eea8b8b3d3ab
diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui
index c992af4..1c2776c 100644
--- a/cui/uiconfig/ui/insertplugin.ui
+++ b/cui/uiconfig/ui/insertplugin.ui
@@ -189,7 +189,6 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
</object>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index e569553..6fae23f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -39,6 +39,9 @@
<glade-widget-class title="Thesaurus Edit" name="cuilo-ReplaceEdit"
generic-name="ReplaceEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
+ <glade-widget-class title="TableName Edit" name="swlo-TableNameEdit"
+ generic-name="TableNameEdit" parent="GtkEntry"
+ icon-name="widget-gtk-textentry"/>
<glade-widget-class title="Thesaurus Lookup" name="cuilo-LookUpComboBox"
generic-name="LookUpComboBox" parent="GtkEntry"
icon-name="widget-gtk-comboboxtext"/>
diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui
index ae9fd22..54263fc 100644
--- a/sfx2/uiconfig/ui/password.ui
+++ b/sfx2/uiconfig/ui/password.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="PasswordDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -16,10 +17,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -30,12 +33,10 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -46,8 +47,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -159,7 +160,6 @@
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -175,7 +175,6 @@
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -262,7 +261,6 @@
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -278,7 +276,6 @@
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -331,9 +328,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help</action-widget>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index ef1a037..9e92bc1 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -96,7 +96,6 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
- <property name="secondary">True</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index 15b5537..c7c98be 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">99</property>
@@ -24,28 +26,27 @@
<property name="margin_top">12</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="ok">
+ <property name="label" translatable="yes">Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="ok">
- <property name="label" translatable="yes">Insert</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -54,15 +55,15 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
@@ -109,7 +110,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="shadow_type">out</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -156,7 +156,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="shadow_type">none</property>
- <property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
@@ -190,7 +189,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="shadow_type">out</property>
- <property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
@@ -325,7 +323,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
@@ -410,9 +407,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help</action-widget>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index 3570476..464daa4 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="WordCountDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -17,10 +18,11 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -28,15 +30,13 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -303,8 +303,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help</action-widget>
<action-widget response="0">close</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
More information about the Libreoffice-commits
mailing list