2001-06-13 Dave Peticolas <dave@krondo.com>

* src/gnome/glade/userpass.glade: new file for old
	username/password dialog

	* src/gnome/dialog-userpass.c: use libglade


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4665 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-06-13 10:30:35 +00:00
parent 2cfebe584d
commit 2dc53adfed
9 changed files with 235 additions and 314 deletions

View File

@ -1,5 +1,10 @@
2001-06-13 Dave Peticolas <dave@krondo.com> 2001-06-13 Dave Peticolas <dave@krondo.com>
* src/gnome/glade/userpass.glade: new file for old
username/password dialog
* src/gnome/dialog-userpass.c: use libglade
* src/gnome/dialog-column-view.c: more libglade work * src/gnome/dialog-column-view.c: more libglade work
2001-06-12 Dave Peticolas <dave@krondo.com> 2001-06-12 Dave Peticolas <dave@krondo.com>

View File

@ -31,6 +31,7 @@ src/gnome/glade-support.c
src/gnome/glade/commodity_strings.c src/gnome/glade/commodity_strings.c
src/gnome/glade/price_strings.c src/gnome/glade/price_strings.c
src/gnome/glade/report_strings.c src/gnome/glade/report_strings.c
src/gnome/glade/userpass_strings.c
src/gnome/gnc-commodity-edit.c src/gnome/gnc-commodity-edit.c
src/gnome/gnc-datedelta.c src/gnome/gnc-datedelta.c
src/gnome/gnc-dateedit.c src/gnome/gnc-dateedit.c

View File

@ -25,8 +25,7 @@
#include <gnome.h> #include <gnome.h>
#include "glade-gnc-dialogs.h" #include "dialog-utils.h"
#include "glade-support.h"
#include "gnc-ui.h" #include "gnc-ui.h"
@ -42,19 +41,22 @@ gnc_get_username_password (GtkWidget *parent,
GtkWidget *heading_label; GtkWidget *heading_label;
GtkWidget *username_entry; GtkWidget *username_entry;
GtkWidget *password_entry; GtkWidget *password_entry;
GladeXML *xml;
gint result; gint result;
g_return_val_if_fail (username != NULL, FALSE); g_return_val_if_fail (username != NULL, FALSE);
g_return_val_if_fail (password != NULL, FALSE); g_return_val_if_fail (password != NULL, FALSE);
dialog = create_Username_Password_Dialog (); xml = gnc_glade_xml_new ("userpass.glade", "Username Password Dialog");
dialog = dialog = glade_xml_get_widget (xml, "Username Password Dialog");
if (parent) if (parent)
gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (parent)); gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (parent));
heading_label = lookup_widget (dialog, "heading_label"); heading_label = glade_xml_get_widget (xml, "heading_label");
username_entry = lookup_widget (dialog, "username_entry"); username_entry = glade_xml_get_widget (xml, "username_entry");
password_entry = lookup_widget (dialog, "password_entry"); password_entry = glade_xml_get_widget (xml, "password_entry");
gnome_dialog_set_default (GNOME_DIALOG (dialog), 0); gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);

View File

