[glom] Select Field Dialog adjustments.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Select Field Dialog adjustments.
- Date: Tue, 6 Apr 2010 11:50:48 +0000 (UTC)
commit 142c26ed5b7e6c8acbaac9a788fe9a5d1a618173
Author: Daniel Borgmann <danielb openismus com>
Date: Tue Apr 6 12:50:27 2010 +0100
Select Field Dialog adjustments.
* glom/glom_developer.glade: Spacing and mnemonic adjustments/fixes,
remove frame label.
* glom/mode_design/layout/dialog_choose_field.cc: Add window icon.
ChangeLog | 8 +
glom/glom_developer.glade | 185 +++++++++---------------
glom/mode_design/layout/dialog_choose_field.cc | 2 +
3 files changed, 81 insertions(+), 114 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4ece223..08cb04e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-04-06 Daniel Borgmann <danielb openismus com>
+ Select Field Dialog adjustments.
+
+ * glom/glom_developer.glade: Spacing and mnemonic adjustments/fixes,
+ remove frame label.
+ * glom/mode_design/layout/dialog_choose_field.cc: Add window icon.
+
+2010-04-06 Daniel Borgmann <danielb openismus com>
+
Progress dialog adjustments.
* glom/dialog_progress_creating.cc: Add window icon.
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index 4f85eb3..89cbd11 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -1594,6 +1594,7 @@
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_choose_field">
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Select Field</property>
<property name="default_width">300</property>
<property name="default_height">500</property>
@@ -1603,107 +1604,76 @@
<object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox23">
+ <object class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame5">
+ <object class="GtkCheckButton" id="checkbutton_show_related_relationships">
+ <property name="label" translatable="yes">Show _Related Relationships</property>
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">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="hbox18">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment18">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox24">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_show_related_relationships">
- <property name="label" translatable="yes">Show Related Relationships</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">When this is selected you will see extra relationships in the Table list, allowing you to choose fields from relationships in related tables, instead of just regular fields from those related tables.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">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="hbox18">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label_table_name">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Table:</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_relationship">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</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="GtkScrolledWindow" id="scrolledwindow8">
- <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="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="treeview_fields">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="label" translatable="yes">_Table:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_relationship</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label57">
+ <child>
+ <object class="GtkComboBox" id="combobox_relationship">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Select Field</b></property>
- <property name="use_markup">True</property>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <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="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview_fields">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -1760,7 +1730,7 @@
<child>
<object class="GtkLabel" id="label58">
<property name="visible">True</property>
- <property name="label" translatable="yes">Select</property>
+ <property name="label" translatable="yes">_Select</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2684,7 +2654,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
</object>
<object class="GtkDialog" id="window_groups">
<property name="height_request">400</property>
- <property name="visible">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Groups</property>
<property name="type_hint">dialog</property>
@@ -3001,7 +2970,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
</action-widgets>
</object>
<object class="GtkDialog" id="window_users">
- <property name="visible">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Users</property>
<property name="default_width">400</property>
@@ -3258,7 +3226,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_user">
- <property name="visible">False</property>
<property name="title" translatable="yes">User</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
@@ -3495,7 +3462,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_new_group">
- <property name="visible">False</property>
<property name="title" translatable="yes">Create Group</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -3698,7 +3664,6 @@ What name should this group have?</property>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_choose_user">
- <property name="visible">False</property>
<property name="title" translatable="yes">Choose User</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -4161,7 +4126,6 @@ Which user should be added to this group?</property>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_database_preferences">
- <property name="visible">False</property>
<property name="title" translatable="yes">Database Preferences</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -5835,7 +5799,6 @@ Which user should be added to this group?</property>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_groupby_secondary_fields">
- <property name="visible">False</property>
<property name="title" translatable="yes">Group By - Secondary Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -6151,7 +6114,6 @@ Which user should be added to this group?</property>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_groupby_sort_fields">
- <property name="visible">False</property>
<property name="title" translatable="yes">Group By - Sort Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -6418,7 +6380,6 @@ Which user should be added to this group?</property>
</action-widgets>
</object>
<object class="GtkWindow" id="window_formatting">
- <property name="visible">False</property>
<property name="title" translatable="yes">window1</property>
<child>
<object class="GtkVBox" id="box_formatting">
@@ -7015,7 +6976,6 @@ Which user should be added to this group?</property>
</child>
</object>
<object class="GtkDialog" id="dialog_relationships_overview">
- <property name="visible">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Relationships Overview</property>
<property name="default_width">400</property>
@@ -8045,7 +8005,6 @@ From what language would you like to copy the translations to use as the start o
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_choose_date">
- <property name="visible">False</property>
<property name="title" translatable="yes">Choose Date</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -8673,7 +8632,6 @@ If a suitable related table already exists then you should instead cancel and ju
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_new_library_script">
- <property name="visible">False</property>
<property name="title" translatable="yes">Create Group</property>
<property name="default_width">311</property>
<property name="default_height">179</property>
@@ -9199,23 +9157,23 @@ What name should this module have?</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_related_calendar">
+ <object class="GtkButton" id="button_add_related">
<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="tooltip_text" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox29">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage" id="image19">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
</object>
@@ -9226,9 +9184,9 @@ What name should this module have?</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label74">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add Related Calendar</property>
+ <property name="label" translatable="yes">Add Related Records</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -9250,23 +9208,23 @@ What name should this module have?</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_related">
+ <object class="GtkButton" id="button_add_related_calendar">
<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="tooltip_text" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<child>
- <object class="GtkAlignment" id="alignment22">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox29">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image19">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
</object>
@@ -9277,9 +9235,9 @@ What name should this module have?</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label74">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add Related Records</property>
+ <property name="label" translatable="yes">Add Related Calendar</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -10100,7 +10058,6 @@ What name should this module have?</property>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_notebook">
- <property name="visible">False</property>
<property name="title" translatable="yes">Notebook Tabs</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/glom/mode_design/layout/dialog_choose_field.cc b/glom/mode_design/layout/dialog_choose_field.cc
index 43b4967..c4b9b9e 100644
--- a/glom/mode_design/layout/dialog_choose_field.cc
+++ b/glom/mode_design/layout/dialog_choose_field.cc
@@ -33,6 +33,8 @@ Dialog_ChooseField::Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefP
m_treeview(0),
m_document(0)
{
+ set_icon_name("glom");
+
builder->get_widget("checkbutton_show_related_relationships", m_checkbutton_show_related_relationships);
m_checkbutton_show_related_relationships->set_active(false); //Start with the simpler list, to avoid confusing people.
m_checkbutton_show_related_relationships->signal_toggled().connect(sigc::mem_fun(*this, &Dialog_ChooseField::on_checkbutton_related_relationships_toggled));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
