From 355c8a074e0a1b262a454810d8c2aa42b4e21edf Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 5 Jan 2001 04:50:50 +0000 Subject: Fixed a few 'Oops'es. 2001-01-04 Jeffrey Stedfast * mail-config-druid.c: Fixed a few 'Oops'es. * mail-config-druid.glade: Added a "Default" button for marking an account as the default. svn path=/trunk/; revision=7266 --- mail/ChangeLog | 7 + mail/mail-config-druid.c | 10 +- mail/mail-config-druid.glade | 1323 +++++++++++++++++++++++++++++++++++++++- mail/mail-config-druid.glade.h | 103 +++- mail/mail-config-druid.h | 2 +- 5 files changed, 1423 insertions(+), 22 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 039c966216..4e1edd59be 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2001-01-04 Jeffrey Stedfast + + * mail-config-druid.c: Fixed a few 'Oops'es. + + * mail-config-druid.glade: Added a "Default" button for marking an + account as the default. + 2001-01-04 Jeffrey Stedfast * mail-config-druid.glade: Updated. What else can I say? diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index de11828a2c..38917fffb5 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -68,7 +68,7 @@ mail_config_druid_class_init (MailConfigDruidClass *class) GtkObjectClass *object_class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (gnome_dialog_get_type ()); + parent_class = gtk_type_class (gtk_window_get_type ()); object_class->finalize = mail_config_druid_finalise; /* override methods */ @@ -637,18 +637,18 @@ static void construct (MailConfigDruid *druid) { GladeXML *gui; - GnomeDruid *druid; + GtkWidget *widget; gui = glade_xml_new (EVOLUTION_DATA_DIR "/mail-config-druid.glade", "mail-config-window"); druid->gui = gui; /* get our toplevel widget */ - druid = GNOME_DRUID (glade_xml_get_widget (gui, "gnome-config-druid")); + widget = glade_xml_get_widget (gui, "gnome-config-druid"); /* reparent */ - gtk_widget_reparent (notebook, GTK_WIDGET (druid)); + gtk_widget_reparent (widget, GTK_WIDGET (druid)); - druid->druid = druid; + druid->druid = GNOME_DRUID (widget); /* get our cared-about widgets */ druid->account_text = glade_xml_get_widget (gui, "htmlAccountInfo"); diff --git a/mail/mail-config-druid.glade b/mail/mail-config-druid.glade index ad7fc1f31b..ad7f605143 100644 --- a/mail/mail-config-druid.glade +++ b/mail/mail-config-druid.glade @@ -14,7 +14,7 @@ False False True - mail-config.glade.h + mail-config-druid.glade.h @@ -1412,6 +1412,1309 @@ Click "Finish" to save your settings. + + GnomeDialog + account-properties-dialog + False + Account Properties + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + True + False + True + True + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox3 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area3 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + cmdOK + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + cmdApply + True + True + GNOME_STOCK_BUTTON_APPLY + + + + GtkButton + cmdCancel + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkNotebook + notebook + True + True + True + GTK_POS_TOP + False + 2 + 2 + False + + 0 + True + True + + + + GtkVBox + vbox32 + 5 + False + 0 + + + GtkVBox + vbox33 + False + 0 + + 0 + False + False + + + + GtkHBox + hbox26 + False + 0 + + 5 + True + True + + + + GtkLabel + lblMailAccount + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator + + 10 + True + True + + + + + + GtkLabel + lblDirections + + GTK_JUSTIFY_LEFT + True + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkEntry + txtAccountName + True + True + True + 0 + + + 5 + False + False + + + + + + GtkTable + tableUserInfo + 6 + 10 + True + 0 + 0 + + 0 + False + True + + + + GtkHBox + hbox35 + False + 0 + + 0 + 10 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkLabel + lblUserInfo + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator8 + + 10 + True + True + + + + + + GtkLabel + lblName + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 1 + 2 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblEMail + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 2 + 3 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblReplyTo + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 3 + 4 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblOrganization + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 4 + 5 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblSignature + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 5 + 6 + 0 + 0 + False + False + False + False + False + False + + + + + GtkEntry + txtName + True + True + True + 0 + + + 4 + 10 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtEMail + True + True + True + 0 + + + 4 + 10 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtReplyTo + True + True + True + 0 + + + 4 + 10 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtOrganization + True + True + True + 0 + + + 4 + 10 + 4 + 5 + 0 + 0 + True + False + False + False + True + False + + + + + GnomeFileEntry + fileSignature + 10 + Select signature file + True + True + + 4 + 10 + 5 + 6 + 0 + 0 + True + False + False + False + True + False + + + + GtkEntry + GnomeEntry:entry + txtSignature + True + True + True + 0 + + + + + + + + GtkLabel + Notebook:tab + lblGeneral + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox34 + 5 + False + 0 + + + GtkTable + tableIncomingServer + 8 + 10 + True + 0 + 0 + + 0 + False + False + + + + GtkHBox + hbox31 + False + 0 + + 0 + 10 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkLabel + lblIncomingMailServer + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator4 + + 10 + True + True + + + + + + GtkLabel + lblUsername + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 3 + 4 + 0 + 0 + False + False + False + False + False + False + + + + + GtkEntry + txtUsername + True + True + True + 0 + + + 4 + 10 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtPassword + True + True + True + 0 + + + 4 + 10 + 4 + 5 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + lblPassword + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 4 + 5 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblIncomingAuth + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 6 + 7 + 0 + 0 + False + False + False + False + False + False + + + + + GtkCheckButton + chkSavePasswd + True + + False + True + + 4 + 10 + 5 + 6 + 0 + 0 + False + False + False + False + True + False + + + + + GtkCheckButton + chkIncomingSSL + False + True + + False + True + + 1 + 10 + 7 + 8 + 0 + 0 + False + False + False + False + True + False + + + + + GtkOptionMenu + omenuIncomingAuth + True + Plain Text +Kerberos +CRAM-MD5 +DIGEST-MD5 + + 0 + + 4 + 10 + 6 + 7 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblIncomingServerType + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 1 + 2 + 0 + 0 + False + False + False + False + False + False + + + + + GtkEntry + txtServerType + True + False + True + 0 + IMAP + + 4 + 10 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + lblIncomingServer + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 2 + 3 + 0 + 0 + False + False + False + False + False + False + + + + + GtkEntry + txtIncomingServer + True + True + True + 0 + + + 4 + 10 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + + GtkTable + tableOutgoingServer + 5 + 10 + True + 0 + 0 + + 0 + False + False + + + + GtkHBox + hbox32 + False + 0 + + 0 + 10 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkLabel + lblOutgoingMailServer + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator5 + + 10 + True + True + + + + + + GtkLabel + lblOutgoingAuth + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 3 + 4 + 0 + 0 + False + False + False + False + False + False + + + + + GtkCheckButton + chkOutgoingSSL + False + True + + False + True + + 1 + 10 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkOptionMenu + omenuOutgoingAuth + True + None +CRAM-MD5 + + 0 + + 4 + 10 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblOutgoingServerType + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 1 + 2 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblOutgoingServer + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 4 + 2 + 3 + 0 + 0 + False + False + False + False + False + False + + + + + GtkOptionMenu + omenuTransportType + True + Sendmail +SMTP + + 0 + + 4 + 10 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + txtOutgoingServer + True + True + True + 0 + + + 4 + 10 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + + + GtkLabel + Notebook:tab + lblServers + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox36 + 5 + False + 0 + + + GtkTable + tableServerTimeouts + 2 + 10 + True + 0 + 0 + + 0 + True + True + + + + GtkSpinButton + spinAutoCheckMinutes + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 0 + 0 + 100 + 1 + 10 + 10 + + 7 + 8 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + lblAutoCheckMail + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 1 + 7 + 1 + 2 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblMinutes + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 0 + 0 + + 8 + 10 + 1 + 2 + 0 + 0 + False + False + False + False + False + False + + + + + GtkHBox + hbox34 + False + 0 + + 0 + 10 + 0 + 1 + 0 + 0 + True + False + False + False + True + True + + + + GtkLabel + lblServerTimeouts + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator7 + + 10 + True + True + + + + + + + + GtkLabel + Notebook:tab + lblAdvanced + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + GnomeDialog mail-accounts-dialog @@ -1515,7 +2818,7 @@ Click "Finish" to save your settings. clistAccounts True 2 - 47,80 + 150,80 GTK_SELECTION_SINGLE True GTK_SHADOW_IN @@ -1523,8 +2826,8 @@ Click "Finish" to save your settings. GtkLabel CList:title - lblDefault - + lblAccount + GTK_JUSTIFY_CENTER False 0.5 @@ -1536,8 +2839,8 @@ Click "Finish" to save your settings. GtkLabel CList:title - lblAccounts - + lblType + GTK_JUSTIFY_CENTER False 0.5 @@ -1586,6 +2889,14 @@ Click "Finish" to save your settings. True + + + GtkButton + cmdMailDefault + True + True + + diff --git a/mail/mail-config-druid.glade.h b/mail/mail-config-druid.glade.h index 7c48ce6ea1..2173da685e 100644 --- a/mail/mail-config-druid.glade.h +++ b/mail/mail-config-druid.glade.h @@ -4,15 +4,98 @@ * DO NOT compile it as part of your application. */ +gchar *s = N_("Mail Configuration Druid"); gchar *s = N_("Mail Configuration"); -gchar *s = N_("Mail Configuration"); -gchar *s = N_("Welcome to the Evolution Mail configuration wizard!\n" - "By filling in some information about your email\n" - "settings, you can start sending and receiving email\n" - "right away. Click Next to continue."); +gchar *s = N_("Welcome to the Evolution Mail Configuration Druid.\n" + "\n" + "Click \"Next\" to begin. "); gchar *s = N_("Identity"); -gchar *s = N_("Mail Source"); -gchar *s = N_("Mail Transport"); -gchar *s = N_("Mail Configuration"); -gchar *s = N_("Your email configuration is now complete.\n" - "Click \"Finish\" to save your new settings"); +gchar *s = N_("Required"); +gchar *s = N_("Full Name:"); +gchar *s = N_("Email Address:"); +gchar *s = N_("Optional"); +gchar *s = N_("Organization:"); +gchar *s = N_("Signature file:"); +gchar *s = N_("Reply-to:"); +gchar *s = N_("Receiving Email"); +gchar *s = N_("Server Type: "); +gchar *s = N_("Server Configuration"); +gchar *s = N_("Host:"); +gchar *s = N_("Username:"); +gchar *s = N_("Path:"); +gchar *s = N_("Delete mail from server"); +gchar *s = N_("Authentication"); +gchar *s = N_("Authentication"); +gchar *s = N_("Authentication Type:"); +gchar *s = N_("Password:"); +gchar *s = N_("Remember my password"); +gchar *s = N_("Sending Email"); +gchar *s = N_("Server Type: "); +gchar *s = N_("Server Configuration"); +gchar *s = N_("Host:"); +gchar *s = N_("Server requires authentication"); +gchar *s = N_("Account Management"); +gchar *s = N_("Account Information"); +gchar *s = N_("Name:"); +gchar *s = N_("Make this my default account"); +gchar *s = N_("Done"); +gchar *s = N_("Congratulations, your mail configuration is complete.\n" + "\n" + "You are now ready to send and receive email \n" + "using Evolution. \n" + "\n" + "Click \"Finish\" to save your settings."); +gchar *s = N_("Account Properties"); +gchar *s = N_("Mail Account"); +gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\"."); +gchar *s = N_("User Information"); +gchar *s = N_("Name:"); +gchar *s = N_("E-Mail Address:"); +gchar *s = N_("Reply-To:"); +gchar *s = N_("Organization:"); +gchar *s = N_("Signature:"); +gchar *s = N_("Select signature file"); +gchar *s = N_("General"); +gchar *s = N_("Incoming Mail Server"); +gchar *s = N_("Username:"); +gchar *s = N_("Password:"); +gchar *s = N_("Authentication:"); +gchar *s = N_("Save password"); +gchar *s = N_("This server requires a secure connection (SSL)"); +gchar *s = N_("Plain Text\n" + "Kerberos\n" + "CRAM-MD5\n" + "DIGEST-MD5\n" + ""); +gchar *s = N_("Type:"); +gchar *s = N_("IMAP"); +gchar *s = N_("Hostname:"); +gchar *s = N_("Outgoing Mail Server"); +gchar *s = N_("Authentication:"); +gchar *s = N_("This server requires a secure connection (SSL)"); +gchar *s = N_("None\n" + "CRAM-MD5\n" + ""); +gchar *s = N_("Type:"); +gchar *s = N_("Hostname:"); +gchar *s = N_("Sendmail\n" + "SMTP\n" + ""); +gchar *s = N_("Servers"); +gchar *s = N_("Automatically check mail every "); +gchar *s = N_("minute(s)"); +gchar *s = N_("Server Timeouts"); +gchar *s = N_("Advanced"); +gchar *s = N_("Evolution Mail Configuration"); +gchar *s = N_("Account"); +gchar *s = N_("Type"); +gchar *s = N_("Add"); +gchar *s = N_("Edit"); +gchar *s = N_("Delete"); +gchar *s = N_("Default"); +gchar *s = N_("Mail"); +gchar *s = N_("Sources"); +gchar *s = N_("Add"); +gchar *s = N_("Edit"); +gchar *s = N_("Delete"); +gchar *s = N_("News"); diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h index 1f53911d3f..661eda3383 100644 --- a/mail/mail-config-druid.h +++ b/mail/mail-config-druid.h @@ -85,7 +85,7 @@ struct _MailConfigDruid { }; -typedef struct _MailConfigDialog MailConfigDialog; +typedef struct _MailConfigDruid MailConfigDruid; typedef struct { GtkWindowClass parent_class; -- cgit v1.2.3