[glom] Update dialogs.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Update dialogs.
- Date: Fri, 9 Apr 2010 16:45:17 +0000 (UTC)
commit 2ab8443b7b639e01c7b8b283ba97dd3d1b99e68a
Author: Daniel Borgmann <danielb openismus com>
Date: Fri Apr 9 16:12:06 2010 +0100
Update dialogs.
* glom/frame_glom.cc: Set window icons.
* glom/glom_developer.glade: Update user dialogs.
* glom/mode_design/layout/dialog_layout.cc: Set window icons.
* glom/mode_design/users/dialog_groups_list.cc: Set window icons.
ChangeLog | 9 +++
glom/frame_glom.cc | 2 +
glom/glom_developer.glade | 89 +++++++++-----------------
glom/mode_design/layout/dialog_layout.cc | 2 +
glom/mode_design/users/dialog_groups_list.cc | 2 +
5 files changed, 45 insertions(+), 59 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 315e1c9..3ab7adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,15 @@
* Makefile.am: Do not install .desktop file on Windows.
+2010-04-09 Daniel Borgmann <danielb openismus com>
+
+ Update dialogs.
+
+ * glom/frame_glom.cc: Set window icons.
+ * glom/glom_developer.glade: Update user dialogs.
+ * glom/mode_design/layout/dialog_layout.cc: Set window icons.
+ * glom/mode_design/users/dialog_groups_list.cc: Set window icons.
+
2010-04-08 Daniel Borgmann <danielb openismus com>
Use buttonbox for details view.
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index c18af37..bd06938 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1708,6 +1708,7 @@ void Frame_Glom::on_menu_developer_database_preferences()
refXml->get_widget_derived("dialog_database_preferences", dialog);
if(dialog)
{
+ dialog->set_icon_name("glom");
dialog->set_transient_for(*(get_app_window()));
add_view(dialog);
dialog->load_from_document();
@@ -1841,6 +1842,7 @@ void Frame_Glom::on_menu_developer_users()
std::cerr << ex.what() << std::endl;
}
+ dialog->set_icon_name("glom");
dialog->set_transient_for(*get_app_window());
add_view(dialog); //Give it access to the document.
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index e7aa62d..be8b592 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -2653,6 +2653,7 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<child>
<object class="GtkVBox" id="vbox40">
<property name="visible">True</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -2661,6 +2662,7 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<child>
<object class="GtkHBox" id="hbox35">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame10">
<property name="visible">True</property>
@@ -2670,7 +2672,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<object class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="top_padding">6</property>
- <property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox44">
<property name="visible">True</property>
@@ -2828,7 +2829,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<object class="GtkAlignment" id="alignment26">
<property name="visible">True</property>
<property name="top_padding">6</property>
- <property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox41">
<property name="visible">True</property>
@@ -2853,36 +2853,6 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox24">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox25">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">end</property>
- </object>
- <packing>
- <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>
</object>
</child>
</object>
@@ -3452,6 +3422,7 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<object class="GtkDialog" id="dialog_new_group">
<property name="title" translatable="yes">Create Group</property>
<property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
@@ -3464,8 +3435,8 @@ Glom could not create the new database. Maybe you do not have the necessary acce
<child>
<object class="GtkHBox" id="hbox39">
<property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">6</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkImage" id="image23">
<property name="visible">True</property>
@@ -3518,12 +3489,12 @@ What name should this group have?</property>
<child>
<object class="GtkHBox" id="hbox40">
<property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">6</property>
+ <property name="border_width">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="Group Name">
<property name="visible">True</property>
- <property name="label" translatable="yes">Group Name</property>
+ <property name="label" translatable="yes">Group name:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3616,7 +3587,7 @@ What name should this group have?</property>
<child>
<object class="GtkLabel" id="label98">
<property name="visible">True</property>
- <property name="label" translatable="yes">Create</property>
+ <property name="label" translatable="yes">C_reate</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -4116,6 +4087,7 @@ Which user should be added to this group?</property>
<object class="GtkDialog" id="dialog_database_preferences">
<property name="title" translatable="yes">Database Preferences</property>
<property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
@@ -4129,7 +4101,7 @@ Which user should be added to this group?</property>
<child>
<object class="GtkHBox" id="hbox58">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label137">
<property name="visible">True</property>
@@ -4165,16 +4137,16 @@ Which user should be added to this group?</property>
<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="GtkHBox" id="hbox59">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label138">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Name</property>
+ <property name="label" translatable="yes">Name:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4205,13 +4177,14 @@ Which user should be added to this group?</property>
<child>
<object class="GtkAlignment" id="alignment44">
<property name="visible">True</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table10">
<property name="visible">True</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkEntry" id="entry_org_address_country">
@@ -4552,7 +4525,7 @@ Which user should be added to this group?</property>
<property name="xalign">0</property>
<property name="label">import glom
- <b>def on_startup(ui):</b></property>
+<b>def on_startup(ui):</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -4562,32 +4535,30 @@ Which user should be added to this group?</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment16">
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
- <property name="left_padding">20</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="GtkScrolledWindow" id="scrolledwindow7">
+ <object class="GtkViewport" id="viewport1">
<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>
+ <property name="resize_mode">queue</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkViewport" id="viewport1">
+ <object class="GtkSourceView" id="textview_calculation">
<property name="visible">True</property>
- <child>
- <object class="GtkSourceView" id="textview_calculation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="left_margin">2</property>
+ <property name="right_margin">2</property>
</object>
</child>
</object>
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
diff --git a/glom/mode_design/layout/dialog_layout.cc b/glom/mode_design/layout/dialog_layout.cc
index ff9baca..90d6174 100644
--- a/glom/mode_design/layout/dialog_layout.cc
+++ b/glom/mode_design/layout/dialog_layout.cc
@@ -31,6 +31,8 @@ Dialog_Layout::Dialog_Layout(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
m_label_table_title(0),
m_modified(false)
{
+ set_icon_name("glom");
+
Gtk::Button* button = 0;
builder->get_widget("button_close", button);
button->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout::on_button_close) );
diff --git a/glom/mode_design/users/dialog_groups_list.cc b/glom/mode_design/users/dialog_groups_list.cc
index 39f99db..48d8725 100644
--- a/glom/mode_design/users/dialog_groups_list.cc
+++ b/glom/mode_design/users/dialog_groups_list.cc
@@ -246,6 +246,7 @@ void Dialog_GroupsList::on_button_group_new()
std::cerr << ex.what() << std::endl;
}
+ dialog->set_icon_name("glom");
dialog->set_transient_for(*this);
int response = Glom::Utils::dialog_run_with_help(dialog, "dialog_new_group");
@@ -307,6 +308,7 @@ void Dialog_GroupsList::on_button_group_users()
std::cerr << ex.what() << std::endl;
}
+ dialog->set_icon_name("glom");
dialog->set_transient_for(*this);
add_view(dialog); //Give it access to the document.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
