2005-08-06 [paul] 1.9.13cvs18

	* src/mainwindow.c
		refer to 'displayed columns in folder/message
		list' not 'displayed items in summary/message view'
	* src/prefs_display_header.c
		replace GTK_STOCK_DELETE with GTK_STOCK_REMOVE to
		be consistent with similar dialogues
	* src/prefs_folder_column.c
	* src/prefs_summary_column.c
		'columns' not 'items', and folder and message lists,
		instead of folder and summary views;
		Use 'Hidden columns' as list heading not 'Available
		items';
		move the 'Remove' button to the right hand side;
		top-align the buttons;
		remove unneeded vbox
	* src/prefs_summaries.c
		put the 2 column prefs buttons in a frame to reduce
		overall width; refer to columns not items &c.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 9020ea90e8e5e9625c9a3b3fa678da0d368ef106..52255345f79af7fae75b8054c2a788c13befcc3b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,24 @@
+2005-08-06 [paul]      1.9.13cvs18
+
+       * src/mainwindow.c
+               refer to 'displayed columns in folder/message
+               list' not 'displayed items in summary/message view'
+       * src/prefs_display_header.c
+               replace GTK_STOCK_DELETE with GTK_STOCK_REMOVE to
+               be consistent with similar dialogues
+       * src/prefs_folder_column.c
+       * src/prefs_summary_column.c
+               'columns' not 'items', and folder and message lists,
+               instead of folder and summary views;
+               Use 'Hidden columns' as list heading not 'Available
+               items';
+               move the 'Remove' button to the right hand side;
+               top-align the buttons;
+               remove unneeded vbox
+       * src/prefs_summaries.c
+               put the 2 column prefs buttons in a frame to reduce
+               overall width; refer to columns not items &c.
+
 2005-08-05 [colin]     1.9.13cvs17
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index 23b494cb89779dfea85a37caa026d3d9a0f03884..19bccae44c9cd3b50ce4e6ad67c78d600436dcea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -703,3 +703,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.101 -r 1.395.2.102 src/summaryview.c;  ) > 1.9.13cvs15.patchset
 ( cvs diff -u -r 1.155.2.29 -r 1.155.2.30 src/Makefile.am;  cvs diff -u -r 1.382.2.146 -r 1.382.2.147 src/compose.c;  cvs diff -u -r 1.207.2.51 -r 1.207.2.52 src/folderview.c;  cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/folderview.h;  cvs diff -u -r 1.179.2.56 -r 1.179.2.57 src/imap.c;  cvs diff -u -r 1.274.2.48 -r 1.274.2.49 src/mainwindow.c;  cvs diff -u -r 1.39.2.3 -r 1.39.2.4 src/mainwindow.h;  cvs diff -u -r 1.204.2.48 -r 1.204.2.49 src/prefs_common.c;  cvs diff -u -r 1.103.2.22 -r 1.103.2.23 src/prefs_common.h;  diff -u /dev/null src/prefs_folder_column.c;  diff -u /dev/null src/prefs_folder_column.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/prefs_summary_column.c;  cvs diff -u -r 1.395.2.102 -r 1.395.2.103 src/summaryview.c;  cvs diff -u -r 1.68.2.10 -r 1.68.2.11 src/summaryview.h;  cvs diff -u -r 1.96.2.68 -r 1.96.2.69 src/textview.c;  cvs diff -u -r 1.36.2.38 -r 1.36.2.39 src/common/utils.c;  cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/common/utils.h;  ) > 1.9.13cvs16.patchset
 ( cvs diff -u -r 1.204.2.49 -r 1.204.2.50 src/prefs_common.c;  cvs diff -u -r 1.103.2.23 -r 1.103.2.24 src/prefs_common.h;  cvs diff -u -r 1.274.2.49 -r 1.274.2.50 src/mainwindow.c;  cvs diff -u -r 1.382.2.147 -r 1.382.2.148 src/compose.c;  cvs diff -u -r 1.94.2.59 -r 1.94.2.60 src/messageview.c;  ) > 1.9.13cvs17.patchset
+( cvs diff -u -r 1.274.2.50 -r 1.274.2.51 src/mainwindow.c;  cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/prefs_display_header.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/prefs_summary_column.c;  ) > 1.9.13cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 2487d062fde48664a06d0be19ecb6478acfd9baa..735ff73b53caaa9773f620dd26dd92d50565aafa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index f1f639581d347f9c7d73ffdbfb794281660e9825..709387860ac170203f8ff3577bc6f65700895dfa 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -524,9 +524,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
        {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set displayed _items"),     NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Set displayed _items/ in _Summary view..."),NULL, set_summary_display_item_cb, 0, NULL},
