projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2007-09-18 [colin] 3.0.1cvs4
[claws.git] / src / toolbar.c
diff --git a/src/toolbar.c b/src/toolbar.c
index 8079c46f1cf284df0d215e435c00e4407340bd42..7e575c1ab1d565d5552a66141bede6a4e5a1bf51 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -127,6 +127,9 @@ static void toolbar_next_unread_cb          (GtkWidget      *widget,
 static void toolbar_ignore_thread_cb           (GtkWidget      *widget,
                                                 gpointer        data);
 
+static void toolbar_watch_thread_cb            (GtkWidget      *widget,
+                                                gpointer        data);
+
 static void toolbar_print_cb                   (GtkWidget      *widget,
                                                 gpointer        data);
 
@@ -186,6 +189,7 @@ struct {
        { "A_GOTO_PREV",        N_("Go to Previous Unread Message")        },
        { "A_GOTO_NEXT",        N_("Go to Next Unread Message")            },
        { "A_IGNORE_THREAD",    N_("Ignore thread")                        },
+       { "A_WATCH_THREAD",     N_("Watch thread")                         },
        { "A_PRINT",            N_("Print")                                },
        { "A_LEARN_SPAM",       N_("Learn Spam or Ham")                    },
        { "A_GO_FOLDERS",       N_("Open folder/Go to folder list")        },
@@ -324,7 +328,7 @@ GList *toolbar_get_action_items(ToolbarType source)
                                        A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, 
                                        A_REPLY_ALL,     A_REPLY_ML,      A_OPEN_MAIL,  A_FORWARD, 
                                        A_TRASH , A_DELETE_REAL,       A_EXECUTE,       A_GOTO_PREV, 
-                                       A_GOTO_NEXT,    A_IGNORE_THREAD,  A_PRINT,
+                                       A_GOTO_NEXT,    A_IGNORE_THREAD,  A_WATCH_THREAD,       A_PRINT,
                                        A_ADDRBOOK,     A_LEARN_SPAM, A_GO_FOLDERS, 
                                        A_SYL_ACTIONS, A_CANCEL_INC };
 
@@ -407,7 +411,8 @@ static void toolbar_set_default_main(void)
                gchar *text;
        } default_toolbar[] = {
 #ifdef MAEMO
-               { A_GO_FOLDERS,    STOCK_PIXMAP_GO_FOLDERS,             _("Folders") },
+               { A_GO_FOLDERS,    STOCK_PIXMAP_GO_FOLDERS,           _("Folders") },
+               { A_OPEN_MAIL,     STOCK_PIXMAP_OPEN_MAIL,            _("Open")    },           
                { A_SEPARATOR,     0,                                 ("")         }, 
 #endif
                { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get Mail")},
@@ -416,9 +421,6 @@ static void toolbar_set_default_main(void)
                { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,
                        (gchar*)Q_("Toolbar|Compose") },
                { A_SEPARATOR,     0,                                 ("")         },
-#ifdef MAEMO
-               { A_OPEN_MAIL,     STOCK_PIXMAP_OPEN_MAIL,            _("Open")    },
-#endif
                { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY,           _("Reply")   }, 
 #ifndef MAEMO
                { A_REPLY_ALL,     STOCK_PIXMAP_MAIL_REPLY_TO_ALL,    _("All")     },
@@ -470,6 +472,10 @@ static void toolbar_set_default_compose(void)
                gint icon;
                gchar *text;
        } default_toolbar[] = {
+#ifdef MAEMO
+               { A_CLOSE,              STOCK_PIXMAP_CLOSE,             _("Close")              },
+               { A_SEPARATOR,          0,                               ("")                   }, 
+#endif
                { A_SEND,               STOCK_PIXMAP_MAIL_SEND,         _("Send")               },
                { A_SENDL,              STOCK_PIXMAP_MAIL_SEND_QUEUE,   _("Send later")         },
                { A_DRAFT,              STOCK_PIXMAP_MAIL,              _("Draft")              },
@@ -480,11 +486,6 @@ static void toolbar_set_default_compose(void)
                { A_ATTACH,             STOCK_PIXMAP_MAIL_ATTACH,       _("Attach")             },
                { A_SEPARATOR,          0,                               ("")                   },
                { A_ADDRBOOK,           STOCK_PIXMAP_ADDRESS_BOOK,      _("Address")            }
-#ifdef MAEMO
-               ,
-               { A_SEPARATOR,          0,                               ("")                   }, 
-               { A_CLOSE,              STOCK_PIXMAP_CLOSE,             _("Close")              }
-#endif
        };
        
        gint i;
@@ -521,6 +522,10 @@ static void toolbar_set_default_msgview(void)
                gint icon;
                gchar *text;
        } default_toolbar[] = {
+#ifdef MAEMO
+               { A_CLOSE,              STOCK_PIXMAP_CLOSE,             _("Close") },
+               { A_SEPARATOR,          0,                               ("")      }, 
+#endif
                { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY,           _("Reply")   }, 
                { A_REPLY_ALL,     STOCK_PIXMAP_MAIL_REPLY_TO_ALL,    _("All")     },
                { A_REPLY_SENDER,  STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender")  },
@@ -533,11 +538,6 @@ static void toolbar_set_default_msgview(void)
 #endif
 #endif
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
-#ifdef MAEMO
-               ,
-               { A_SEPARATOR,          0,                               ("")      }, 
-               { A_CLOSE,              STOCK_PIXMAP_CLOSE,             _("Close") }
-#endif
        };
        
        gint i;
@@ -1325,6 +1325,28 @@ static void toolbar_ignore_thread_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       g_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_toggle_watch_thread(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
 static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
@@ -1560,6 +1582,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                { A_GOTO_PREV,          toolbar_prev_unread_cb          },
                { A_GOTO_NEXT,          toolbar_next_unread_cb          },
                { A_IGNORE_THREAD,      toolbar_ignore_thread_cb        },
+               { A_WATCH_THREAD,       toolbar_watch_thread_cb         },
                { A_PRINT,              toolbar_print_cb                },
                { A_LEARN_SPAM,         toolbar_learn_cb                },
                { A_GO_FOLDERS,         toolbar_go_folders_cb           },
@@ -1620,8 +1643,10 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
+       g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
+       g_list_free(gchild);                                                                            \
 }
 
 #define MAKE_MENU(entries,path,btn) {                                                                  \
@@ -1971,6 +1996,7 @@ void toolbar_update(ToolbarType type, gpointer data)
        Compose    *compose = (Compose*)data;
        MessageView *msgview = (MessageView*)data;
 
+#ifndef MAEMO
        switch(type) {
        case TOOLBAR_MAIN:
                toolbar_data = mainwin->toolbar;
@@ -1993,6 +2019,30 @@ void toolbar_update(ToolbarType type, gpointer data)
 
        toolbar_init(toolbar_data);
        toolbar_data = toolbar_create(type, handlebox, data);
+#else
+       switch(type) {
+       case TOOLBAR_MAIN:
+               toolbar_data = mainwin->toolbar;
+               handlebox    = mainwin->window;
+               break;
+       case TOOLBAR_COMPOSE:
+               toolbar_data = compose->toolbar;
+               handlebox    = compose->window;
+               break;
+       case TOOLBAR_MSGVIEW:
+               toolbar_data = msgview->toolbar;
+               handlebox    = msgview->window;
+               break;
+       default:
+               return;
+       }
+
+       hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_WIDGET(toolbar_data->toolbar));
+
+       toolbar_init(toolbar_data);
+       toolbar_data = toolbar_create(type, handlebox, data);
+#endif
+
        switch(type) {
        case TOOLBAR_MAIN:
                mainwin->toolbar = toolbar_data;
@@ -2025,6 +2075,7 @@ void toolbar_update(ToolbarType type, gpointer data)
                GtkWidget *btn = (GtkWidget *)gchild->data;     \
                GtkWidget *arr = (GtkWidget *)                  \
                        (gchild->next?gchild->next->data:NULL); \
+               g_list_free(gchild);                            \
                if (GTK_IS_BUTTON(btn))                         \
                        in_btn1 = GTK_BUTTON(btn)->in_button;   \
                if (GTK_IS_BUTTON(arr))                         \
@@ -2047,6 +2098,7 @@ void toolbar_update(ToolbarType type, gpointer data)
                GtkWidget *btn = (GtkWidget *)gchild->data;     \
                GtkWidget *arr = (GtkWidget *)                  \
                        (gchild->next?gchild->next->data:NULL); \
+               g_list_free(gchild);                            \
                if (GTK_IS_BUTTON(btn))                         \
                        GTK_BUTTON(btn)->in_button = in_btn1;   \
                if (GTK_IS_BUTTON(arr))                         \
@@ -2373,11 +2425,9 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
                        alertpanel_error_log(_("Some errors occurred while "
                                           "sending queued messages."));
                else {
-                       gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                       alertpanel_error_log(_("Some errors occurred "
                                        "while sending queued messages:\n%s"), errstr);
                        g_free(errstr);
-                       alertpanel_error_log(tmp);
-                       g_free(tmp);
                }
        }
 }
Claws Mail