2005-10-16 [colin] 1.9.15cvs49
authorColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 10:40:11 +0000 (10:40 +0000)
committerColin Leroy <colin@colino.net>
Sun, 16 Oct 2005 10:40:11 +0000 (10:40 +0000)
* src/addressbook.c
Put border around buttons
* src/mainwindow.c
* src/summaryview.c
Rework menus (Patch based on a patch
by Paul)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/addressbook.c
src/mainwindow.c
src/summaryview.c

index 7de7d8e171f4138b15bdf758391750866a6a5b50..9a4bf94b9bc01dc4951ffb672f27faf0bda594f5 100644 (file)
@@ -1,3 +1,12 @@
+2005-10-16 [colin]     1.9.15cvs49
+
+       * src/addressbook.c
+               Put border around buttons
+       * src/mainwindow.c
+       * src/summaryview.c
+               Rework menus (Patch based on a patch
+               by Paul)
+
 2005-10-15 [wwp]       1.9.15cvs48
 
        * src/editjpilot.c
index ec32ebf73d76ebd7259caa4a82374df10fced995..e87d4b6591ce1864e40754677dd72324f7add01e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.207.2.72 -r 1.207.2.73 src/folderview.c;  ) > 1.9.15cvs46.patchset
 ( cvs diff -u -r 1.274.2.73 -r 1.274.2.74 src/mainwindow.c;  cvs diff -u -r 1.59.2.24 -r 1.59.2.25 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.27 -r 1.43.2.28 src/prefs_matcher.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/passphrase.c;  ) > 1.9.15cvs47.patchset
 ( cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/editjpilot.c;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/editldap.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/editvcard.c;  cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/exphtmldlg.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/expldifdlg.c;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/export.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/import.c;  cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/importldif.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/importmutt.c;  cvs diff -u -r 1.1.14.8 -r 1.1.14.9 src/importpine.c;  cvs diff -u -r 1.105.2.38 -r 1.105.2.39 src/prefs_account.c;  cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/prefs_spelling.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/gtkutils.h;  cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.23.2.12 -r 1.23.2.13 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 1.9.15cvs48.patchset
+( cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/addressbook.c;  cvs diff -u -r 1.274.2.74 -r 1.274.2.75 src/mainwindow.c;  cvs diff -u -r 1.395.2.137 -r 1.395.2.138 src/summaryview.c;  ) > 1.9.15cvs49.patchset
index c354a6c963e0c266688e28881f5ab5811fbd0256..236e81ecb8d80f40a9ce0e5716dd31fbbc455997 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 6c9ced9099b5d61e8e245115ebd8513956c5eee1..ad12f8ce30c74f19683a5a23493daaa1f4f7bad0 100644 (file)
@@ -872,6 +872,7 @@ static void addressbook_create(void)
        hbbox = gtk_hbutton_box_new();
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+       gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
 #if GTK_CHECK_VERSION(2, 6, 0)
index c3435ecf1e70f0301faeb701ee568fec6f7c6d07..50cef5ce38b65ac5ea5b9626b4a645901092a878 100644 (file)
@@ -1790,17 +1790,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                gchar *const entry;
                SensitiveCond cond;
        } entry[] = {
-               {"/File/Add mailbox"                          , M_UNLOCKED},
-
-                {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
-               {"/File/Change folder order"                  , M_UNLOCKED},
-               {"/File/Export to mbox file..."               , M_UNLOCKED},
-               {"/File/Empty all Trash folders"              , M_UNLOCKED},
-               {"/File/Work offline"                         , M_UNLOCKED},
-
-               {"/File/Save as...", M_TARGET_EXIST|M_UNLOCKED},
-               {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
-               /* {"/File/Close"  , M_UNLOCKED}, */
+               {"/File/Save as...", M_TARGET_EXIST},
+               {"/File/Print..."  , M_TARGET_EXIST},
                {"/File/Exit"      , M_UNLOCKED},
 
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
@@ -1836,28 +1827,26 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
-               {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Message/Move to trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
-               {"/Message/Delete..."             , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
-               {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+               {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE},
+               {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC},
+               {"/Message/Move to trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+               {"/Message/Delete..."             , M_TARGET_EXIST|M_ALLOW_DELETE},
+               {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
                {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
-               {"/Tools/Harvest addresses"            , M_UNLOCKED},
                {"/Tools/Harvest addresses/from Folder..."       
-                                                      , M_UNLOCKED|M_MSG_EXIST},
+                                                      , M_MSG_EXIST},
                {"/Tools/Harvest addresses/from Messages..."
-                                                      , M_UNLOCKED|M_MSG_EXIST|M_TARGET_EXIST},
-               {"/Tools/Harvest addresses"            , M_UNLOCKED},
-               {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+                                                      , M_MSG_EXIST|M_TARGET_EXIST},
+               {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC},
+               {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC},
                {"/Tools/Create filter rule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/Tools/Create processing rule"       , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"/Tools/Actions"                      , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Tools/Actions"                      , M_TARGET_EXIST},
                {"/Tools/Execute"                      , M_DELAY_EXEC},
-               {"/Tools/Delete duplicated messages/In selected folder"   , M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+               {"/Tools/Delete duplicated messages/In selected folder"   , M_MSG_EXIST|M_ALLOW_DELETE},
 
                {"/Configuration", M_UNLOCKED},
 
index 71dd4c3a7d78a549c91c84d79cb66220992a946e..cb0252bafedb1750eb9e452d67ab898f8589f76d 100644 (file)
@@ -400,7 +400,6 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Repl_y to/_sender"),      NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/Repl_y to/mailing _list"),
                                        "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
        {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
@@ -410,7 +409,6 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
        {N_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
        {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
-       {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
@@ -425,8 +423,6 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/Unlock"),           NULL, summary_msgs_unlock, 0, NULL},
        {N_("/Color la_bel"),           NULL, NULL,             0, NULL},
 
-       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
-       {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Add sender to address boo_k"),
                                        NULL, summary_add_address_cb, 0, NULL},
@@ -454,6 +450,9 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        "<control><alt>N", summary_open_msg,    0, NULL},
        {N_("/_View/_Source"),          "<control>U", summary_view_source, 0, NULL},
        {N_("/_View/All _header"),      "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
+       {N_("/_Save as..."),            "<control>S", summary_save_as,   0, NULL},
+       {N_("/_Print..."),              "<control>P", summary_print,   0, NULL},
 };  /* see also list in menu_connect_identical_items() in menu.c if this changes */
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
@@ -815,7 +814,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (summary_is_locked(summaryview)) return FALSE;
 
        if (!summaryview->mainwin)
-               return;
+               return FALSE;
 
        inc_lock();
        summary_lock(summaryview);
@@ -1217,19 +1216,15 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Reply to/all"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Reply to/mailing list"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
-               {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
 
                {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Forward as attachment"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
 
-               {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-
-               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
-               {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
-               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
-               {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+               {"/Copy..."                     , M_TARGET_EXIST|M_EXEC},
+               {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE},
 
                {"/Mark"                        , M_TARGET_EXIST},
                {"/Mark/Mark"                   , M_TARGET_EXIST},
@@ -1249,13 +1244,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
                {"/View/Source"                 , M_SINGLE_TARGET_EXIST},
                {"/View/All header"             , M_SINGLE_TARGET_EXIST},
-#if 0
-               {"/Save as..."                  , M_TARGET_EXIST|M_UNLOCKED},
-               {"/Print..."                    , M_TARGET_EXIST|M_UNLOCKED},
-
-               {"/Select thread"               , M_SINGLE_TARGET_EXIST},
-               {"/Select all"                  , M_TARGET_EXIST},
-#endif
+               {"/Save as..."                  , M_TARGET_EXIST},
+               {"/Print..."                    , M_TARGET_EXIST},
                {NULL, 0}
        };