diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-10-13 06:52:32 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-10-13 06:52:32 +0000 |
| commit | 2ebd418a6e4f86de03434eb357cc577a4e366f5d (patch) | |
| tree | 4056c2cada932de2d85bff51a1590f3591fe5d7d /src | |
| parent | 755b86e1dae724503a13187cde93e8f55114b3d6 (diff) | |
enabled the property of the top folder.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@641 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
| -rw-r--r-- | src/folderview.c | 4 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 5 | ||||
| -rw-r--r-- | src/prefs_folder_item.c | 19 |
3 files changed, 19 insertions, 9 deletions
diff --git a/src/folderview.c b/src/folderview.c index 2e4abfba..4cb0ceb8 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1486,12 +1486,10 @@ static gboolean folderview_menu_popup(FolderView *folderview, if (folderview->mainwin->lock_count == 0) { new_folder = TRUE; + folder_property = TRUE; if (item->parent == NULL) { update_tree = remove_tree = TRUE; - if (folder->account) - folder_property = TRUE; } else { - folder_property = TRUE; if (gtkut_tree_row_reference_equal(folderview->selected, folderview->opened)) search_folder = TRUE; diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index e48473a7..37fae722 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -2881,10 +2881,7 @@ static void prefs_keybind_select(void) hbox1 = gtk_hbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0); - label = gtk_label_new - (_("Select the preset of key bindings.\n" - "You can also modify each menu's shortcuts by pressing\n" - "any key(s) when placing the mouse pointer on the item.")); + label = gtk_label_new(_("Select the preset of key bindings.")); gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index fefb827c..e14767ba 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -248,6 +248,11 @@ static void prefs_folder_item_general_create(PrefsFolderItemDialog *dialog) PACK_CHECK_BUTTON(vbox2, trim_compose_subj_chkbtn, _("Delete [...] or (...) at the beginning of subject on reply")); + if (!dialog->item->parent) { + gtk_widget_set_sensitive(optmenu, FALSE); + gtk_widget_set_sensitive(vbox2, FALSE); + } + dialog->name_entry = name_entry; dialog->id_label = id_label; dialog->path_label = path_label; @@ -379,6 +384,11 @@ static void prefs_folder_item_compose_create(PrefsFolderItemDialog *dialog) GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + if (!dialog->item->parent) { + gtk_widget_set_sensitive(frame, FALSE); + gtk_widget_set_sensitive(ac_apply_sub_chkbtn, FALSE); + } + dialog->account_optmenu = optmenu; dialog->ac_apply_sub_chkbtn = ac_apply_sub_chkbtn; dialog->to_entry = to_entry; @@ -574,8 +584,13 @@ static void prefs_folder_item_apply_cb(GtkWidget *widget, else item->account = NULL; - item->ac_apply_sub = gtk_toggle_button_get_active - (GTK_TOGGLE_BUTTON(dialog->ac_apply_sub_chkbtn)); + if (!item->parent && item->account) + item->ac_apply_sub = TRUE; + else if (item->account) + item->ac_apply_sub = gtk_toggle_button_get_active + (GTK_TOGGLE_BUTTON(dialog->ac_apply_sub_chkbtn)); + else + item->ac_apply_sub = FALSE; SET_DATA_FROM_ENTRY(to_entry, auto_to); item->use_auto_to_on_reply = gtk_toggle_button_get_active |