[glom] Initial Password Dialog adjustments.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Initial Password Dialog adjustments.
- Date: Tue, 6 Apr 2010 15:59:54 +0000 (UTC)
commit 3b05c76a89943e8927ef3e8473687d6cdb51f704
Author: Daniel Borgmann <danielb openismus com>
Date: Tue Apr 6 16:59:35 2010 +0100
Initial Password Dialog adjustments.
* glom/glom_developer.glade: Initial Password Dialog tweaks.
* glom/mode_design/dialog_initial_password.cc: Set window icon.
ChangeLog | 7 +
glom/glom_developer.glade | 291 +++++++++++++--------------
glom/mode_design/dialog_initial_password.cc | 2 +
3 files changed, 145 insertions(+), 155 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 851e213..4ea3d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2010-04-06 Daniel Borgmann <danielb openismus com>
+ Initial Password Dialog adjustments.
+
+ * glom/glom_developer.glade: Initial Password Dialog tweaks.
+ * glom/mode_design/dialog_initial_password.cc: Set window icon.
+
+2010-04-06 Daniel Borgmann <danielb openismus com>
+
CSV Import Dialog adjustments.
* glom/glom.glade: Import dialog tweaks.
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index 89cbd11..7391334 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -2072,23 +2072,31 @@
</child>
</object>
<object class="GtkDialog" id="dialog_initial_password">
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Database User</property>
<property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox27">
<property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkHBox" id="hbox22">
+ <object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkImage" id="image12">
+ <object class="GtkLabel" id="label63">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<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="label" translatable="yes">Please enter the initial connection details for your database. You may add additional users later. Remember to keep this password secret because it allows access to your data from other computers on the network.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -2097,156 +2105,127 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox28">
+ <object class="GtkTable" id="table6">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label65">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_User:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_user</property>
+ <accessibility>
+ <relation type="label-for" target="entry_user"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_user">
+ <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">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
<child>
- <object class="GtkLabel" id="label63">
+ <object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label66">
+ <property name="visible">True</property>
<property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">First User</span>
-
-Please enter the initial connection details for your database. You may add additional users later. Remember to keep this password secret because it allows access to your data from other computers on the network.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_password</property>
+ <accessibility>
+ <relation type="label-for" target="entry_password"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkEntry" id="entry_password_confirm">
<property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_User</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">entry_user</property>
- <accessibility>
- <relation type="label-for" target="entry_user"/>
- </accessibility>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_user">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</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">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">entry_password</property>
- <accessibility>
- <relation type="label-for" target="entry_password"/>
- </accessibility>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_password_confirm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</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">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_password_confirm">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Confirm Password</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">entry_password_confirm</property>
- <accessibility>
- <relation type="label-for" target="entry_password_confirm"/>
- </accessibility>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label_password_confirm">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Confirm Password:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_password_confirm</property>
+ <accessibility>
+ <relation type="label-for" target="entry_password_confirm"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -2256,7 +2235,9 @@ Please enter the initial connection details for your database. You may add addit
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
@@ -9157,23 +9138,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>
@@ -9184,9 +9165,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>
@@ -9208,23 +9189,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>
@@ -9235,9 +9216,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>
diff --git a/glom/mode_design/dialog_initial_password.cc b/glom/mode_design/dialog_initial_password.cc
index 569cbde..2b3de72 100644
--- a/glom/mode_design/dialog_initial_password.cc
+++ b/glom/mode_design/dialog_initial_password.cc
@@ -35,6 +35,8 @@ Dialog_InitialPassword::Dialog_InitialPassword(BaseObjectType* cobject, const Gl
builder->get_widget("entry_user", m_entry_user);
builder->get_widget("entry_password", m_entry_password);
builder->get_widget("entry_password_confirm", m_entry_password_confirm);
+
+ set_icon_name("glom");
}
Dialog_InitialPassword::~Dialog_InitialPassword()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
