[glom] Glade files: Minor improvements
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Glade files: Minor improvements
- Date: Fri, 25 Oct 2013 09:20:41 +0000 (UTC)
commit c92eaf35a1d5ba67ca334192b8800ed7fc5fc5df
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Oct 25 10:13:40 2013 +0200
Glade files: Minor improvements
data/ui/developer/window_data_layout.glade | 4 +-
data/ui/operator/dialog_data_invalid_format.glade | 16 +++---
data/ui/operator/dialog_existing_or_new.glade | 16 +++---
data/ui/operator/dialog_import_csv.glade | 58 +++++++++++++-------
data/ui/operator/dialog_import_csv_progress.glade | 14 ++++--
5 files changed, 66 insertions(+), 42 deletions(-)
---
diff --git a/data/ui/developer/window_data_layout.glade b/data/ui/developer/window_data_layout.glade
index bae9f14..4bd1ed9 100644
--- a/data/ui/developer/window_data_layout.glade
+++ b/data/ui/developer/window_data_layout.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Oct 25 09:56:56 2013 -->
+<!-- Generated with glade 3.16.0 on Fri Oct 25 10:17:59 2013 -->
<interface>
<!-- interface-requires gtk+ 3.8 -->
<object class="GtkAdjustment" id="adjustment_column_line_width">
@@ -157,7 +157,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
diff --git a/data/ui/operator/dialog_data_invalid_format.glade
b/data/ui/operator/dialog_data_invalid_format.glade
index 836e044..7f33d27 100644
--- a/data/ui/operator/dialog_data_invalid_format.glade
+++ b/data/ui/operator/dialog_data_invalid_format.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 25 10:06:26 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_data_invalid_format">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -19,11 +20,11 @@
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -35,11 +36,11 @@
<child>
<object class="GtkButton" id="button_revert">
<property name="label">gtk-revert-to-saved</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -51,12 +52,12 @@
<child>
<object class="GtkButton" id="button4">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</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">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -75,7 +76,6 @@
</child>
<child>
<object class="GtkBox" id="hbox11">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -87,7 +87,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-info</property>
- <property name="icon-size">6</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
@@ -97,16 +97,16 @@
</child>
<child>
<object class="GtkBox" id="vbox18">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label46">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><span weight="bold"
size="larger">Invalid format</span>
+ <property name="label" translatable="yes"><span weight="bold"
size="larger">Invalid Format</span>
The data in the field was not recognized. Please try to correct the data or revert to the previous value.
Here is an example of correctly-formatted data for this field.
</property>
diff --git a/data/ui/operator/dialog_existing_or_new.glade b/data/ui/operator/dialog_existing_or_new.glade
index 826ceb3..cf593dd 100644
--- a/data/ui/operator/dialog_existing_or_new.glade
+++ b/data/ui/operator/dialog_existing_or_new.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 25 10:07:14 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_existing_or_new">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -22,10 +23,10 @@
<child>
<object class="GtkButton" id="helpbutton1">
<property name="label">gtk-help</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="use_stock">True</property>
</object>
<packing>
@@ -37,11 +38,11 @@
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-quit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -53,10 +54,10 @@
<child>
<object class="GtkButton" id="existing_or_new_button_select">
<property name="label" translatable="yes">_Select</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="use_underline">True</property>
</object>
<packing>
@@ -75,7 +76,6 @@
</child>
<child>
<object class="GtkBox" id="hbox8">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -86,7 +86,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
- <property name="icon-size">6</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
@@ -96,16 +96,16 @@
</child>
<child>
<object class="GtkBox" id="vbox4">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="existing_or_new_label">
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">Open
or create a Document</span></property>
+ <property name="label" translatable="yes"><span weight="bold" size="larger">Open
or Create a Document</span></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
diff --git a/data/ui/operator/dialog_import_csv.glade b/data/ui/operator/dialog_import_csv.glade
index b175605..cf8a1c5 100644
--- a/data/ui/operator/dialog_import_csv.glade
+++ b/data/ui/operator/dialog_import_csv.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 25 10:11:47 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_import_csv">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -23,10 +24,10 @@
<child>
<object class="GtkButton" id="import_csv_cancel_button">
<property name="label">gtk-cancel</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="use_stock">True</property>
</object>
<packing>
@@ -37,13 +38,12 @@
</child>
<child>
<object class="GtkButton" id="import_csv_import_button">
+ <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>
<child>
<object class="GtkBox" id="hbox4">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -83,10 +83,10 @@
<child>
<object class="GtkButton" id="import_csv_help_button">
<property name="label">gtk-help</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="use_stock">True</property>
</object>
<packing>
@@ -105,20 +105,23 @@
</child>
<child>
<object class="GtkBox" id="vbox1">
- <property name="orientation">vertical</property>
<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>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="vexpand">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkBox" id="hbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -133,8 +136,8 @@
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="import_csv_target_table">
<property name="visible">True</property>
@@ -145,26 +148,27 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="import_csv_first_line_as_title">
<property name="label" translatable="yes">_First line as title</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="hexpand">True</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -178,8 +182,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -191,8 +195,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">1</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -203,8 +207,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -218,8 +222,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">0</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -254,6 +258,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -278,23 +283,28 @@
<object class="GtkFrame" id="frame3">
<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>
<child>
<object class="GtkAlignment" id="alignment3">
<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="GtkBox" id="vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox5">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -342,11 +352,15 @@
<object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="import_csv_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
@@ -382,10 +396,12 @@
<object class="GtkLabel" id="import_csv_advice_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
@@ -394,11 +410,13 @@
<object class="GtkLabel" id="import_csv_error_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="label">label</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
diff --git a/data/ui/operator/dialog_import_csv_progress.glade
b/data/ui/operator/dialog_import_csv_progress.glade
index d2a28ee..db369e0 100644
--- a/data/ui/operator/dialog_import_csv_progress.glade
+++ b/data/ui/operator/dialog_import_csv_progress.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 25 10:12:32 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_import_csv_progress">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -21,10 +22,10 @@
<child>
<object class="GtkButton" id="import_csv_progress_cancel_button">
<property name="label">gtk-cancel</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="use_stock">True</property>
</object>
<packing>
@@ -36,10 +37,10 @@
<child>
<object class="GtkButton" id="import_csv_progress_ok_button">
<property name="label">gtk-ok</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="use_stock">True</property>
</object>
<packing>
@@ -58,10 +59,10 @@
</child>
<child>
<object class="GtkBox" id="vbox3">
- <property name="orientation">vertical</property>
<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">6</property>
<child>
<object class="GtkLabel" id="label5">
@@ -80,6 +81,7 @@
<object class="GtkProgressBar" id="import_csv_progress_progress_bar">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="pulse_step">0.10000000149</property>
</object>
<packing>
@@ -92,11 +94,15 @@
<object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="import_csv_progress_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word-char</property>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
