[glom] Glade files: Replace GtkTable with GtkGrid
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Glade files: Replace GtkTable with GtkGrid
- Date: Thu, 10 Oct 2013 11:24:53 +0000 (UTC)
commit a23564a60d70174dfa44f18c2aa6f38f657c185c
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Oct 10 11:06:29 2013 +0200
Glade files: Replace GtkTable with GtkGrid
* ui/developer/*.glade:
* ui/operator/*.glade: Change all GtkTable types to GtkGrid.
Child items that should expand then have an hexpand=True in the
<child> part instead of x_options=GTK_FILL in the <packing> part.
The packing should also contain (and only contain) left_attach,
width, top_attach, and height.
ui/developer/box_formatting.glade | 51 ++++++++-------
ui/developer/dialog_add_related_table.glade | 26 +++++----
ui/developer/dialog_database_preferences.glade | 74 ++++++++++++-----------
ui/developer/dialog_flowtable.glade | 34 ++++++-----
ui/developer/dialog_initial_password.glade | 34 +++++------
ui/developer/dialog_line.glade | 26 +++++----
ui/developer/dialog_user.glade | 51 ++++++++-------
ui/developer/window_data_layout.glade | 62 ++++++++++---------
ui/developer/window_field_definition_edit.glade | 65 +++++++++++---------
ui/operator/dialog_connection.glade | 50 ++++++++-------
ui/operator/dialog_import_csv.glade | 38 +++++++-----
11 files changed, 273 insertions(+), 238 deletions(-)
---
diff --git a/ui/developer/box_formatting.glade b/ui/developer/box_formatting.glade
index 122696d..2817c0f 100644
--- a/ui/developer/box_formatting.glade
+++ b/ui/developer/box_formatting.glade
@@ -468,7 +468,7 @@
<property name="xalign">0</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table8">
+ <object class="GtkGrid" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">5</property>
@@ -480,6 +480,7 @@
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="label_choices_related_extra_fields">
<property name="visible">True</property>
@@ -511,23 +512,22 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_choices_related_field">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -540,8 +540,10 @@
<property name="single_line_mode">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -554,10 +556,10 @@
<property name="single_line_mode">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -570,16 +572,17 @@
<property name="single_line_mode">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_choices_related_relationship">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -592,6 +595,7 @@
<property name="label" translatable="yes">Show all records</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="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If this option is
selected then the choices will list values from all records in the related table. If this option is not
selected then the choices will list values only from related records.</property>
@@ -602,10 +606,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -618,10 +621,10 @@
<property name="single_line_mode">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -632,6 +635,7 @@
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="label_choices_related_sortby">
<property name="visible">True</property>
@@ -663,10 +667,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/dialog_add_related_table.glade b/ui/developer/dialog_add_related_table.glade
index 934a5ca..1235f89 100644
--- a/ui/developer/dialog_add_related_table.glade
+++ b/ui/developer/dialog_add_related_table.glade
@@ -212,7 +212,7 @@ If a suitable related table already exists then you should instead cancel and ju
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -227,20 +227,24 @@ If a suitable related table already exists then you should instead cancel and ju
<property name="label" translatable="yes">Name of new related table:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_related_table_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -251,25 +255,25 @@ If a suitable related table already exists then you should instead cancel and ju
<property name="label" translatable="yes">Name of new relationship:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_relationship_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/dialog_database_preferences.glade b/ui/developer/dialog_database_preferences.glade
index 05b2db0..f2f52b9 100644
--- a/ui/developer/dialog_database_preferences.glade
+++ b/ui/developer/dialog_database_preferences.glade
@@ -147,7 +147,7 @@
<property name="can_focus">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -172,7 +172,7 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkGrid" id="table10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">6</property>
@@ -183,76 +183,76 @@
<object class="GtkEntry" id="entry_org_address_country">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_org_address_postcode">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_org_address_county">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_org_address_town">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_org_address_street2">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_org_address_street">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="width">1</property>
</packing>
</child>
<child>
@@ -263,10 +263,10 @@
<property name="label" translatable="yes">Country:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -277,10 +277,10 @@
<property name="label" translatable="yes">Zip/Postal Code:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -291,10 +291,10 @@
<property name="label" translatable="yes">State/County:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -305,10 +305,10 @@
<property name="label" translatable="yes">Town:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -319,10 +319,10 @@
<property name="label" translatable="yes">Street (Line 2):</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -333,8 +333,10 @@
<property name="label" translatable="yes">Street:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/dialog_flowtable.glade b/ui/developer/dialog_flowtable.glade
index 74096ca..d0d1ed7 100644
--- a/ui/developer/dialog_flowtable.glade
+++ b/ui/developer/dialog_flowtable.glade
@@ -57,7 +57,7 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -68,14 +68,14 @@
<object class="GtkSpinButton" id="spin_columns">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="numeric">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="top_attach">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -86,21 +86,23 @@
<property name="label" translatable="yes">Columns:</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -111,8 +113,10 @@
<property name="label" translatable="yes">Title:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/dialog_initial_password.glade b/ui/developer/dialog_initial_password.glade
index 350b22f..db5edc4 100644
--- a/ui/developer/dialog_initial_password.glade
+++ b/ui/developer/dialog_initial_password.glade
@@ -38,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
@@ -58,9 +58,7 @@
</object>
<packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
</packing>
</child>
<child>
@@ -69,13 +67,13 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -83,14 +81,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
</packing>
</child>
<child>
@@ -107,9 +105,7 @@
</object>
<packing>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
</packing>
</child>
<child>
@@ -117,15 +113,15 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -141,10 +137,10 @@
</accessibility>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/ui/developer/dialog_line.glade b/ui/developer/dialog_line.glade
index 0dfc409..e6c81dc 100644
--- a/ui/developer/dialog_line.glade
+++ b/ui/developer/dialog_line.glade
@@ -81,7 +81,7 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -97,8 +97,10 @@
<property name="label" translatable="yes">Line Width:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">0</property>
+ <property name="top_attach">0</property>
+ <property name="height">0</property>
</packing>
</child>
<child>
@@ -109,16 +111,17 @@
<property name="label" translatable="yes">Color:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinbutton_line_width">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
@@ -129,8 +132,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -138,15 +142,15 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="hexpand">True</property>
<property name="use_action_appearance">False</property>
<property name="color">#000000000000</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/dialog_user.glade b/ui/developer/dialog_user.glade
index 13e096a..bff430f 100644
--- a/ui/developer/dialog_user.glade
+++ b/ui/developer/dialog_user.glade
@@ -96,7 +96,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">4</property>
@@ -107,14 +107,13 @@
<object class="GtkComboBoxText" id="combobox_group">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -125,10 +124,10 @@
<property name="label" translatable="yes">Group:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -136,13 +135,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -154,10 +153,10 @@
<property name="justify">right</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -169,10 +168,10 @@
<property name="justify">right</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -182,13 +181,13 @@
<property name="has_focus">True</property>
<property name="visibility">False</property>
<property name="activates_default">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -200,19 +199,23 @@
<property name="justify">right</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_user">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/window_data_layout.glade b/ui/developer/window_data_layout.glade
index b323a31..4cce1ed 100644
--- a/ui/developer/window_data_layout.glade
+++ b/ui/developer/window_data_layout.glade
@@ -170,7 +170,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table11">
+ <object class="GtkGrid" id="table11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -181,6 +181,7 @@
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview_fields">
@@ -192,6 +193,12 @@
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
+ </packing>
</child>
<child>
<object class="GtkBox" id="vbox93">
@@ -665,9 +672,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -826,10 +833,10 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1189,7 +1196,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
@@ -1204,8 +1211,10 @@
<property name="label" translatable="yes">Row Line Width:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1220,9 +1229,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1233,10 +1242,10 @@
<property name="label" translatable="yes">Column Line Width:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1252,11 +1261,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1264,14 +1271,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Line Color:
-</property>
+ <property name="label" translatable="yes">Line Color:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -1284,11 +1290,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/developer/window_field_definition_edit.glade b/ui/developer/window_field_definition_edit.glade
index 05aba32..48da40b 100644
--- a/ui/developer/window_field_definition_edit.glade
+++ b/ui/developer/window_field_definition_edit.glade
@@ -25,7 +25,7 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table4">
+ <object class="GtkGrid" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -37,11 +37,13 @@
<object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -55,35 +57,36 @@
<property name="mnemonic_widget">entry_name</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_type">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -103,10 +106,10 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -127,10 +130,10 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -280,7 +283,7 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table_lookup">
+ <object class="GtkGrid" id="table_lookup">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -291,24 +294,26 @@
<object class="GtkComboBoxText" id="combobox_lookup_field">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox_lookup_relationship">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -321,8 +326,10 @@
<property name="justify">right</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -342,10 +349,10 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/operator/dialog_connection.glade b/ui/operator/dialog_connection.glade
index a4379c4..e7c0eca 100644
--- a/ui/operator/dialog_connection.glade
+++ b/ui/operator/dialog_connection.glade
@@ -101,7 +101,7 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">4</property>
@@ -112,6 +112,7 @@
<object class="GtkEntry" id="entry_host">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<child internal-child="accessible">
<object class="AtkObject" id="entry_host-atkobject">
@@ -121,8 +122,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -130,6 +132,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
<child internal-child="accessible">
@@ -140,16 +143,16 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_user">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<child internal-child="accessible">
<object class="AtkObject" id="entry_user-atkobject">
@@ -159,10 +162,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -179,8 +181,10 @@
</accessibility>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -192,10 +196,10 @@
<property name="justify">right</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -212,10 +216,10 @@
</accessibility>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -232,16 +236,17 @@
</accessibility>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_database">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
<child internal-child="accessible">
@@ -252,10 +257,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/ui/operator/dialog_import_csv.glade b/ui/operator/dialog_import_csv.glade
index b9bdc01..ebcf86c 100644
--- a/ui/operator/dialog_import_csv.glade
+++ b/ui/operator/dialog_import_csv.glade
@@ -130,7 +130,7 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
@@ -141,13 +141,15 @@
<object class="GtkLabel" id="import_csv_target_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -155,6 +157,7 @@
<property name="label" translatable="yes">_First line as title</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="use_underline">True</property>
@@ -162,10 +165,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -177,23 +179,23 @@
<property name="use_underline">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="import_csv_encoding">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="width">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -202,10 +204,10 @@
<property name="can_focus">False</property>
</object>
<packing>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -217,8 +219,10 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
