2005-06-28 [paul] 1.9.12cvs3
authorPaul Mangan <paul@claws-mail.org>
Tue, 28 Jun 2005 05:32:32 +0000 (05:32 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 28 Jun 2005 05:32:32 +0000 (05:32 +0000)
* src/ssl_manager.c
replace the OK button with a Close button
* src/gtk/foldersort.c
use GTK_STOCK_ icons/buttons

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/gtk/foldersort.c
src/ssl_manager.c

index a93c3f9270bda9e6f1260cb7109499586f7fb0be..94634335a4eec0fc2f8a90e94d77799e8e356471 100644 (file)
@@ -1,3 +1,10 @@
+2005-06-28 [paul]      1.9.12cvs3
+
+       * src/ssl_manager.c
+               replace the OK button with a Close button
+       * src/gtk/foldersort.c
+               use GTK_STOCK_ icons/buttons
+
 2005-06-28 [colin]     1.9.12cvs2
 
        * src/gedit-print.c             ** ADDED **
index 2f7df88d073f78aacf2cd08c4d5456b578325bc6..bf26e14f2552db054f1ed5383078315ea7aecde8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/imap_gtk.c;  ) > 1.9.11cvs106.patchset
 ( cvs diff -u -r 1.155.2.26 -r 1.155.2.27 src/Makefile.am;  cvs diff -u -r 1.274.2.43 -r 1.274.2.44 src/mainwindow.c;  cvs diff -u -r 1.94.2.55 -r 1.94.2.56 src/messageview.c;  cvs diff -u -r 1.150.2.28 -r 1.150.2.29 src/procmsg.c;  cvs diff -u -r 1.395.2.87 -r 1.395.2.88 src/summaryview.c;  cvs diff -u -r 1.20.2.4 -r 1.20.2.5 src/gtk/Makefile.am;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/quicksearch.c;  ) > 1.9.12cvs1.patchset
 ( diff -u /dev/null src/gedit-print.c;  diff -u /dev/null src/gedit-print.h;  diff -u /dev/null src/gtk/gtksourceprintjob.c;  diff -u /dev/null src/gtk/gtksourceprintjob.h;  ) > 1.9.12cvs2.patchset
+( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/ssl_manager.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/foldersort.c;  ) > 1.9.12cvs3.patchset
index 65eb05d2a4bacab6966b499ad4fa32430756ed5f..a6adb7ce58ffbbdc5014a65be4d6481692fc1bc6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 20f2837c78c2fe10469f450c61aa9e7264147a3b..804ea42aa4015aefbfc836e064c67288a87901bc 100644 (file)
@@ -129,9 +129,7 @@ void foldersort_open()
        GtkWidget *cancel_btn;
        GtkWidget *vbox1;
        GtkWidget *moveup_btn;
-       GtkWidget *arrow1;
        GtkWidget *movedown_btn;
-       GtkWidget *arrow2;
        GtkWidget *scrolledwindow1;
        GtkWidget *folderlist;
        GtkWidget *label2;
@@ -172,12 +170,12 @@ void foldersort_open()
        gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX(hbuttonbox1), 0,
                                          0);
 
-       ok_btn = gtk_button_new_with_label(_("Ok"));
+       ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
        gtk_widget_show(ok_btn);
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), ok_btn);
        GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT);
 
-       cancel_btn = gtk_button_new_with_label(_("Cancel"));
+       cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
        gtk_widget_show(cancel_btn);
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), cancel_btn);
        GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
@@ -188,22 +186,14 @@ void foldersort_open()
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (GTK_FILL), 0, 0);
 
-       moveup_btn = gtk_button_new();
+       moveup_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_widget_show(moveup_btn);
        gtk_box_pack_start(GTK_BOX(vbox1), moveup_btn, FALSE, FALSE, 0);
 
-       arrow1 = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
-       gtk_widget_show(arrow1);
-       gtk_container_add(GTK_CONTAINER(moveup_btn), arrow1);
-
-       movedown_btn = gtk_button_new();
+       movedown_btn =  gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_widget_show(movedown_btn);
        gtk_box_pack_start(GTK_BOX(vbox1), movedown_btn, FALSE, FALSE, 0);
 