@ -6859,120 +6859,3 @@ create_Stock_Split_Druid (void)
return Stock_Split_Druid; return Stock_Split_Druid;
} }
GtkWidget*
create_Username_Password_Dialog (void)
{
GtkWidget *Username_Password_Dialog;
GtkWidget *dialog_vbox16;
GtkWidget *heading_label;
GtkWidget *frame47;
GtkWidget *hbox95;
GtkWidget *vbox105;
GtkWidget *label847713;
GtkWidget *label847714;
GtkWidget *vbox106;
GtkWidget *username_entry;
GtkWidget *password_entry;
GtkWidget *dialog_action_area16;
GtkWidget *button79;
GtkWidget *button81;
Username_Password_Dialog = gnome_dialog_new (_("Username and Password"), NULL);
gtk_object_set_data (GTK_OBJECT (Username_Password_Dialog), "Username_Password_Dialog", Username_Password_Dialog);
gtk_window_set_policy (GTK_WINDOW (Username_Password_Dialog), FALSE, FALSE, FALSE);
gnome_dialog_close_hides (GNOME_DIALOG (Username_Password_Dialog), TRUE);
dialog_vbox16 = GNOME_DIALOG (Username_Password_Dialog)->vbox;
gtk_object_set_data (GTK_OBJECT (Username_Password_Dialog), "dialog_vbox16", dialog_vbox16);
gtk_widget_show (dialog_vbox16);
heading_label = gtk_label_new (_("Enter your username and password"));
gtk_widget_ref (heading_label);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "heading_label", heading_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (heading_label);
gtk_box_pack_start (GTK_BOX (dialog_vbox16), heading_label, FALSE, FALSE, 0);
frame47 = gtk_frame_new (NULL);
gtk_widget_ref (frame47);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "frame47", frame47,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (frame47);
gtk_box_pack_start (GTK_BOX (dialog_vbox16), frame47, TRUE, TRUE, 0);
hbox95 = gtk_hbox_new (FALSE, 2);
gtk_widget_ref (hbox95);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "hbox95", hbox95,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbox95);
gtk_container_add (GTK_CONTAINER (frame47), hbox95);
gtk_container_set_border_width (GTK_CONTAINER (hbox95), 10);
vbox105 = gtk_vbox_new (TRUE, 5);
gtk_widget_ref (vbox105);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "vbox105", vbox105,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox105);
gtk_box_pack_start (GTK_BOX (hbox95), vbox105, TRUE, TRUE, 0);
label847713 = gtk_label_new (_("Username:"));
gtk_widget_ref (label847713);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "label847713", label847713,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label847713);
gtk_box_pack_start (GTK_BOX (vbox105), label847713, FALSE, FALSE, 0);
label847714 = gtk_label_new (_("Password:"));
gtk_widget_ref (label847714);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "label847714", label847714,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label847714);
gtk_box_pack_start (GTK_BOX (vbox105), label847714, FALSE, FALSE, 0);
vbox106 = gtk_vbox_new (TRUE, 5);
gtk_widget_ref (vbox106);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "vbox106", vbox106,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox106);
gtk_box_pack_start (GTK_BOX (hbox95), vbox106, TRUE, TRUE, 0);
username_entry = gtk_entry_new ();
gtk_widget_ref (username_entry);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "username_entry", username_entry,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (username_entry);
gtk_box_pack_start (GTK_BOX (vbox106), username_entry, FALSE, FALSE, 0);
password_entry = gtk_entry_new ();
gtk_widget_ref (password_entry);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "password_entry", password_entry,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (password_entry);
gtk_box_pack_start (GTK_BOX (vbox106), password_entry, FALSE, FALSE, 0);
gtk_entry_set_visibility (GTK_ENTRY (password_entry), FALSE);
dialog_action_area16 = GNOME_DIALOG (Username_Password_Dialog)->action_area;
gtk_object_set_data (GTK_OBJECT (Username_Password_Dialog), "dialog_action_area16", dialog_action_area16);
gtk_widget_show (dialog_action_area16);
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area16), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area16), 8);
gnome_dialog_append_button (GNOME_DIALOG (Username_Password_Dialog), GNOME_STOCK_BUTTON_OK);
button79 = g_list_last (GNOME_DIALOG (Username_Password_Dialog)->buttons)->data;
gtk_widget_ref (button79);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "button79", button79,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (button79);
GTK_WIDGET_SET_FLAGS (button79, GTK_CAN_DEFAULT);
gnome_dialog_append_button (GNOME_DIALOG (Username_Password_Dialog), GNOME_STOCK_BUTTON_CANCEL);
button81 = g_list_last (GNOME_DIALOG (Username_Password_Dialog)->buttons)->data;
gtk_widget_ref (button81);
gtk_object_set_data_full (GTK_OBJECT (Username_Password_Dialog), "button81", button81,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (button81);
GTK_WIDGET_SET_FLAGS (button81, GTK_CAN_DEFAULT);
return Username_Password_Dialog;
}