-       {N_("/_View/Set displayed _items/ in _Folder view..."), NULL, set_folder_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed columns"),    NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Set displayed columns/in Folder list..."),  NULL, set_folder_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed columns/in Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 382cbec9fa1180a08dcae482a382db242db30b93..a1305c0f32d874748eb3afb53843da1dbc2841ca 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -310,7 +310,7 @@ static void prefs_display_header_create(void)
        g_signal_connect (G_OBJECT (reg_btn), "clicked",
                          G_CALLBACK (prefs_display_header_register_cb),
                            GINT_TO_POINTER(FALSE));
-       del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+       del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
        g_signal_connect (G_OBJECT (del_btn), "clicked",

diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 1c15c9ebbe722ecbd3bc12537929dcbeab5c1bf4..632796bb0a7dd4567cdc116e302884c3692b1359 100644 (file)
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -183,7 +183,6 @@ static void prefs_folder_column_create(void)
        GtkWidget *shown_list_view;
 
        GtkWidget *btn_vbox;
-       GtkWidget *btn_vbox1;
        GtkWidget *add_btn;
        GtkWidget *remove_btn;
        GtkWidget *up_btn;
@@ -203,7 +202,7 @@ static void prefs_folder_column_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_title(GTK_WINDOW(window),
-                            _("Displayed items configuration"));
+                            _("Folder list columns configuration"));
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_folder_column_delete_event),
                         NULL);
@@ -220,7 +219,7 @@ static void prefs_folder_column_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
 
        label = gtk_label_new
-               (_("Select items to be displayed in the folder view. You can modify\n"
+               (_("Select columns to be displayed in the folder list. You can modify\n"
                   "the order by using the Up / Down buttons or by dragging the items."));
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
@@ -249,31 +248,21 @@ static void prefs_folder_column_create(void)
 
                                       
        stock_list_view = prefs_folder_column_list_view_create
-                               (_("Available items"));
+                               (_("Hidden columns"));
        gtk_widget_show(stock_list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwin), stock_list_view);
 
        /* add/remove button */
-       btn_vbox = gtk_vbox_new(FALSE, 0);
+       btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
        gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-       btn_vbox1 = gtk_vbox_new(FALSE, 8);
-       gtk_widget_show(btn_vbox1);
-       gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
-
-       add_btn = gtk_button_new_with_label(_("  ->  "));
+       add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_widget_show(add_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), add_btn, FALSE, FALSE, 0);
-
-       remove_btn = gtk_button_new_with_label(_("  <-  "));
-       gtk_widget_show(remove_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), remove_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
 
        g_signal_connect(G_OBJECT(add_btn), "clicked",
                         G_CALLBACK(prefs_folder_column_add), NULL);
-       g_signal_connect(G_OBJECT(remove_btn), "clicked",
-                        G_CALLBACK(prefs_folder_column_remove), NULL);
 
        clist_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(clist_hbox);
@@ -288,27 +277,29 @@ static void prefs_folder_column_create(void)
                                       GTK_POLICY_AUTOMATIC);
 
        shown_list_view = prefs_folder_column_list_view_create
-                               (_("Displayed items"));
+                               (_("Displayed columns"));
        gtk_widget_show(shown_list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwin), shown_list_view);
 
        /* up/down button */
-       btn_vbox = gtk_vbox_new(FALSE, 0);
+       btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
        gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-       btn_vbox1 = gtk_vbox_new(FALSE, 8);
-       gtk_widget_show(btn_vbox1);
-       gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
+       remove_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       gtk_widget_show(remove_btn);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
 
        up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_widget_show(up_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), up_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
 
        down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_widget_show(down_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), down_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
 
+       g_signal_connect(G_OBJECT(remove_btn), "clicked",
+                        G_CALLBACK(prefs_folder_column_remove), NULL);
        g_signal_connect(G_OBJECT(up_btn), "clicked",
                         G_CALLBACK(prefs_folder_column_up), NULL);
        g_signal_connect(G_OBJECT(down_btn), "clicked",

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 96c21cfcaf882c32762f2dc617f59c9dfa161109..d5453a414ebde87281b3b584ec268918afe5cb2c 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -702,6 +702,8 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
+       GtkWidget *hbox_dispitem;
+       GtkWidget *frame_dispitem;
        GtkWidget *button_dispitem;
 
        GtkWidget *checkbtn_always_show_msg;
@@ -795,24 +797,27 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
 
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+       PACK_FRAME(vbox2, frame_dispitem, _("Set displayed columns"));
+
+       hbox_dispitem = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_dispitem);
+       gtk_container_add (GTK_CONTAINER (frame_dispitem), hbox_dispitem);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox_dispitem), 8);
 
        button_dispitem = gtk_button_new_with_label
