From: Melvin Hadasht Date: Sun, 17 Mar 2002 00:14:34 +0000 (+0000) Subject: Actions: X-Git-Tag: rel_0_7_5~123 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=36faf59d0d8f10a5c6e34a0ea37c04c557c7dc47 Actions: Moved "Edit/Actions" to "Tool/Actions" Made mainwindow/compose window sensitive as soon as no child process is running anymore even if the io dialog is open. Fixed a struct being initialized with a non constant char* --- diff --git a/ChangeLog.claws b/ChangeLog.claws index 942eef466..3fa424788 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,14 @@ +2002-03-16 [melvin] 0.7.4claws16 + + * src/mainwindow.c + * src/compose.c + * src/prefs_actions.c + Moved "Edit/Actions" to "Tool/Actions" + Made mainwindow/compose window sensitive as soon as + no child process is running anymore even if the io dialog + is open. + Fixed a struct being initialized with a non constant char* + 2002-03-16 [christoph] 0.7.4claws15 * configure.in diff --git a/configure.in b/configure.in index 8f310da96..63c34e565 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=7 MICRO_VERSION=4 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws14 +EXTRA_VERSION=claws16 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/compose.c b/src/compose.c index 3333d5c3a..309891608 100644 --- a/src/compose.c +++ b/src/compose.c @@ -568,8 +568,6 @@ static GtkItemFactoryEntry compose_entries[] = "L", compose_wrap_line_all, 0, NULL}, {N_("/_Edit/Edit with e_xternal editor"), "X", compose_ext_editor_cb, 0, NULL}, - {N_("/_Edit/---"), NULL, NULL, 0, ""}, - {N_("/_Edit/Actio_ns"), NULL, NULL, 0, ""}, #if USE_PSPELL {N_("/_Spelling"), NULL, NULL, 0, ""}, {N_("/_Spelling/_Check all or check selection"), @@ -629,6 +627,7 @@ static GtkItemFactoryEntry compose_entries[] = {N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, ""}, {N_("/_Tool/_Address book"), "A", compose_address_cb , 0, NULL}, {N_("/_Tool/_Template"), NULL, NULL, 0, ""}, + {N_("/_Tool/Actio_ns"), NULL, NULL, 0, ""}, {N_("/_Help"), NULL, NULL, 0, ""}, {N_("/_Help/_About"), NULL, about_show, 0, NULL} }; @@ -4472,7 +4471,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) } #endif - update_compose_actions_menu(ifactory, "/Edit/Actions", compose); + update_compose_actions_menu(ifactory, "/Tool/Actions", compose); undostruct = undo_init(text); diff --git a/src/mainwindow.c b/src/mainwindow.c index 2fcaddb32..13ce95be8 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -492,9 +492,6 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Edit/_Find in current message..."), "F", search_cb, 0, NULL}, {N_("/_Edit/_Search folder..."), "F", search_cb, 1, NULL}, - {N_("/_Edit/---"), NULL, NULL, 0, ""}, - {N_("/_Edit/Actio_ns"), NULL, NULL, 0, ""}, - {N_("/_View"), NULL, NULL, 0, ""}, {N_("/_View/Separate _Folder Tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, ""}, {N_("/_View/Separate _Message View"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, ""}, @@ -686,6 +683,8 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Tool/_Create filter rule/by _Subject"), NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL}, {N_("/_Tool/---"), NULL, NULL, 0, ""}, + {N_("/_Tool/Actio_ns"), NULL, NULL, 0, ""}, + {N_("/_Tool/---"), NULL, NULL, 0, ""}, {N_("/_Tool/E_xecute"), "X", execute_summary_cb, 0, NULL}, {N_("/_Tool/---"), NULL, NULL, 0, ""}, {N_("/_Tool/_Log window"), "L", log_window_show_cb, 0, NULL}, @@ -1559,7 +1558,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) /* {"/File/Close", M_UNLOCKED}, */ {"/File/Exit" , M_UNLOCKED}, - {"/Edit/Actions" , M_MSG_EXIST}, {"/Edit/Select thread" , M_SINGLE_TARGET_EXIST}, {"/View/Sort" , M_MSG_EXIST}, {"/View/Thread view" , M_EXEC}, @@ -1597,7 +1595,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) {"/Tool/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED}, {"/Tool/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED}, {"/Tool/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED}, - + {"/Tool/Actions" , M_MSG_EXIST}, {"/Configuration", M_UNLOCKED}, {NULL, 0} diff --git a/src/prefs_actions.c b/src/prefs_actions.c index 4c39766ac..7b4a1d56f 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.c @@ -888,7 +888,7 @@ static void prefs_actions_ok (GtkWidget *widget, gpointer data) void update_mainwin_actions_menu(GtkItemFactory *ifactory, MainWindow *mainwin) { - update_actions_menu(ifactory, "/Edit/Actions", + update_actions_menu(ifactory, "/Tool/Actions", mainwin_actions_execute_cb, mainwin); } @@ -914,8 +914,10 @@ static void update_actions_menu(GtkItemFactory *ifactory, GtkWidget *menu; GtkItemFactoryEntry ifentry = { - branch_path, NULL, NULL, 0, ""}; + NULL, NULL, NULL, 0, ""}; + ifentry.path = branch_path; menuitem = gtk_item_factory_get_item(ifactory, branch_path); + g_return_if_fail(menuitem); /* FIXME: is there a better way to remove unknown submenu items? */ /* Deleting and recreating the parent looses the translation */ menu = GTK_WIDGET(GTK_MENU_ITEM(menuitem)->submenu); @@ -1435,6 +1437,7 @@ static void update_io_dialog(Children *children) if (!children->nb) { gtk_widget_set_sensitive(children->abort_btn, FALSE); gtk_widget_set_sensitive(children->hide_btn, TRUE); + gtk_widget_set_sensitive(children->window, TRUE); if (children->input_hbox) gtk_widget_set_sensitive(children->input_hbox, FALSE); }