View File

@ -22,4 +22,3 @@ GtkWidget* create_Tax_Information_Dialog (void);
GtkWidget* create_Duplicate_Transaction_Dialog (void); GtkWidget* create_Duplicate_Transaction_Dialog (void);
GtkWidget* create_HTML_Style_Sheet_Dialog (void); GtkWidget* create_HTML_Style_Sheet_Dialog (void);
GtkWidget* create_Stock_Split_Druid (void); GtkWidget* create_Stock_Split_Druid (void);
GtkWidget* create_Username_Password_Dialog (void);

View File

@ -2,13 +2,13 @@ gladedir = $(GNC_GLADE_DIR)
glade_DATA = \ glade_DATA = \
commodity.glade \ commodity.glade \
price.glade \ price.glade \
report.glade report.glade \
userpass.glade
STRING_FILES = \ STRING_FILES = \
commodity_strings.c \ commodity_strings.c \
price_strings.c \ price_strings.c \
report_strings.c report_strings.c \
userpass_strings.c
EXTRA_DIST = $(glade_DATA) $(STRING_FILES) EXTRA_DIST = $(glade_DATA) $(STRING_FILES)

View File

@ -0,0 +1,207 @@
<?xml version="1.0"?>
<GTK-Interface>
<project>
<name>Glade</name>
<program_name>glade</program_name>
<directory></directory>
<source_directory></source_directory>
<pixmaps_directory></pixmaps_directory>
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<output_main_file>False</output_main_file>
<output_support_files>False</output_support_files>
<output_build_files>False</output_build_files>
<backup_source_files>False</backup_source_files>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>userpass_strings.c</translatable_strings_file>
</project>
<widget>
<class>GnomeDialog</class>
<name>Username Password Dialog</name>
<title>Username and Password</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>True</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox16</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area16</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>button79</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button81</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>heading_label</name>
<label>Enter your username and password</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkFrame</class>
<name>frame47</name>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<name>hbox95</name>
<border_width>10</border_width>
<homogeneous>False</homogeneous>
<spacing>2</spacing>
<widget>
<class>GtkVBox</class>
<name>vbox105</name>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>label847713</name>
<label>Username:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label847714</name>
<label>Password:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
<widget>
<class>GtkVBox</class>
<name>vbox106</name>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkEntry</class>
<name>username_entry</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>password_entry</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>False</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
</widget>
</widget>
</widget>
</GTK-Interface>

View File

@ -0,0 +1,10 @@
/*
* Translatable strings file generated by Glade.
* Add this file to your project's POTFILES.in.
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Username and Password");
gchar *s = N_("Enter your username and password");
gchar *s = N_("Username:");
gchar *s = N_("Password:");

View File

@ -10102,190 +10102,4 @@ quit without making any changes.</text>
</widget> </widget>
</widget> </widget>
<widget>
<class>GnomeDialog</class>
<name>Username Password Dialog</name>
<title>Username and Password</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>True</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox16</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area16</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
<name>button79</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button81</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>heading_label</name>
<label>Enter your username and password</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkFrame</class>
<name>frame47</name>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkHBox</class>
<name>hbox95</name>
<border_width>10</border_width>
<homogeneous>False</homogeneous>
<spacing>2</spacing>
<widget>
<class>GtkVBox</class>
<name>vbox105</name>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>label847713</name>
<label>Username:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label847714</name>
<label>Password:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
<widget>
<class>GtkVBox</class>
<name>vbox106</name>
<homogeneous>True</homogeneous>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkEntry</class>
<name>username_entry</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>password_entry</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>False</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
</widget>
</widget>
</widget>
</GTK-Interface> </GTK-Interface>