remove selective download

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index b290f4141a09d42e3606dfa3e150d230ae9b6897..c0f41d27c5128cb5849c53422873ba84a53dfb3e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -80,11 +80,12 @@
 #include "about.h"
 #include "manual.h"
 #include "version.h"
-#include "selective_download.h"
 #include "ssl_manager.h"
 #include "sslcertwindow.h"
 #include "prefs_gtk.h"
 #include "pluginwindow.h"
+#include "hooks.h"
+#include "progressindicator.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -400,6 +401,8 @@ static gboolean mainwindow_focus_in_event   (GtkWidget      *widget,
 void main_window_reply_cb                      (MainWindow     *mainwin, 
                                                 guint           action,
                                                 GtkWidget      *widget);
+gboolean mainwindow_progressindicator_hook     (gpointer        source,
+                                                gpointer        userdata);
 #define  SEPARATE_ACTION 500 
 
 static GtkItemFactoryEntry mainwin_entries[] =
@@ -634,8 +637,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tools"),                         NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Selective download..."),  "<alt>S", sel_download_cb, 0, NULL},
-       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
@@ -1009,6 +1010,9 @@ MainWindow *main_window_create(SeparateType type)
        mainwin->menu_lock_count = 0;
        mainwin->cursor_count = 0;
 
+       mainwin->progressindicator_hook =
+               hooks_register_hook(PROGRESSINDICATOR_HOOKLIST, mainwindow_progressindicator_hook, mainwin);
+
        if (!watch_cursor)
                watch_cursor = gdk_cursor_new(GDK_WATCH);
 
@@ -1385,13 +1389,12 @@ void main_window_add_mailbox(MainWindow *mainwin)
                g_free(path);
                return;
        }
-       if (!strcmp(path, "Mail"))
-               folder = folder_new(F_MH, _("Mailbox"), path);
-       else
-               folder = folder_new(F_MH, g_basename(path), path);
+       folder = folder_new(folder_get_class_from_string("mh"), 
+                           !strcmp(path, "Mail") ? _("Mailbox") : g_basename(path),
+                           path);
        g_free(path);
 
-       if (folder->create_tree(folder) < 0) {
+       if (folder->class->create_tree(folder) < 0) {
                alertpanel_error(_("Creation of the mailbox failed.\n"
                                   "Maybe some files already exist, or you don't have the permission to write there."));
                folder_destroy(folder);
@@ -1424,16 +1427,11 @@ void main_window_add_mbox(MainWindow *mainwin)
                return;
        }
 
-       /*
-       if (!strcmp(path, "Mail"))
-               folder = folder_new(F_MBOX, _("Mailbox"), path);
-               else
-       */
-
-       folder = folder_new(F_MBOX, g_basename(path), path);
+       folder = folder_new(folder_get_class_from_string("mbox"), 
+                           g_basename(path), path);
        g_free(path);
 
-       if (folder->create_tree(folder) < 0) {
+       if (folder->class->create_tree(folder) < 0) {
                alertpanel_error(_("Creation of the mailbox failed."));
                folder_destroy(folder);
                return;
@@ -1490,7 +1488,7 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (selection == SUMMARY_SELECTED_SINGLE)
                state |= M_SINGLE_TARGET_EXIST;
        if (mainwin->summaryview->folder_item &&
-           mainwin->summaryview->folder_item->folder->type == F_NEWS)
+           mainwin->summaryview->folder_item->folder->class->type == F_NEWS)
                state |= M_NEWS;
        else
                state |= M_NOT_NEWS;
@@ -1582,7 +1580,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
 
-               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
                {"/Tools/Harvest addresses"         , M_UNLOCKED},
                {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
@@ -2155,9 +2152,21 @@ static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
 void main_window_reply_cb(MainWindow *mainwin, guint action,
                          GtkWidget *widget)
 {
-       toolbar_menu_reply(TOOLBAR_MAIN, mainwin, action);
+       MessageView *msgview = (MessageView*)mainwin->messageview;
+       GSList *msginfo_list = NULL;
+       gchar *body;
+
+       g_return_if_fail(msgview != NULL);
+
+       msginfo_list = summary_get_selection(mainwin->summaryview);
+       g_return_if_fail(msginfo_list != NULL);
+       
+       body = messageview_get_selection(msgview);
+       compose_reply_mode((ComposeMode)action, msginfo_list, body);
+       g_free(body);
+       g_slist_free(msginfo_list);
 }
-/* END Toolbar Stuff */
+
 
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
@@ -2243,12 +2252,6 @@ static void log_window_show_cb(MainWindow *mainwin, guint action,
        log_window_show(mainwin->logwin);
 }
 
-static void sel_download_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
-{
-       selective_download(mainwin);
-}
-
 static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
@@ -2727,6 +2730,25 @@ MainWindow *mainwindow_get_mainwindow(void)
                return NULL;
 }
 
+gboolean mainwindow_progressindicator_hook(gpointer source, gpointer userdata)
+{
+       ProgressData *data = (ProgressData *) source;
+       MainWindow *mainwin = (MainWindow *) userdata;
+
+       switch (data->cmd) {
+       case PROGRESS_COMMAND_START:
+       case PROGRESS_COMMAND_STOP:
+               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), 0.0);
+               break;
+       case PROGRESS_COMMAND_SET_PERCENTAGE:
+               gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), data->value);
+               break;          
+       }
+       while (gtk_events_pending()) gtk_main_iteration ();
+
+       return FALSE;
+}
+
 /*
 * End of Source.
 */