-       arrow2 = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_show(arrow2);
-       gtk_container_add(GTK_CONTAINER(movedown_btn), arrow2);
-
        scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(scrolledwindow1);
        gtk_table_attach(GTK_TABLE(table1), scrolledwindow1, 0, 1, 1, 2,
index 41855286a6a17894c520083d558e4fa20118b971..4b21b9cfc78a7f69bc4c19341665c3bba01da3e8 100644 (file)
@@ -53,12 +53,12 @@ static struct SSLManager
        GtkWidget *certlist;
        GtkWidget *view_btn;
        GtkWidget *delete_btn;
-       GtkWidget *ok_btn;
+       GtkWidget *close_btn;
 } manager;
 
 static void ssl_manager_view_cb                (GtkWidget *widget, gpointer data);
 static void ssl_manager_delete_cb      (GtkWidget *widget, gpointer data);
-static void ssl_manager_ok_cb          (GtkWidget *widget, gpointer data);
+static void ssl_manager_close_cb       (GtkWidget *widget, gpointer data);
 static void ssl_manager_load_certs     (void);
 static void ssl_manager_double_clicked(GtkTreeView             *list_view,
                                        GtkTreePath             *path,
@@ -71,7 +71,7 @@ void ssl_manager_open(MainWindow *mainwin)
                ssl_manager_create();
 
        manage_window_set_transient(GTK_WINDOW(manager.window));
-       gtk_widget_grab_focus(manager.ok_btn);
+       gtk_widget_grab_focus(manager.close_btn);
 
        ssl_manager_load_certs();
 
@@ -144,7 +144,7 @@ void ssl_manager_create(void)
        GtkWidget *certlist;
        GtkWidget *view_btn;
        GtkWidget *delete_btn;
-       GtkWidget *ok_btn;
+       GtkWidget *close_btn;
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title (GTK_WINDOW(window),
@@ -154,7 +154,7 @@ void ssl_manager_create(void)
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
        g_signal_connect(G_OBJECT(window), "delete_event",
-                        G_CALLBACK(ssl_manager_ok_cb), NULL);
+                        G_CALLBACK(ssl_manager_close_cb), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
 
        hbox1 = gtk_hbox_new(FALSE, 6);
@@ -168,9 +168,9 @@ void ssl_manager_create(void)
        g_signal_connect(G_OBJECT(view_btn), "clicked",
                         G_CALLBACK(ssl_manager_view_cb), NULL);
 
-       ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
-       g_signal_connect(G_OBJECT(ok_btn), "clicked",
-                        G_CALLBACK(ssl_manager_ok_cb), NULL);
+       close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+       g_signal_connect(G_OBJECT(close_btn), "clicked",
+                        G_CALLBACK(ssl_manager_close_cb), NULL);
 
        certlist = ssl_manager_list_view_create();
        
@@ -178,12 +178,12 @@ void ssl_manager_create(void)
        gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(vbox1), view_btn, FALSE, FALSE, 4);
        gtk_box_pack_start(GTK_BOX(vbox1), delete_btn, FALSE, FALSE, 4);
-       gtk_box_pack_end(GTK_BOX(vbox1), ok_btn, FALSE, FALSE, 4);
+       gtk_box_pack_end(GTK_BOX(vbox1), close_btn, FALSE, FALSE, 4);
        
        gtk_widget_show(certlist);
        gtk_widget_show(hbox1);
        gtk_widget_show(vbox1);
-       gtk_widget_show(ok_btn);
+       gtk_widget_show(close_btn);
        gtk_widget_show(delete_btn);
        gtk_widget_show(view_btn);
        gtk_container_add(GTK_CONTAINER (window), hbox1);
@@ -194,7 +194,7 @@ void ssl_manager_create(void)
        manager.certlist = certlist;
        manager.view_btn = view_btn;
        manager.delete_btn = delete_btn;
-       manager.ok_btn = ok_btn;
+       manager.close_btn = close_btn;
 
        gtk_widget_show(window);
                
@@ -317,8 +317,8 @@ void ssl_manager_close(void)
        gtk_widget_hide(manager.window);
 }
 
-static void ssl_manager_ok_cb(GtkWidget *widget, 
-                             gpointer data) 
+static void ssl_manager_close_cb(GtkWidget *widget,
+                                gpointer data) 
 {
        ssl_manager_close();
 }