-               (_(" Set displayed items in summary... "));
+               (_(" Folder list... "));
        gtk_widget_show (button_dispitem);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_dispitem), "clicked",
-                         G_CALLBACK (prefs_summary_column_open),
+                         G_CALLBACK (prefs_folder_column_open),
                          NULL);
-
+       
        button_dispitem = gtk_button_new_with_label
-               (_(" Set displayed items in folder view... "));
+               (_(" Message list... "));
        gtk_widget_show (button_dispitem);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_dispitem), "clicked",
-                         G_CALLBACK (prefs_folder_column_open),
+                         G_CALLBACK (prefs_summary_column_open),
                          NULL);
 
        vbox2 = gtk_vbox_new (FALSE, 0);

diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 6901a0c12755288d644f80d966085ceee32bfe91..159b86ce41ecfcea3f882a699ab83ca1dda68d3c 100644 (file)
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -197,7 +197,6 @@ static void prefs_summary_column_create(void)
        GtkWidget *shown_list_view;
 
        GtkWidget *btn_vbox;
-       GtkWidget *btn_vbox1;
        GtkWidget *add_btn;
        GtkWidget *remove_btn;
        GtkWidget *up_btn;
@@ -217,7 +216,7 @@ static void prefs_summary_column_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        gtk_window_set_title(GTK_WINDOW(window),
-                            _("Displayed items configuration"));
+                            _("Message list columns configuration"));
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_summary_column_delete_event),
                         NULL);
@@ -234,7 +233,7 @@ static void prefs_summary_column_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
 
        label = gtk_label_new
-               (_("Select items to be displayed in the summary view. You can modify\n"
+               (_("Select columns to be displayed in the message list. You can modify\n"
                   "the order by using the Up / Down buttons or by dragging the items."));
        gtk_widget_show(label);
        gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
@@ -263,31 +262,21 @@ static void prefs_summary_column_create(void)
 
                                       
        stock_list_view = prefs_summary_column_list_view_create
-                               (_("Available items"));
+                               (_("Hidden columns"));
        gtk_widget_show(stock_list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwin), stock_list_view);
 
        /* add/remove button */
-       btn_vbox = gtk_vbox_new(FALSE, 0);
+       btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
        gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-       btn_vbox1 = gtk_vbox_new(FALSE, 8);
-       gtk_widget_show(btn_vbox1);
-       gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
-
-       add_btn = gtk_button_new_with_label(_("  ->  "));
+       add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_widget_show(add_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), add_btn, FALSE, FALSE, 0);
-
-       remove_btn = gtk_button_new_with_label(_("  <-  "));
-       gtk_widget_show(remove_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), remove_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
 
        g_signal_connect(G_OBJECT(add_btn), "clicked",
                         G_CALLBACK(prefs_summary_column_add), NULL);
-       g_signal_connect(G_OBJECT(remove_btn), "clicked",
-                        G_CALLBACK(prefs_summary_column_remove), NULL);
 
        clist_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(clist_hbox);
@@ -302,27 +291,29 @@ static void prefs_summary_column_create(void)
                                       GTK_POLICY_AUTOMATIC);
 
        shown_list_view = prefs_summary_column_list_view_create
-                               (_("Displayed items"));
+                               (_("Displayed columns"));
        gtk_widget_show(shown_list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwin), shown_list_view);
 
        /* up/down button */
-       btn_vbox = gtk_vbox_new(FALSE, 0);
+       btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
        gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-       btn_vbox1 = gtk_vbox_new(FALSE, 8);
-       gtk_widget_show(btn_vbox1);
-       gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
+       remove_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       gtk_widget_show(remove_btn);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
 
        up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_widget_show(up_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), up_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
 
        down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_widget_show(down_btn);
-       gtk_box_pack_start(GTK_BOX(btn_vbox1), down_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
 
+       g_signal_connect(G_OBJECT(remove_btn), "clicked",
+                        G_CALLBACK(prefs_summary_column_remove), NULL);
        g_signal_connect(G_OBJECT(up_btn), "clicked",
                         G_CALLBACK(prefs_summary_column_up), NULL);
        g_signal_connect(G_OBJECT(down_btn), "clicked",