[glom] Glade files: Now all windows have a 12 pixel border as per the HIG.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Glade files: Now all windows have a 12 pixel border as per the HIG.
- Date: Wed, 23 Oct 2013 10:31:56 +0000 (UTC)
commit de465b249aa2a76e3fdde41d983c8ee102c89647
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 23 11:12:15 2013 +0200
Glade files: Now all windows have a 12 pixel border as per the HIG.
* For GtkWindows, set the border-width to 12, unless it needs a
menu, in which case the window should have 0 border-width,
and an inner GtkBox, a sub-GtkBox and GtkButtonBox should have
a border width of 6, allowing the menu to fit snugly into the window edge.
Using just a border-width of 12 on both the GtkBox and the
GtkButtonBox would leave 24 pixels between them.
* For GtkDialog, set the border-width to 6 and give the GtkBox in
the content area another border-width of 6, because the
GtkButtonBox in the action area seems to have this already too.
I do not know why GtkDialogs do not just have a border-width of
12, and a VBox spacing of 12.
data/ui/developer/dialog_add_related_table.glade | 25 ++--
data/ui/developer/dialog_change_language.glade | 5 +-
data/ui/developer/dialog_choose_user.glade | 21 +--
.../ui/developer/dialog_database_preferences.glade | 31 ++--
data/ui/developer/dialog_field_summary.glade | 3 +-
data/ui/developer/dialog_flowtable.glade | 42 +++---
data/ui/developer/dialog_group_by.glade | 3 +-
.../developer/dialog_layout_field_properties.glade | 3 +-
data/ui/developer/dialog_line.glade | 28 ++--
data/ui/developer/dialog_new_group.glade | 18 +-
data/ui/developer/dialog_new_library_script.glade | 19 +-
data/ui/developer/dialog_notebook.glade | 3 +-
data/ui/developer/dialog_script_library.glade | 26 +--
data/ui/developer/dialog_sort_fields.glade | 3 +-
data/ui/developer/dialog_translation_copy.glade | 5 +-
data/ui/developer/dialog_user.glade | 36 ++--
data/ui/developer/window_button_script.glade | 3 +-
data/ui/developer/window_design.glade | 6 +-
data/ui/developer/window_field_calculation.glade | 145 +++++++++--------
.../developer/window_field_definition_edit.glade | 70 ++++-----
data/ui/developer/window_imageobject.glade | 157 ++++++++++--------
data/ui/developer/window_print_layout_edit.glade | 175 +-------------------
...w.glade => window_relationships_overview.glade} | 0
data/ui/developer/window_text_format.glade | 19 ++-
data/ui/developer/window_textobject.glade | 16 +-
data/ui/developer/window_translations.glade | 4 +-
data/ui/developer/window_users.glade | 3 +-
data/ui/operator/box_navigation_tables.glade | 13 +-
data/ui/operator/dialog_choose_date.glade | 19 ++-
...verview.cc => window_relationships_overview.cc} | 0
..._overview.h => window_relationships_overview.h} | 0
glom/window_boxholder.cc | 2 +-
32 files changed, 384 insertions(+), 519 deletions(-)
---
diff --git a/data/ui/developer/dialog_add_related_table.glade
b/data/ui/developer/dialog_add_related_table.glade
index ddfe62a..01800bf 100644
--- a/data/ui/developer/dialog_add_related_table.glade
+++ b/data/ui/developer/dialog_add_related_table.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Tue Oct 22 22:17:12 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_add_related_table">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Add Related Table</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -19,11 +21,11 @@
<child>
<object class="GtkButton" id="button41">
<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="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>
@@ -34,12 +36,12 @@
</child>
<child>
<object class="GtkButton" id="button_ok">
+ <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>
<child>
<object class="GtkAlignment" id="alignment92">
<property name="visible">True</property>
@@ -48,7 +50,6 @@
<property name="yscale">0</property>
<child>
<object class="GtkBox" id="hbox128">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -98,10 +99,10 @@
</child>
<child>
<object class="GtkBox" id="vbox104">
- <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">18</property>
<child>
<object class="GtkLabel" id="label259">
@@ -122,7 +123,6 @@ If a suitable related table already exists then you should instead cancel and ju
</child>
<child>
<object class="GtkBox" id="hbox125">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
@@ -151,10 +151,10 @@ If a suitable related table already exists then you should instead cancel and ju
</child>
<child>
<object class="GtkButton" id="button_edit_fields">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkAlignment" id="alignment91">
<property name="visible">True</property>
@@ -163,7 +163,6 @@ If a suitable related table already exists then you should instead cancel and ju
<property name="yscale">0</property>
<child>
<object class="GtkBox" id="hbox127">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -215,8 +214,8 @@ If a suitable related table already exists then you should instead cancel and ju
<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="label247">
<property name="visible">True</property>
@@ -226,8 +225,8 @@ If a suitable related table already exists then you should instead cancel and ju
</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>
@@ -240,8 +239,8 @@ If a suitable related table already exists then you should instead cancel and ju
</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>
@@ -254,8 +253,8 @@ If a suitable related table already exists then you should instead cancel and ju
</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>
@@ -269,8 +268,8 @@ If a suitable related table already exists then you should instead cancel and ju
</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>
diff --git a/data/ui/developer/dialog_change_language.glade b/data/ui/developer/dialog_change_language.glade
index ca4a22b..781ef49 100644
--- a/data/ui/developer/dialog_change_language.glade
+++ b/data/ui/developer/dialog_change_language.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:39:11 2013 -->
+<!-- Generated with glade 3.15.4 on Tue Oct 22 22:21:47 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_change_language">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Test Translation</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -111,7 +112,7 @@
<object class="GtkBox" id="hbox84">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image34">
diff --git a/data/ui/developer/dialog_choose_user.glade b/data/ui/developer/dialog_choose_user.glade
index c8ab95e..df53158 100644
--- a/data/ui/developer/dialog_choose_user.glade
+++ b/data/ui/developer/dialog_choose_user.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Tue Oct 22 22:21:19 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_choose_user">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Choose User</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -18,11 +20,11 @@
<child>
<object class="GtkButton" id="button23">
<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>
@@ -34,11 +36,11 @@
<child>
<object class="GtkButton" id="button24">
<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="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>
@@ -50,11 +52,11 @@
<child>
<object class="GtkButton" id="button25">
<property name="label">gtk-add</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>
@@ -73,16 +75,15 @@
</child>
<child>
<object class="GtkBox" id="vbox47">
- <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="GtkBox" id="hbox42">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image25">
@@ -91,7 +92,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>
@@ -101,9 +102,9 @@
</child>
<child>
<object class="GtkBox" id="vbox48">
- <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="label101">
<property name="visible">True</property>
@@ -139,10 +140,8 @@ Which user should be added to this group?</property>
</child>
<child>
<object class="GtkBox" id="hbox43">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label102">
diff --git a/data/ui/developer/dialog_database_preferences.glade
b/data/ui/developer/dialog_database_preferences.glade
index ba7a923..e632274 100644
--- a/data/ui/developer/dialog_database_preferences.glade
+++ b/data/ui/developer/dialog_database_preferences.glade
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:46:55 2013 -->
+<!-- Generated with glade 3.15.4 on Tue Oct 22 22:20:51 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtksourceview 0.0 -->
<object class="GtkDialog" id="dialog_database_preferences">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Database Preferences</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -74,7 +75,7 @@
<object class="GtkBox" id="vbox61">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -175,8 +176,8 @@
<object class="GtkGrid" id="table10">
<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="GtkEntry" id="entry_org_address_country">
<property name="visible">True</property>
@@ -185,8 +186,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">5</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -198,8 +199,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -211,8 +212,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="width">1</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -224,8 +225,8 @@
</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>
@@ -237,8 +238,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>
@@ -250,7 +251,9 @@
</object>
<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>
@@ -262,8 +265,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">5</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -276,8 +279,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">4</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -290,8 +293,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -304,8 +307,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>
@@ -318,8 +321,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>
@@ -332,8 +335,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>
diff --git a/data/ui/developer/dialog_field_summary.glade b/data/ui/developer/dialog_field_summary.glade
index 3b70c35..fca1a27 100644
--- a/data/ui/developer/dialog_field_summary.glade
+++ b/data/ui/developer/dialog_field_summary.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:49:17 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:03:42 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_field_summary">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Field Summary</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/data/ui/developer/dialog_flowtable.glade b/data/ui/developer/dialog_flowtable.glade
index d73afee..cee0138 100644
--- a/data/ui/developer/dialog_flowtable.glade
+++ b/data/ui/developer/dialog_flowtable.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:04:44 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_flowtable">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -21,10 +22,10 @@
<child>
<object class="GtkButton" id="button_close">
<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">True</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="button5">
<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">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -60,8 +61,9 @@
<object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">5</property>
+ <property name="border_width">6</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkSpinButton" id="spin_columns">
<property name="visible">True</property>
@@ -70,10 +72,10 @@
<property name="numeric">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="width">1</property>
- <property name="top_attach">1</property>
- <property name="height">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -84,10 +86,10 @@
<property name="label" translatable="yes">Columns:</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="width">1</property>
- <property name="top_attach">1</property>
- <property name="height">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -97,10 +99,10 @@
<property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="width">1</property>
- <property name="top_attach">0</property>
- <property name="height">1</property>
+ <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>
@@ -111,10 +113,10 @@
<property name="label" translatable="yes">Title:</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="width">1</property>
- <property name="top_attach">0</property>
- <property name="height">1</property>
+ <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/data/ui/developer/dialog_group_by.glade b/data/ui/developer/dialog_group_by.glade
index 6beead9..114fd85 100644
--- a/data/ui/developer/dialog_group_by.glade
+++ b/data/ui/developer/dialog_group_by.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:50:04 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:05:08 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_group_by">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Group By</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/data/ui/developer/dialog_layout_field_properties.glade
b/data/ui/developer/dialog_layout_field_properties.glade
index de47bd4..2c1e720 100644
--- a/data/ui/developer/dialog_layout_field_properties.glade
+++ b/data/ui/developer/dialog_layout_field_properties.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Mon Oct 21 12:14:22 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:05:59 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_layout_field_properties">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Field Layout</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/data/ui/developer/dialog_line.glade b/data/ui/developer/dialog_line.glade
index bf3a6dd..5db7073 100644
--- a/data/ui/developer/dialog_line.glade
+++ b/data/ui/developer/dialog_line.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:06:19 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">300</property>
<property name="step_increment">0.5</property>
@@ -9,29 +9,29 @@
</object>
<object class="GtkDialog" id="dialog_line">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Text Object</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area2">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton2">
<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>
@@ -43,11 +43,11 @@
<child>
<object class="GtkButton" id="cancelbutton2">
<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="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>
@@ -59,11 +59,11 @@
<child>
<object class="GtkButton" id="okbutton2">
<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="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -85,8 +85,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -96,8 +96,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">0</property>
<property name="top_attach">0</property>
+ <property name="width">0</property>
<property name="height">0</property>
</packing>
</child>
@@ -110,8 +110,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>
@@ -123,31 +123,29 @@
<property name="invisible_char">•</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">3</property>
</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="GtkColorButton" id="colorbutton">
+ <property name="use_action_appearance">False</property>
<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="rgba">rgb(0,0,0)</property>
</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>
diff --git a/data/ui/developer/dialog_new_group.glade b/data/ui/developer/dialog_new_group.glade
index a9eb6f9..a4d05c0 100644
--- a/data/ui/developer/dialog_new_group.glade
+++ b/data/ui/developer/dialog_new_group.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:06:52 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_new_group">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Create Group</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -18,11 +20,11 @@
<child>
<object class="GtkButton" id="helpbutton4">
<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>
@@ -34,11 +36,11 @@
<child>
<object class="GtkButton" id="cancelbutton5">
<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="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>
@@ -49,11 +51,11 @@
</child>
<child>
<object class="GtkButton" id="button_ok">
+ <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>
<child>
<object class="GtkAlignment" id="alignment31">
<property name="visible">True</property>
@@ -62,7 +64,6 @@
<property name="yscale">0</property>
<child>
<object class="GtkBox" id="hbox38">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -112,13 +113,12 @@
</child>
<child>
<object class="GtkBox" id="vbox45">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox39">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -130,7 +130,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>
@@ -140,7 +140,6 @@
</child>
<child>
<object class="GtkBox" id="vbox1">
-
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -178,7 +177,6 @@ What name should this group have?</property>
</child>
<child>
<object class="GtkBox" id="hbox40">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
diff --git a/data/ui/developer/dialog_new_library_script.glade
b/data/ui/developer/dialog_new_library_script.glade
index 13e9bdf..d641b22 100644
--- a/data/ui/developer/dialog_new_library_script.glade
+++ b/data/ui/developer/dialog_new_library_script.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:07:14 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_new_library_script">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Create Group</property>
<property name="default_width">311</property>
<property name="default_height">179</property>
@@ -20,11 +22,11 @@
<child>
<object class="GtkButton" id="helpbutton7">
<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>
@@ -36,11 +38,11 @@
<child>
<object class="GtkButton" id="cancelbutton8">
<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="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 +53,12 @@
</child>
<child>
<object class="GtkButton" id="button_ok1">
+ <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>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -65,7 +67,6 @@
<property name="yscale">0</property>
<child>
<object class="GtkBox" id="hbox13">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -115,13 +116,12 @@
</child>
<child>
<object class="GtkBox" id="vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox4">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -133,7 +133,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>
@@ -143,9 +143,9 @@
</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="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
@@ -181,7 +181,6 @@ What name should this module have?</property>
</child>
<child>
<object class="GtkBox" id="hbox6">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
diff --git a/data/ui/developer/dialog_notebook.glade b/data/ui/developer/dialog_notebook.glade
index 67515ee..c3e50cd 100644
--- a/data/ui/developer/dialog_notebook.glade
+++ b/data/ui/developer/dialog_notebook.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:52:21 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:08:45 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_notebook">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Notebook Tabs</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/data/ui/developer/dialog_script_library.glade b/data/ui/developer/dialog_script_library.glade
index 732b336..09f0a2d 100644
--- a/data/ui/developer/dialog_script_library.glade
+++ b/data/ui/developer/dialog_script_library.glade
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Tue Oct 22 22:16:16 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtksourceview 0.0 -->
<object class="GtkDialog" id="dialog_script_library">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Script Library</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
@@ -21,11 +23,11 @@
<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="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>
@@ -37,11 +39,11 @@
<child>
<object class="GtkButton" id="okbutton5">
<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="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -60,10 +62,10 @@
</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="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
@@ -81,7 +83,6 @@
</child>
<child>
<object class="GtkBox" id="hbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -111,10 +112,10 @@
<child>
<object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -126,10 +127,10 @@
<child>
<object class="GtkButton" id="button_remove">
<property name="label">gtk-remove</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -151,14 +152,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
- <child>
- <object class="GtkSourceView" id="textview_script">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="left_margin">2</property>
- <property name="right_margin">2</property>
- </object>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -168,18 +161,17 @@
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_check">
<property name="label" translatable="yes" comments="Translators: This is the verb. It is
for checking that a Python script works.">_Check</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_underline">True</property>
</object>
<packing>
diff --git a/data/ui/developer/dialog_sort_fields.glade b/data/ui/developer/dialog_sort_fields.glade
index c5457b5..321baa1 100644
--- a/data/ui/developer/dialog_sort_fields.glade
+++ b/data/ui/developer/dialog_sort_fields.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:54:12 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:10:13 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_sort_fields">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Group By - Sort Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/data/ui/developer/dialog_translation_copy.glade b/data/ui/developer/dialog_translation_copy.glade
index 926535a..2e833b6 100644
--- a/data/ui/developer/dialog_translation_copy.glade
+++ b/data/ui/developer/dialog_translation_copy.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Mon Sep 23 22:54:36 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:11:28 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_translation_copy">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Identify Original</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -111,6 +112,8 @@
<object class="GtkBox" id="hbox93">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">False</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
diff --git a/data/ui/developer/dialog_user.glade b/data/ui/developer/dialog_user.glade
index c2a5f57..e7a7cc4 100644
--- a/data/ui/developer/dialog_user.glade
+++ b/data/ui/developer/dialog_user.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:11:45 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_user">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">User</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -18,11 +20,11 @@
<child>
<object class="GtkButton" id="helpbutton3">
<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>
@@ -34,11 +36,11 @@
<child>
<object class="GtkButton" id="cancelbutton4">
<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="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>
@@ -50,11 +52,11 @@
<child>
<object class="GtkButton" id="okbutton3">
<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="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -73,10 +75,10 @@
</child>
<child>
<object class="GtkBox" id="vbox42">
- <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="GtkFrame" id="frame9">
@@ -91,16 +93,16 @@
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="vbox43">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkGrid" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBoxText" id="combobox_group">
<property name="visible">True</property>
@@ -109,8 +111,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>
@@ -123,8 +125,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>
@@ -132,13 +134,13 @@
<object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
<property name="hexpand">True</property>
+ <property name="visibility">False</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>
@@ -152,8 +154,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>
@@ -167,8 +169,8 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="width">1</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -177,14 +179,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
+ <property name="hexpand">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="width">1</property>
<property name="top_attach">3</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -198,8 +200,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>
@@ -211,8 +213,8 @@
</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>
diff --git a/data/ui/developer/window_button_script.glade b/data/ui/developer/window_button_script.glade
index 4be39ad..740e2b2 100644
--- a/data/ui/developer/window_button_script.glade
+++ b/data/ui/developer/window_button_script.glade
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Tue Sep 24 11:03:14 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:18:05 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtksourceview 0.0 -->
<object class="GtkDialog" id="window_button_script">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Button Script</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
diff --git a/data/ui/developer/window_design.glade b/data/ui/developer/window_design.glade
index 10cba52..1493fb2 100644
--- a/data/ui/developer/window_design.glade
+++ b/data/ui/developer/window_design.glade
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Tue Sep 24 12:01:37 2013 -->
+<!-- Generated with glade 3.15.4 on Tue Oct 22 21:58:27 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkWindow" id="window_design">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Field Definitions</property>
@@ -63,6 +62,7 @@
<object class="GtkBox" id="vbox_placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
diff --git a/data/ui/developer/window_field_calculation.glade
b/data/ui/developer/window_field_calculation.glade
index aafccdc..696ad12 100644
--- a/data/ui/developer/window_field_calculation.glade
+++ b/data/ui/developer/window_field_calculation.glade
@@ -1,30 +1,90 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:19:51 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtksourceview 0.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
-
<object class="GtkDialog" id="window_field_calculation">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Field Calculation</property>
<property name="default_width">398</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
- <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 internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton2">
+ <property name="label">gtk-help</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton2">
+ <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="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton2">
+ <property name="label">gtk-ok</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="vbox21">
- <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="label54">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">The field value will be the return value of the
python function, which you implement here.</property>
<property name="wrap">True</property>
@@ -38,6 +98,7 @@
<child>
<object class="GtkLabel" id="label55">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">import glom
@@ -54,12 +115,13 @@
<object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
<object class="GtkSourceView" id="textview_calculation">
@@ -73,13 +135,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox14">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_test">
@@ -105,12 +169,13 @@
</child>
<child>
<object class="GtkBox" id="hbox50">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_trigger_prefix">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Triggered by:</property>
</object>
<packing>
@@ -122,6 +187,7 @@
<child>
<object class="GtkLabel" id="label_triggered_by">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -138,64 +204,9 @@
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="orientation">horizontal</property>
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton2">
- <property name="label">gtk-help</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_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancelbutton2">
- <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="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="okbutton2">
- <property name="label">gtk-ok</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_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/data/ui/developer/window_field_definition_edit.glade
b/data/ui/developer/window_field_definition_edit.glade
index 38b5efd..dc480d8 100644
--- a/data/ui/developer/window_field_definition_edit.glade
+++ b/data/ui/developer/window_field_definition_edit.glade
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:20:54 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<!-- interface-requires gtksourceview 0.0 -->
<object class="GtkWindow" id="window_field_definition_edit">
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Field Definition</property>
<property name="window_position">center-on-parent</property>
<child>
<object class="GtkBox" id="vbox11">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkNotebook" id="notebook1">
@@ -19,18 +20,18 @@
<property name="can_focus">True</property>
<child>
<object class="GtkBox" id="vbox13">
- <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="GtkGrid" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
@@ -39,8 +40,8 @@
</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>
@@ -56,8 +57,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>
@@ -69,8 +70,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>
@@ -82,8 +83,8 @@
</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>
@@ -105,8 +106,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>
@@ -129,8 +130,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>
@@ -143,18 +144,18 @@
</child>
<child>
<object class="GtkBox" id="vbox12">
- <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="GtkCheckButton" id="checkbutton_primarykey">
<property name="label" translatable="yes">_Primary Key</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -168,10 +169,10 @@
<child>
<object class="GtkCheckButton" id="checkbutton_unique">
<property name="label" translatable="yes">_Unique</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -185,10 +186,10 @@
<child>
<object class="GtkCheckButton" id="checkbutton_autoincrement">
<property name="label" translatable="yes">_Auto-increment</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -221,10 +222,10 @@
</child>
<child>
<object class="GtkBox" id="box_default_value">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkFrame" id="frame39">
@@ -240,13 +241,12 @@
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="vbox96">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox_default_value_simple">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
@@ -266,10 +266,10 @@
<child>
<object class="GtkCheckButton" id="checkbutton_lookup">
<property name="label" translatable="yes">_Lookup value when a field
changes.</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -284,8 +284,8 @@
<object class="GtkGrid" id="table_lookup">
<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="GtkComboBoxText" id="combobox_lookup_field">
<property name="visible">True</property>
@@ -294,8 +294,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>
@@ -307,8 +307,8 @@
</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>
@@ -323,8 +323,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>
@@ -346,8 +346,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>
@@ -365,10 +365,10 @@
<child type="label">
<object class="GtkRadioButton" id="radiobutton_userentry">
<property name="label" translatable="yes">_User Entry</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -395,7 +395,6 @@
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="hbox16">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -404,12 +403,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
- <child>
- <object class="GtkSourceView" id="textview_calculate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
</object>
<packing>
<property name="expand">True</property>
@@ -419,16 +412,16 @@
</child>
<child>
<object class="GtkBox" id="vbox22">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="button_edit_calculation">
<property name="label" translatable="yes">_Edit</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>
@@ -451,10 +444,10 @@
<child type="label">
<object class="GtkRadioButton" id="radiobutton_calculate">
<property name="label" translatable="yes">_Calculate Value</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>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -487,10 +480,10 @@
</child>
<child>
<object class="GtkBox" id="box_formatting_placeholder">
- <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>
<child>
<placeholder/>
</child>
@@ -520,7 +513,6 @@
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox8">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -528,11 +520,11 @@
<child>
<object class="GtkButton" id="button_cancel">
<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="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>
@@ -544,13 +536,13 @@
<child>
<object class="GtkButton" id="button_save">
<property name="label">gtk-save</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</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>
diff --git a/data/ui/developer/window_imageobject.glade b/data/ui/developer/window_imageobject.glade
index e3bdfb4..22b3b4e 100644
--- a/data/ui/developer/window_imageobject.glade
+++ b/data/ui/developer/window_imageobject.glade
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:22:05 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
- <!-- interface-naming-policy toplevel-contextual -->
-
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="window_imageobject">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Image Object</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">300</property>
@@ -11,31 +12,91 @@
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton2">
+ <property name="label">gtk-help</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton2">
+ <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="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_ok">
+ <property name="label">gtk-ok</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="vbox21">
- <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">12</property>
<child>
<object class="GtkBox" id="vbox_title">
- <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="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Title:</b></property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -43,57 +104,64 @@
<object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox1">
- <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="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Image:</b></property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox97">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkEventBox" id="imageglom">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_choose_image">
@@ -104,16 +172,18 @@
<child>
<object class="GtkAlignment" id="alignment87">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkBox" id="hbox111">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image48">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-open</property>
</object>
<packing>
@@ -125,6 +195,7 @@
<child>
<object class="GtkLabel" id="label241">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label">C_hoose Image</property>
<property name="use_underline">True</property>
</object>
@@ -148,79 +219,29 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="orientation">horizontal</property>
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton2">
- <property name="label">gtk-help</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_stock">True</property>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancelbutton2">
- <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="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="button_ok">
- <property name="label">gtk-ok</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_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/data/ui/developer/window_print_layout_edit.glade
b/data/ui/developer/window_print_layout_edit.glade
index 2225866..8e157f2 100644
--- a/data/ui/developer/window_print_layout_edit.glade
+++ b/data/ui/developer/window_print_layout_edit.glade
@@ -1,180 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Tue Sep 24 11:04:34 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:23:00 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
-
- <menu id='Menubar'>
- <submenu>
- <attribute name='label' translatable='yes'>_File</attribute>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Page Set_up</attribute>
- <attribute name='action'>printlayout.pagesetup</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Print Pre_view</attribute>
- <attribute name='action'>printlayout.printpreview</attribute>
- </item>
- </section>
- </submenu>
- <submenu>
- <attribute name='label' translatable='yes'>_Edit</attribute>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Cu_t</attribute>
- <attribute name='action'>printlayout.cut</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>_Copy</attribute>
- <attribute name='action'>printlayout.copy</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>_Paste</attribute>
- <attribute name='action'>printlayout.paste</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>_Delete</attribute>
- <attribute name='action'>printlayout.delete</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Select _All</attribute>
- <attribute name='action'>printlayout.select-all</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>_Unselect All</attribute>
- <attribute name='action'>printlayout.unselect-all</attribute>
- </item>
- </section>
- </submenu>
- <submenu>
- <attribute name='label' translatable='yes'>_Insert</attribute>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Insert _Field</attribute>
- <attribute name='action'>printlayout.insertfield</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Text</attribute>
- <attribute name='action'>printlayout.inserttext</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Image</attribute>
- <attribute name='action'>printlayout.insertimage</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Related Records</attribute>
- <attribute name='action'>printlayout.insertrelatedrecords</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Horizontal Line</attribute>
- <attribute name='action'>printlayout.inserthorizontalline</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Vertical Line</attribute>
- <attribute name='action'>printlayout.insertverticalline</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Create _Standard</attribute>
- <attribute name='action'>printlayout.createstandard</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Add Page</attribute>
- <attribute name='action'>printlayout.addpage</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Delete Page</attribute>
- <attribute name='action'>printlayout.deletepage</attribute>
- </item>
- </section>
- </submenu>
- <submenu>
- <attribute name='label' translatable='yes'>_Align</attribute>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Align _Top</attribute>
- <attribute name='action'>printlayout.aligntop</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Align _Bottom</attribute>
- <attribute name='action'>printlayout.alignbottom</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Align _Left</attribute>
- <attribute name='action'>printlayout.alignleft</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Align _Right</attribute>
- <attribute name='action'>printlayout.alignright</attribute>
- </item>
- </section>
- </submenu>
- <submenu>
- <attribute name='label' translatable='yes'>_View</attribute>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Show _Grid</attribute>
- <attribute name='action'>printlayout.showgrid</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Show _Rules</attribute>
- <attribute name='action'>printlayout.showrules</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Show _Outlines</attribute>
- <attribute name='action'>printlayout.showoutlines</attribute>
- </item>
- </section>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Fit Page _Width</attribute>
- <attribute name='action'>printlayout.zoom</attribute>
- <attribute name='target' type='i'>0</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Zoom 200%</attribute>
- <attribute name='action'>printlayout.zoom</attribute>
- <attribute name='target' type='i'>200</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Zoom 100%</attribute>
- <attribute name='action'>printlayout.zoom</attribute>
- <attribute name='target' type='i'>100</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Zoom 50%</attribute>
- <attribute name='action'>printlayout.zoom</attribute>
- <attribute name='target' type='i'>50</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Zoom 25%</attribute>
- <attribute name='action'>printlayout.zoom</attribute>
- <attribute name='target' type='i'>25</attribute>
- </item>
- </section>
- </submenu>
- </menu>
-
- <menu id='ContextMenu'>
- <section>
- <item>
- <attribute name='label' translatable='yes'>Insert _Field</attribute>
- <attribute name='action'>context.insert-field</attribute>
- </item>
- <item>
- <attribute name='label' translatable='yes'>Insert _Text</attribute>
- <attribute name='action'>context.insert-text</attribute>
- </item>
- </section>
- </menu>
-
<object class="GtkApplicationWindow" id="window_print_layout_edit">
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Print Layout Editor</property>
<child>
<object class="GtkBox" id="vbox2">
@@ -201,7 +31,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">12</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="vbox_inner">
diff --git a/data/ui/developer/dialog_relationships_overview.glade
b/data/ui/developer/window_relationships_overview.glade
similarity index 100%
rename from data/ui/developer/dialog_relationships_overview.glade
rename to data/ui/developer/window_relationships_overview.glade
diff --git a/data/ui/developer/window_text_format.glade b/data/ui/developer/window_text_format.glade
index 303fad4..8152238 100644
--- a/data/ui/developer/window_text_format.glade
+++ b/data/ui/developer/window_text_format.glade
@@ -1,36 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:24:44 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
- <!-- interface-naming-policy toplevel-contextual -->
-
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkWindow" id="window_text_format">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Text Format</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<child>
<object class="GtkBox" id="vbox6">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
- <property name="border_width">12</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="box_formatting_placeholder">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox3">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
@@ -52,6 +54,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/data/ui/developer/window_textobject.glade b/data/ui/developer/window_textobject.glade
index 8ddab38..de36a07 100644
--- a/data/ui/developer/window_textobject.glade
+++ b/data/ui/developer/window_textobject.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:25:13 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="window_textobject">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Text Object</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">300</property>
@@ -22,11 +24,11 @@
<child>
<object class="GtkButton" id="helpbutton2">
<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>
@@ -38,11 +40,11 @@
<child>
<object class="GtkButton" id="cancelbutton2">
<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="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>
@@ -54,11 +56,11 @@
<child>
<object class="GtkButton" id="okbutton2">
<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="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -77,16 +79,16 @@
</child>
<child>
<object class="GtkBox" id="vbox21">
- <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">12</property>
<child>
<object class="GtkBox" id="vbox_title">
- <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="label232">
<property name="visible">True</property>
@@ -122,9 +124,9 @@
</child>
<child>
<object class="GtkBox" id="vbox2">
- <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="label1">
<property name="visible">True</property>
diff --git a/data/ui/developer/window_translations.glade b/data/ui/developer/window_translations.glade
index 667db1b..2479fad 100644
--- a/data/ui/developer/window_translations.glade
+++ b/data/ui/developer/window_translations.glade
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Tue Sep 24 11:06:30 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:25:49 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkWindow" id="window_translations">
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="title" translatable="yes">Translations</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">500</property>
@@ -12,7 +13,6 @@
<object class="GtkBox" id="vbox89">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
diff --git a/data/ui/developer/window_users.glade b/data/ui/developer/window_users.glade
index b9adc9b..217584d 100644
--- a/data/ui/developer/window_users.glade
+++ b/data/ui/developer/window_users.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Tue Sep 24 11:07:05 2013 -->
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:26:29 2013 -->
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="window_users">
@@ -61,6 +61,7 @@
<object class="GtkBox" id="vbox40">
<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>
diff --git a/data/ui/operator/box_navigation_tables.glade b/data/ui/operator/box_navigation_tables.glade
index 3732bd3..c3a26b2 100644
--- a/data/ui/operator/box_navigation_tables.glade
+++ b/data/ui/operator/box_navigation_tables.glade
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:27:25 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkWindow" id="window_tables">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Edit Tables</property>
<child>
<object class="GtkBox" id="box_navigation_tables">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment">
@@ -17,9 +18,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="vbox5">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment_placeholder_adddel">
@@ -38,12 +39,13 @@
<child>
<object class="GtkCheckButton" id="checkbutton_show_hidden">
<property name="label" translatable="yes">_Show hidden tables</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="relief">none</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -63,18 +65,17 @@
</child>
<child>
<object class="GtkButtonBox" id="hbuttonbox3">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_cancel_tables">
<property name="label">gtk-close</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>
diff --git a/data/ui/operator/dialog_choose_date.glade b/data/ui/operator/dialog_choose_date.glade
index b2e1a9a..614b88c 100644
--- a/data/ui/operator/dialog_choose_date.glade
+++ b/data/ui/operator/dialog_choose_date.glade
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.15.4 on Wed Oct 23 11:15:15 2013 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="dialog_choose_date">
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Choose Date</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -18,11 +20,11 @@
<child>
<object class="GtkButton" id="button40">
<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>
@@ -34,11 +36,11 @@
<child>
<object class="GtkButton" id="button_cancel">
<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="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>
@@ -50,11 +52,11 @@
<child>
<object class="GtkButton" id="button_ok">
<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="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -73,14 +75,13 @@
</child>
<child>
<object class="GtkBox" id="vbox100">
- <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="GtkBox" id="hbox119">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -92,7 +93,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>
@@ -102,9 +103,9 @@
</child>
<child>
<object class="GtkBox" id="vbox101">
- <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="label244">
<property name="visible">True</property>
@@ -142,6 +143,8 @@ Please select a date to enter in this field.</property>
<object class="GtkCalendar" id="calendar">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
b/glom/mode_design/relationships_overview/window_relationships_overview.cc
similarity index 100%
rename from glom/mode_design/relationships_overview/dialog_relationships_overview.cc
rename to glom/mode_design/relationships_overview/window_relationships_overview.cc
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.h
b/glom/mode_design/relationships_overview/window_relationships_overview.h
similarity index 100%
rename from glom/mode_design/relationships_overview/dialog_relationships_overview.h
rename to glom/mode_design/relationships_overview/window_relationships_overview.h
diff --git a/glom/window_boxholder.cc b/glom/window_boxholder.cc
index 56c0c0b..c665cfc 100644
--- a/glom/window_boxholder.cc
+++ b/glom/window_boxholder.cc
@@ -36,7 +36,7 @@ Window_BoxHolder::Window_BoxHolder(Box_WithButtons* pBox, const Glib::ustring& t
pBox->signal_cancelled.connect(sigc::mem_fun(*this, &Window_BoxHolder::on_box_cancelled));
- set_border_width(Utils::DEFAULT_SPACING_SMALL);
+ set_border_width(Utils::DEFAULT_SPACING_LARGE);
add(*pBox);
pBox->show();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
