[Goodies-commits] r2207 - in xfce4-mailwatch-plugin/trunk: libmailwatch-core panel-plugin

Brian Tarricone kelnos at xfce.org
Sat Dec 9 05:22:13 CET 2006


Author: kelnos
Date: 2006-12-09 04:22:12 +0000 (Sat, 09 Dec 2006)
New Revision: 2207

Modified:
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-gmail.c
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
   xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
   xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
Log:
* use XfceTitledDialog for config window
* set all GtkEntry widgets to activate the default button in dialogs


Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-gmail.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-gmail.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-gmail.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -621,6 +621,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(gmailbox->username)
         gtk_entry_set_text(GTK_ENTRY(entry), gmailbox->username);
     gtk_widget_show(entry);
@@ -640,6 +641,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
     if(gmailbox->password)
         gtk_entry_set_text(GTK_ENTRY(entry), gmailbox->password);

Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -1617,6 +1617,8 @@
             GTK_WINDOW(gtk_widget_get_toplevel(w)),
             GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
             GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+    gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
+    
     topvbox = gtk_vbox_new(FALSE, BORDER/2);
     gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER/2);
     gtk_widget_show(topvbox);
@@ -1658,6 +1660,7 @@
             G_CALLBACK(imap_config_nonstandard_chk_cb), imailbox);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_entry_set_width_chars(GTK_ENTRY(entry), 5);
     if(!imailbox->use_standard_port) {
         gchar portstr[16];
@@ -1691,6 +1694,7 @@
     gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     g_mutex_lock(imailbox->config_mx);
     if(imailbox->server_directory)
         gtk_entry_set_text(GTK_ENTRY(entry), imailbox->server_directory);
@@ -1738,6 +1742,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(imailbox->host)
         gtk_entry_set_text(GTK_ENTRY(entry), imailbox->host);
     gtk_widget_show(entry);
@@ -1757,6 +1762,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(imailbox->username)
         gtk_entry_set_text(GTK_ENTRY(entry), imailbox->username);
     gtk_widget_show(entry);
@@ -1776,6 +1782,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
     if(imailbox->password)
         gtk_entry_set_text(GTK_ENTRY(entry), imailbox->password);

Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -409,6 +409,7 @@
     gtk_size_group_add_widget( sg, label );
 
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default( GTK_ENTRY ( entry ), TRUE );
     g_mutex_lock( maildir->mutex );
     if ( maildir->path ) {
         gtk_entry_set_text( GTK_ENTRY( entry ), maildir->path );

Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -422,6 +422,7 @@
     gtk_size_group_add_widget( GTK_SIZE_GROUP( sg ), label );
 
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default( GTK_ENTRY( entry ), TRUE );
     g_mutex_lock( mbox->settings_mutex );
     if ( mbox->fn ) {
         gtk_entry_set_text( GTK_ENTRY( entry ), mbox->fn );

Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -808,6 +808,8 @@
             GTK_WINDOW(gtk_widget_get_toplevel(w)),
             GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
             GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+    gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
+    
     topvbox = gtk_vbox_new(FALSE, BORDER/2);
     gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER/2);
     gtk_widget_show(topvbox);
@@ -849,6 +851,7 @@
             G_CALLBACK(pop3_config_nonstandard_chk_cb), pmailbox);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_entry_set_width_chars(GTK_ENTRY(entry), 5);
     if(!pmailbox->use_standard_port) {
         gchar portstr[16];
@@ -907,6 +910,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(pmailbox->host)
         gtk_entry_set_text(GTK_ENTRY(entry), pmailbox->host);
     gtk_widget_show(entry);
@@ -926,6 +930,7 @@
     gtk_size_group_add_widget(sg, lbl);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(pmailbox->username)
         gtk_entry_set_text(GTK_ENTRY(entry), pmailbox->username);
     gtk_widget_show(entry);
@@ -939,6 +944,7 @@
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
     
     lbl = gtk_label_new_with_mnemonic(_("_Password:"));
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
     gtk_widget_show(lbl);
     gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);

Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -640,6 +640,7 @@
                 GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
                 NULL);
     }
+    gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
     
     topvbox = gtk_vbox_new(FALSE, BORDER/2);
     gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER);
@@ -655,6 +656,7 @@
     gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
     
     entry = gtk_entry_new();
+    gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     if(mailbox_name)
         gtk_entry_set_text(GTK_ENTRY(entry), mailbox_name);
     gtk_widget_show(entry);
@@ -778,6 +780,7 @@
     dlg = gtk_dialog_new_with_buttons(_("Select Mailbox Type"), parent,
             GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+    gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
     
     topvbox = gtk_vbox_new(FALSE, BORDER/2);
     gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER);

Modified: xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c	2006-12-07 09:09:30 UTC (rev 2206)
+++ xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c	2006-12-09 04:22:12 UTC (rev 2207)
@@ -751,15 +751,14 @@
 static void
 mailwatch_create_options(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp)
 {
-    GtkWidget *dlg, *header;
-    GtkWidget *topvbox, *frame, *frame_bin, *hbox, *lbl, *entry, *btn, *vbox,
-              *img;
+    GtkWidget *dlg, *topvbox, *frame, *frame_bin, *hbox, *lbl, *entry, *btn,
+              *vbox, *img;
     GtkContainer *cfg_page;
     GtkSizeGroup *sg;
     
     xfce_panel_plugin_block_menu(plugin);
     
-    dlg = gtk_dialog_new_with_buttons(_("Edit Properties"), 
+    dlg = xfce_titled_dialog_new_with_buttons(_("Mail Watcher"), 
                 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))),
                 GTK_DIALOG_DESTROY_WITH_PARENT |
                 GTK_DIALOG_NO_SEPARATOR, NULL);
@@ -769,6 +768,7 @@
                      G_CALLBACK(mailwatch_dialog_response), mwp);
 
     gtk_container_set_border_width(GTK_CONTAINER(dlg), 2);
+    gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-settings");
     
     btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
     gtk_widget_show(btn);
@@ -788,13 +788,6 @@
     gtk_widget_show(btn);
     gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn, GTK_RESPONSE_ACCEPT);
                      
-    header = xfce_create_header(NULL, _("Mail Watcher"));
-    gtk_widget_set_size_request(GTK_BIN(header)->child, -1, 32);
-    gtk_container_set_border_width(GTK_CONTAINER(header), BORDER - 2);
-    gtk_widget_show(header);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), header,
-                        FALSE, TRUE, 0);
-    
     topvbox = gtk_vbox_new(FALSE, BORDER);
     gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER - 2);
     gtk_widget_show(topvbox);




More information about the Goodies-commits mailing list