aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/mainwindow.c3
-rw-r--r--src/summaryview.c3
4 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd46b36e..d8dfe0e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-10
+ * src/summaryview.c
+ src/mainwindow.c: repositioned the "Delete" menu and added a
+ separator to prevent accidental selection.
+
+2006-01-10
+
* libsylph/virtual.c
libsylph/defs.h
src/prefs_search_folder.c: implemented the modification of search
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cd0ea3db..33eb53b7 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2006-01-10
+ * src/summaryview.c
+ src/mainwindow.c: 誤って選択するのを防ぐため、「削除」メニューを
+ 再配置し、セパレータを追加。
+
+2006-01-10
+
* libsylph/virtual.c
libsylph/defs.h
src/prefs_search_folder.c: 検索フォルダの条件の編集を実装。
diff --git a/src/mainwindow.c b/src/mainwindow.c
index e811f4b9..d9d8a1db 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -708,7 +708,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/M_ove..."), "<control>O", move_to_cb, 0, NULL},
{N_("/_Message/_Copy..."), "<shift><control>O", copy_to_cb, 0, NULL},
- {N_("/_Message/_Delete"), "<control>D", delete_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Mark/_Mark"), "<shift>asterisk", mark_cb, 0, NULL},
@@ -719,6 +718,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
NULL, mark_as_read_cb, 0, NULL},
{N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Delete"), "<control>D", delete_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Set as _junk mail"), "<control>J", junk_cb, 0, NULL},
{N_("/_Message/Set as not j_unk mail"), "<shift><control>J", junk_cb, 1, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
diff --git a/src/summaryview.c b/src/summaryview.c
index 9bc86a14..a0f4f5e7 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -403,7 +403,6 @@ static GtkItemFactoryEntry summary_popup_entries[] =
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
{N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
- {N_("/_Delete"), NULL, summary_delete, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
@@ -415,6 +414,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
{N_("/_Mark/Mark all _read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Delete"), NULL, summary_delete, 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..."),