diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/mainwindow.c | 12 | ||||
| -rw-r--r-- | src/mainwindow.h | 8 |
4 files changed, 19 insertions, 10 deletions
@@ -1,5 +1,9 @@ 2006-02-01 + * src/mainwindow.[ch]: disable Send button if no account exist. + +2006-02-01 + * libsylph/prefs_common.c: modified the default of summaryview_height. 2006-02-01 diff --git a/ChangeLog.ja b/ChangeLog.ja index 06899e0f..da46e4b7 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,10 @@ 2006-02-01 + * src/mainwindow.[ch]: アカウントが存在しない場合は送信ボタンを無効に + するようにした。 + +2006-02-01 + * libsylph/prefs_common.c: summaryview_height の既定値を変更。 2006-02-01 diff --git a/src/mainwindow.c b/src/mainwindow.c index f78fb06e..62552353 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1828,7 +1828,7 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin) struct { GtkWidget *widget; SensitiveCond cond; - } entry[13]; + } entry[14]; #define SET_WIDGET_COND(w, c) \ { \ @@ -1839,6 +1839,7 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin) SET_WIDGET_COND(mainwin->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED); SET_WIDGET_COND(mainwin->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED); + SET_WIDGET_COND(mainwin->send_btn, M_HAVE_ACCOUNT|M_UNLOCKED); SET_WIDGET_COND(mainwin->compose_btn, M_HAVE_ACCOUNT); SET_WIDGET_COND(mainwin->reply_btn, M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST); @@ -1853,12 +1854,12 @@ void main_window_set_toolbar_sensitive(MainWindow *mainwin) SET_WIDGET_COND(mainwin->prefs_btn, M_UNLOCKED); SET_WIDGET_COND(mainwin->account_btn, M_UNLOCKED); #endif - SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST); SET_WIDGET_COND(mainwin->delete_btn, M_TARGET_EXIST|M_ALLOW_DELETE); SET_WIDGET_COND(mainwin->junk_btn, M_TARGET_EXIST|M_ALLOW_DELETE|M_ENABLE_JUNK); SET_WIDGET_COND(mainwin->exec_btn, M_MSG_EXIST|M_EXEC); + SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST); SET_WIDGET_COND(NULL, 0); #undef SET_WIDGET_COND @@ -1934,6 +1935,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) , M_HAVE_ACCOUNT|M_UNLOCKED}, {"/Message/Receive/Cancel receiving" , M_INC_ACTIVE}, + {"/Message/Send queued messages" , M_HAVE_ACCOUNT|M_UNLOCKED}, {"/Message/Compose new message" , M_HAVE_ACCOUNT}, {"/Message/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST}, @@ -2307,10 +2309,10 @@ static GtkWidget *main_window_toolbar_create(MainWindow *mainwin) GtkWidget *prefs_btn; GtkWidget *account_btn; #endif - GtkWidget *next_btn; GtkWidget *delete_btn; GtkWidget *junk_btn; GtkWidget *exec_btn; + GtkWidget *next_btn; gint n_entries; @@ -2472,21 +2474,21 @@ static GtkWidget *main_window_toolbar_create(MainWindow *mainwin) mainwin->get_btn = get_btn; mainwin->getall_btn = getall_btn; + mainwin->send_btn = send_btn; mainwin->compose_btn = compose_btn; mainwin->reply_btn = reply_btn; mainwin->reply_combo = reply_combo; mainwin->replyall_btn = replyall_btn; mainwin->fwd_btn = fwd_btn; mainwin->fwd_combo = fwd_combo; - mainwin->send_btn = send_btn; #if 0 mainwin->prefs_btn = prefs_btn; mainwin->account_btn = account_btn; #endif - mainwin->next_btn = next_btn; mainwin->delete_btn = delete_btn; mainwin->junk_btn = junk_btn; mainwin->exec_btn = exec_btn; + mainwin->next_btn = next_btn; gtk_widget_show_all(toolbar); diff --git a/src/mainwindow.h b/src/mainwindow.h index e125b963..376d28d2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -77,19 +77,17 @@ struct _MainWindow GtkWidget *toolbar; GtkWidget *get_btn; GtkWidget *getall_btn; + GtkWidget *send_btn; GtkWidget *compose_btn; GtkWidget *reply_btn; ComboButton *reply_combo; GtkWidget *replyall_btn; GtkWidget *fwd_btn; ComboButton *fwd_combo; - GtkWidget *send_btn; - GtkWidget *prefs_btn; - GtkWidget *account_btn; - GtkWidget *next_btn; GtkWidget *delete_btn; GtkWidget *junk_btn; GtkWidget *exec_btn; + GtkWidget *next_btn; /* body */ GtkWidget *vbox_body; |