NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Separate f_older tree"), NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
- {N_("/_View/Separate m_essage view"), NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+ {N_("/_View/Separate _message view"), NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
{N_("/_View/_Go to/Other _folder..."), "G", goto_folder_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
-#define CODESET_SEPARATOR \
- {N_("/_View/_Code set/---"), NULL, NULL, 0, "<Separator>"}
-#define CODESET_ACTION(action) \
- NULL, set_charset_cb, action, "/View/Code set/Auto detect"
+#define ENC_SEPARATOR \
+ {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"}
+#define ENC_ACTION(action) \
+ NULL, set_charset_cb, action, "/View/Character encoding/Auto detect"
- {N_("/_View/_Code set"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Code set/_Auto detect"),
+ {N_("/_View/Character _encoding"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Character _encoding/_Auto detect"),
NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
- {N_("/_View/_Code set/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
- CODESET_ACTION(C_US_ASCII)},
-
- {N_("/_View/_Code set/Unicode (_UTF-8)"),
- CODESET_ACTION(C_UTF_8)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Western European (ISO-8859-_1)"),
- CODESET_ACTION(C_ISO_8859_1)},
- {N_("/_View/_Code set/Western European (ISO-8859-15)"),
- CODESET_ACTION(C_ISO_8859_15)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
- CODESET_ACTION(C_ISO_8859_2)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/_Baltic (ISO-8859-13)"),
- CODESET_ACTION(C_ISO_8859_13)},
- {N_("/_View/_Code set/Baltic (ISO-8859-_4)"),
- CODESET_ACTION(C_ISO_8859_4)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Greek (ISO-8859-_7)"),
- CODESET_ACTION(C_ISO_8859_7)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Turkish (ISO-8859-_9)"),
- CODESET_ACTION(C_ISO_8859_9)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Cyrillic (ISO-8859-_5)"),
- CODESET_ACTION(C_ISO_8859_5)},
- {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
- CODESET_ACTION(C_KOI8_R)},
- {N_("/_View/_Code set/Cyrillic (KOI8-U)"),
- CODESET_ACTION(C_KOI8_U)},
- {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
- CODESET_ACTION(C_WINDOWS_1251)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
- CODESET_ACTION(C_ISO_2022_JP)},
- {N_("/_View/_Code set/Japanese (ISO-2022-JP-2)"),
- CODESET_ACTION(C_ISO_2022_JP_2)},
- {N_("/_View/_Code set/Japanese (_EUC-JP)"),
- CODESET_ACTION(C_EUC_JP)},
- {N_("/_View/_Code set/Japanese (_Shift__JIS)"),
- CODESET_ACTION(C_SHIFT_JIS)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Simplified Chinese (_GB2312)"),
- CODESET_ACTION(C_GB2312)},
- {N_("/_View/_Code set/Traditional Chinese (_Big5)"),
- CODESET_ACTION(C_BIG5)},
- {N_("/_View/_Code set/Traditional Chinese (EUC-_TW)"),
- CODESET_ACTION(C_EUC_TW)},
- {N_("/_View/_Code set/Chinese (ISO-2022-_CN)"),
- CODESET_ACTION(C_ISO_2022_CN)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Korean (EUC-_KR)"),
- CODESET_ACTION(C_EUC_KR)},
- {N_("/_View/_Code set/Korean (ISO-2022-KR)"),
- CODESET_ACTION(C_ISO_2022_KR)},
- CODESET_SEPARATOR,
- {N_("/_View/_Code set/Thai (TIS-620)"),
- CODESET_ACTION(C_TIS_620)},
- {N_("/_View/_Code set/Thai (Windows-874)"),
- CODESET_ACTION(C_WINDOWS_874)},
-
-#undef CODESET_SEPARATOR
-#undef CODESET_ACTION
-
-#define DECODE_SEPARATOR \
+ {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<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)"),
+ ENC_ACTION(C_ISO_8859_1)},
+ {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
+ ENC_ACTION(C_ISO_8859_15)},
+ 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)"),
+ ENC_ACTION(C_ISO_8859_13)},
+ {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/Turkish (ISO-8859-_9)"),
+ ENC_ACTION(C_ISO_8859_9)},
+ ENC_SEPARATOR,
+
+ {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
+ ENC_ACTION(C_ISO_8859_5)},
+ {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
+ ENC_ACTION(C_KOI8_R)},
+ {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
+ ENC_ACTION(C_KOI8_U)},
+ {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
+ ENC_ACTION(C_CP1251)},
+ ENC_SEPARATOR,
+
+ {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
+ ENC_ACTION(C_ISO_2022_JP)},
+ {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
+ ENC_ACTION(C_ISO_2022_JP_2)},
+ {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
+ ENC_ACTION(C_EUC_JP)},
+ {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
+ ENC_ACTION(C_SHIFT_JIS)},
+ ENC_SEPARATOR,
+
+ {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
+ ENC_ACTION(C_GB2312)},
+ {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
+ ENC_ACTION(C_BIG5)},
+ {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
+ ENC_ACTION(C_EUC_TW)},
+ {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
+ ENC_ACTION(C_ISO_2022_CN)},
+ ENC_SEPARATOR,
+
+ {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
+ ENC_ACTION(C_EUC_KR)},
+ {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
+ ENC_ACTION(C_ISO_2022_KR)},
+ ENC_SEPARATOR,
+
+ {N_("/_View/Character _encoding/Thai (TIS-620)"),
+ ENC_ACTION(C_TIS_620)},
+ {N_("/_View/Character _encoding/Thai (Windows-874)"),
+ ENC_ACTION(C_WINDOWS_874)},
+
+#undef ENC_SEPARATOR
+#undef ENC_ACTION
+
+#define DEC_SEPARATOR \
{N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"}
-#define DECODE_ACTION(action) \
+#define DEC_ACTION(action) \
NULL, set_decode_cb, action, "/View/Decode/Auto detect"
{N_("/_View/Decode"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Decode/_Auto detect"),
NULL, set_decode_cb, 0, "<RadioItem>"},
{N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Decode/_8bit"), DECODE_ACTION(ENC_8BIT)},
- {N_("/_View/Decode/_Quoted printable"), DECODE_ACTION(ENC_QUOTED_PRINTABLE)},
- {N_("/_View/Decode/_Base64"), DECODE_ACTION(ENC_BASE64)},
- {N_("/_View/Decode/_Uuencode"), DECODE_ACTION(ENC_X_UUENCODE)},
+ {N_("/_View/Decode/_8bit"), DEC_ACTION(ENC_8BIT)},
+ {N_("/_View/Decode/_Quoted printable"), DEC_ACTION(ENC_QUOTED_PRINTABLE)},
+ {N_("/_View/Decode/_Base64"), DEC_ACTION(ENC_BASE64)},
+ {N_("/_View/Decode/_Uuencode"), DEC_ACTION(ENC_X_UUENCODE)},
-#undef DECODE_SEPARATOR
-#undef DECODE_ACTION
+#undef DEC_SEPARATOR
+#undef DEC_ACTION
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
/* set menu items */
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Code set/Auto detect");
+ (ifactory, "/View/Character encoding/Auto detect");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
switch (prefs_common.toolbar_style) {
gtk_widget_ref(vpaned);
gtkut_container_remove(GTK_CONTAINER(container), vpaned);
gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
- gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
- GTK_ARROW_UP, GTK_SHADOW_OUT);
} else {
mainwin->messageview->visible = TRUE;
gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
gtk_container_add(GTK_CONTAINER(container), vpaned);
gtk_widget_unref(vpaned);
- gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
- GTK_ARROW_DOWN, GTK_SHADOW_OUT);
}
+ if (messageview_is_visible(mainwin->messageview))
+ gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+ GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ else
+ gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+ GTK_ARROW_UP, GTK_SHADOW_OUT);
+
if (mainwin->messageview->visible == FALSE)
messageview_clear(mainwin->messageview);
debug_print("Setting widgets... ");
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
+ prefs_common.folderview_width,
+ prefs_common.folderview_height);
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->summaryview),
+ prefs_common.summaryview_width,
+ prefs_common.summaryview_height);
+ gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
+ prefs_common.msgview_width,
+ prefs_common.msgview_height);
+
/* create separated window(s) if needed */
if (type & SEPARATE_FOLDER) {
folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
}
- gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
- prefs_common.folderview_width,
- prefs_common.folderview_height);
- gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->summaryview),
- prefs_common.summaryview_width,
- prefs_common.summaryview_height);
- gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
- prefs_common.msgview_width,
- prefs_common.msgview_height);
-
switch (type) {
case SEPARATE_NONE:
hpaned = gtk_hpaned_new();
break;
}
+ if (messageview_is_visible(mainwin->messageview))
+ gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+ GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ else
+ gtk_arrow_set(GTK_ARROW(mainwin->summaryview->toggle_arrow),
+ GTK_ARROW_UP, GTK_SHADOW_OUT);
+
gtk_window_move(GTK_WINDOW(mainwin->window),
prefs_common.mainwin_x,
prefs_common.mainwin_y);
gtk_widget_set_sensitive(menuitem, ((type & SEPARATE_FOLDER) != 0));
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Show or hide/Message view");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- (type & SEPARATE_MESSAGE) == 0 ? TRUE :
- prefs_common.msgview_visible);
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem),
+ messageview_is_visible(mainwin->messageview));
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Separate folder tree");