2005-12-22 [paul] 1.9.100cvs102
authorPaul Mangan <paul@claws-mail.org>
Thu, 22 Dec 2005 10:43:40 +0000 (10:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 22 Dec 2005 10:43:40 +0000 (10:43 +0000)
* AUTHORS
* src/mainwindow.c
* src/mainwindow.h
* src/toolbar.c
* src/gtk/authors.h
support GTK_TOOLBAR_BOTH_HORIZ (text
next to icon) Patch by Marien Zwart
marienz@users.sf.net
Also reword the text

AUTHORS
ChangeLog
PATCHSETS
configure.ac
src/gtk/authors.h
src/mainwindow.c
src/mainwindow.h
src/toolbar.c

diff --git a/AUTHORS b/AUTHORS
index c10dc47..1165bd0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,3 +238,5 @@ contributors (beside the above; based on Changelog)
        Daniel Gustafson
        Anders Hammar
        Andrew Nelson
+       Marien Zwart
+
index 5f19834..771bb2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-22 [paul]      1.9.100cvs102
+
+       * AUTHORS
+       * src/mainwindow.c
+       * src/mainwindow.h
+       * src/toolbar.c
+       * src/gtk/authors.h
+               support GTK_TOOLBAR_BOTH_HORIZ (text
+               next to icon) Patch by Marien Zwart
+               marienz@users.sf.net
+               Also reword the text
+
 2005-12-21 [colin]     1.9.100cvs101
 
        * configure.ac
index 49b278f..647b14b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.4.2.5 -r 1.4.2.6 po/sv.po;  ) > 1.9.100cvs99.patchset
 ( diff -u /dev/null m4/codeset.m4;  diff -u /dev/null m4/glibc21.m4;  diff -u /dev/null m4/intdiv0.m4;  diff -u /dev/null m4/inttypes-pri.m4;  diff -u /dev/null m4/inttypes.m4;  diff -u /dev/null m4/inttypes_h.m4;  diff -u /dev/null m4/isc-posix.m4;  diff -u /dev/null m4/lcmessage.m4;  diff -u /dev/null m4/stdint_h.m4;  diff -u /dev/null m4/uintmax_t.m4;  ) > 1.9.100cvs100.patchset
 ( cvs diff -u -r 1.654.2.1130 -r 1.654.2.1131 configure.ac;  cvs diff -u -r 1.5.10.1 -r 1.5.10.2 COPYING;  cvs diff -u -r 1.382.2.209 -r 1.382.2.210 src/compose.c;  cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/send_message.c;  cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/common/smtp.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sylpheed.def;  ) > 1.9.100cvs101.patchset
+( cvs diff -u -r 1.100.2.30 -r 1.100.2.31 AUTHORS;  cvs diff -u -r 1.274.2.82 -r 1.274.2.83 src/mainwindow.c;  cvs diff -u -r 1.39.2.10 -r 1.39.2.11 src/mainwindow.h;  cvs diff -u -r 1.43.2.34 -r 1.43.2.35 src/toolbar.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/authors.h;  ) > 1.9.100cvs102.patchset
index b057093..c61e309 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=101
+EXTRA_VERSION=102
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 615b2f9..b156f4a 100644 (file)
@@ -218,6 +218,7 @@ static char *CONTRIBS_LIST[] = {
 "Yanase",
 "Yasumatsu",
 "Gál Zoltán",
+"Marien Zwart",
 "Martin Zwickel",
 NULL
 };
index 91850c3..aa3d0db 100644 (file)
@@ -490,14 +490,16 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                "V", toggle_message_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Toolbar"),
                                                NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
+       {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
                                                NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
-       {N_("/_View/Show or hi_de/_Toolbar/_Icon"),
-                                               NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"},
-       {N_("/_View/Show or hi_de/_Toolbar/_Text"),
-                                               NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"},
-       {N_("/_View/Show or hi_de/_Toolbar/_None"),
-                                               NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Icons only"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
@@ -1072,19 +1074,23 @@ MainWindow *main_window_create(SeparateType type)
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Show or hide/Toolbar/None");
+                       (ifactory, "/View/Show or hide/Toolbar/Hide");
                break;
        case TOOLBAR_ICON:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Show or hide/Toolbar/Icon");
+                       (ifactory, "/View/Show or hide/Toolbar/Icons only");
                break;
        case TOOLBAR_TEXT:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Show or hide/Toolbar/Text");
+                       (ifactory, "/View/Show or hide/Toolbar/Text only");
                break;
        case TOOLBAR_BOTH:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Show or hide/Toolbar/Icon and text");
+                       (ifactory, "/View/Show or hide/Toolbar/Text below icons");
+       case TOOLBAR_BOTH_HORIZ:
+               menuitem = gtk_item_factory_get_item
+                       (ifactory,
+                        "/View/Show or hide/Toolbar/Text beside icons");
        }
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
index 23e40ea..8bc9fe4 100644 (file)
@@ -61,10 +61,11 @@ typedef enum
 
 typedef enum
 {
-       TOOLBAR_NONE    = 0,
-       TOOLBAR_ICON    = 1,
-       TOOLBAR_TEXT    = 2,
-       TOOLBAR_BOTH    = 3
+       TOOLBAR_NONE            = 0,
+       TOOLBAR_ICON            = 1,
+       TOOLBAR_TEXT            = 2,
+       TOOLBAR_BOTH            = 3,
+       TOOLBAR_BOTH_HORIZ      = 4
 } ToolbarStyle;
 
 struct _MainWindow
index 0aae3f1..7399c2d 100644 (file)
@@ -780,6 +780,10 @@ void toolbar_set_style(GtkWidget *toolbar_wid, GtkWidget *handlebox_wid, guint a
                gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
                                      GTK_TOOLBAR_BOTH);
                break;
+       case TOOLBAR_BOTH_HORIZ:
+               gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
+                                     GTK_TOOLBAR_BOTH_HORIZ);
+               break;
        default:
                return;
        }