2007-09-21 [paul] 3.0.1cvs18
authorPaul Mangan <paul@claws-mail.org>
Fri, 21 Sep 2007 09:38:57 +0000 (09:38 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 21 Sep 2007 09:38:57 +0000 (09:38 +0000)
* src/mainwindow.c
group together the character set menu items
move the /View/Show or hide/Message view below
.../Toolbar menu item
Patch by Pawel Pekala

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c

index c1fcd2b..fb9e837 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-21 [paul]      3.0.1cvs18
+
+       * src/mainwindow.c
+               group together the character set menu items
+               move the /View/Show or hide/Message view below
+               .../Toolbar menu item
+               Patch by Pawel Pekala
+
 2007-09-21 [mones]     3.0.1cvs17
 
        * src/compose.c
index dac21d6..7ea0a05 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.207.2.183 -r 1.207.2.184 src/folderview.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/folderview.h;  ) > 3.0.1cvs15.patchset
 ( cvs diff -u -r 1.207.2.184 -r 1.207.2.185 src/folderview.c;  ) > 3.0.1cvs16.patchset
 ( cvs diff -u -r 1.382.2.409 -r 1.382.2.410 src/compose.c;  ) > 3.0.1cvs17.patchset
+( cvs diff -u -r 1.274.2.212 -r 1.274.2.213 src/mainwindow.c;  ) > 3.0.1cvs18.patchset
index 26d647e..ddff231 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 34354a6..3c54985 100644 (file)
@@ -566,8 +566,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Quick search"),            "slash", mainwindow_quicksearch, 0, NULL},
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Show or hi_de/_Message view"),
-                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Toolbar"),
                                                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
@@ -580,6 +578,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                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/_Message view"),
+                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
 #ifndef MAEMO
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
@@ -668,92 +668,91 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Character _encoding"),              NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Character _encoding/_Auto detect"),
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
-       {N_("/_View/Character _encoding/---"),          NULL, NULL, 0, "<Separator>"},
+       ENC_SEPARATOR,
+
        {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
         ENC_ACTION(C_US_ASCII)},
        {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
         ENC_ACTION(C_UTF_8)},
        ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
+       {N_("/_View/Character _encoding/Western European"),NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Western European/ISO-8859-_1"),
         ENC_ACTION(C_ISO_8859_1)},
-       {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
+       {N_("/_View/Character _encoding/Western European/ISO-8859-15"),
         ENC_ACTION(C_ISO_8859_15)},
-       {N_("/_View/Character _encoding/Western European (Windows-1252)"),
+       {N_("/_View/Character _encoding/Western European/Windows-1252"),
         ENC_ACTION(C_WINDOWS_1252)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
         ENC_ACTION(C_ISO_8859_2)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
+       {N_("/_View/Character _encoding/Baltic"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Baltic/ISO-8859-13"),
         ENC_ACTION(C_ISO_8859_13)},
-       {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
+       {N_("/_View/Character _encoding/Baltic/ISO-8859-_4"),
         ENC_ACTION(C_ISO_8859_4)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
         ENC_ACTION(C_ISO_8859_7)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
+       {N_("/_View/Character _encoding/Hebrew"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Hebrew/ISO-8859-_8"),
         ENC_ACTION(C_ISO_8859_8)},
-       {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
+       {N_("/_View/Character _encoding/Hebrew/Windows-1255"),
         ENC_ACTION(C_CP1255)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
+       {N_("/_View/Character _encoding/Arabic"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Arabic/ISO-8859-_6"),
         ENC_ACTION(C_ISO_8859_6)},
-       {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
+       {N_("/_View/Character _encoding/Arabic/Windows-1256"),
         ENC_ACTION(C_CP1256)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
         ENC_ACTION(C_ISO_8859_9)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
+       {N_("/_View/Character _encoding/Cyrillic"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Cyrillic/ISO-8859-_5"),
         ENC_ACTION(C_ISO_8859_5)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
+       {N_("/_View/Character _encoding/Cyrillic/KOI8-_R"),
         ENC_ACTION(C_KOI8_R)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
+       {N_("/_View/Character _encoding/Cyrillic/KOI8-U"),
         ENC_ACTION(C_KOI8_U)},
-       {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
+       {N_("/_View/Character _encoding/Cyrillic/Windows-1251"),
         ENC_ACTION(C_CP1251)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
+       {N_("/_View/Character _encoding/Japanese"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Japanese/ISO-2022-_JP"),
         ENC_ACTION(C_ISO_2022_JP)},
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
+       {N_("/_View/Character _encoding/Japanese/ISO-2022-JP-2"),
         ENC_ACTION(C_ISO_2022_JP_2)},
-       {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
+       {N_("/_View/Character _encoding/Japanese/_EUC-JP"),
         ENC_ACTION(C_EUC_JP)},
-       {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
+       {N_("/_View/Character _encoding/Japanese/_Shift__JIS"),
         ENC_ACTION(C_SHIFT_JIS)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
+       {N_("/_View/Character _encoding/Chinese"),      NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Chinese/Simplified (_GB2312)"),
         ENC_ACTION(C_GB2312)},
-       {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+       {N_("/_View/Character _encoding/Chinese/Simplified (GBK)"),
         ENC_ACTION(C_GBK)},
-       {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
+       {N_("/_View/Character _encoding/Chinese/Traditional (_Big5)"),
         ENC_ACTION(C_BIG5)},
-       {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
+       {N_("/_View/Character _encoding/Chinese/Traditional (EUC-_TW)"),
         ENC_ACTION(C_EUC_TW)},
-       {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
+       {N_("/_View/Character _encoding/Chinese/ISO-2022-_CN"),
         ENC_ACTION(C_ISO_2022_CN)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
+       {N_("/_View/Character _encoding/Korean"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Korean/EUC-_KR"),
         ENC_ACTION(C_EUC_KR)},
-       {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
+       {N_("/_View/Character _encoding/Korean/ISO-2022-KR"),
         ENC_ACTION(C_ISO_2022_KR)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Thai (TIS-620)"),
+       {N_("/_View/Character _encoding/Thai"),         NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Thai/TIS-620"),
         ENC_ACTION(C_TIS_620)},
-       {N_("/_View/Character _encoding/Thai (Windows-874)"),
+       {N_("/_View/Character _encoding/Thai/Windows-874"),
         ENC_ACTION(C_WINDOWS_874)},
 
 #undef ENC_SEPARATOR