[glom] Clean up Add Related Table dialog.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Clean up Add Related Table dialog.
- Date: Fri, 9 Apr 2010 17:01:49 +0000 (UTC)
commit 6c56307ed54b989acb2c3bff2ababc42abb3e90c
Author: Daniel Borgmann <danielb openismus com>
Date: Fri Apr 9 18:01:33 2010 +0100
Clean up Add Related Table dialog.
* glom/glom_developer.glade: (dialog_add_related_table) Remove frame,
fix spacings, align form elements in table.
* glom/mode_design/dialog_add_related_table.cc: Add window icon.
ChangeLog | 8 +
glom/glom_developer.glade | 273 +++++++++++---------------
glom/mode_design/dialog_add_related_table.cc | 2 +
3 files changed, 129 insertions(+), 154 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 20b83bc..344395b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-04-09 Daniel Borgmann <danielb openismus com>
+ Clean up Add Related Table dialog.
+
+ * glom/glom_developer.glade: (dialog_add_related_table) Remove frame,
+ fix spacings, align form elements in table.
+ * glom/mode_design/dialog_add_related_table.cc: Add window icon.
+
+2010-04-09 Daniel Borgmann <danielb openismus com>
+
Update translation dialogs.
* glom/application.cc:
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index 961efe0..02e73a9 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -8121,51 +8121,70 @@ Please select a date to enter in this field.</property>
<object class="GtkVBox" id="vbox102">
<property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox103">
+ <object class="GtkVBox" id="vbox104">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">18</property>
<child>
- <object class="GtkFrame" id="frame41">
+ <object class="GtkLabel" id="label259">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">This will add a new table and add a relationship that refers to the new table, as a convenient alternative to doing this in separate steps.
+
+If a suitable related table already exists then you should instead cancel and just add a relationship.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox125">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment90">
+ <object class="GtkLabel" id="label253">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="label" translatable="yes" comments="Translators: FROM as in SQL's FROM">From field:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_from_key">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_edit_fields">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<child>
- <object class="GtkVBox" id="vbox104">
+ <object class="GtkAlignment" id="alignment91">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label259">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">This will add a new table and add a relationship that refers to the new table, as a convenient alternative to doing this in separate steps.
-
-If a suitable related table already exists then you should instead cancel and just add a relationship.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox125">
+ <object class="GtkHBox" id="hbox127">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkLabel" id="label253">
+ <object class="GtkImage" id="image52">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Translators: FROM as in SQL's FROM">From Field:</property>
+ <property name="stock">gtk-new</property>
</object>
<packing>
<property name="expand">False</property>
@@ -8174,147 +8193,93 @@ If a suitable related table already exists then you should instead cancel and ju
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_from_key">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_edit_fields">
+ <object class="GtkLabel" id="label257">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment91">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox127">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image52">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label257">
- <property name="visible">True</property>
- <property name="label">_Edit Fields</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox121">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label247">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Name of new related table:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_related_table_name">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox124">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label251">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Name of new relationship:</property>
+ <property name="label">_Edit Fields</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_relationship_name">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label247">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name of new related table:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label256">
+ <child>
+ <object class="GtkEntry" id="entry_related_table_name">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Add Related Table</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label251">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name of new relationship:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_relationship_name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -8371,7 +8336,7 @@ If a suitable related table already exists then you should instead cancel and ju
<child>
<object class="GtkLabel" id="label258">
<property name="visible">True</property>
- <property name="label">Create Table</property>
+ <property name="label">C_reate Table</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/glom/mode_design/dialog_add_related_table.cc b/glom/mode_design/dialog_add_related_table.cc
index 8b49253..bbf9e9c 100644
--- a/glom/mode_design/dialog_add_related_table.cc
+++ b/glom/mode_design/dialog_add_related_table.cc
@@ -34,6 +34,8 @@ Dialog_AddRelatedTable::Dialog_AddRelatedTable(BaseObjectType* cobject, const Gl
m_button_edit_fields(0),
m_button_ok(0)
{
+ set_icon_name("glom");
+
builder->get_widget("entry_related_table_name", m_entry_table_name);
builder->get_widget("entry_relationship_name", m_entry_relationship_name);
builder->get_widget_derived("combobox_from_key", m_combo_from_field);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
