2007-07-27 [paul] 2.10.0cvs74

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 326255d68d7d26c6774bd4ab122e26f1da7a5b60..5b8b1ff4175b7918bc2c8149e2361ed1a5cd08e4 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 };
 
@@ -783,11 +787,15 @@ static void activate_compose_button (Toolbar           *toolbar,
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_news_icon);
+               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
+                       _("Compose News message"), NULL);       
                gtk_widget_show(toolbar->compose_news_icon);
        } else {
                gtk_tool_button_set_icon_widget(
                        GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
                        toolbar->compose_mail_icon);
+               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
+                       _("Compose Email"), NULL);      
                gtk_widget_show(toolbar->compose_mail_icon);
        }
        toolbar->compose_btn_type = type;
@@ -815,7 +823,9 @@ static void activate_learn_button (Toolbar           *toolbar,
                        toolbar->learn_spam_icon);
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
-                       _("Learn Spam"));
+                       _("Spam"));
+               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
+                       _("Learn spam"), NULL); 
                gtk_widget_show(toolbar->learn_spam_icon);
        } else {
                gtk_tool_button_set_icon_widget(
@@ -823,7 +833,9 @@ static void activate_learn_button (Toolbar           *toolbar,
                        toolbar->learn_ham_icon);
                gtk_tool_button_set_label(
                        GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
-                       _("Learn Ham"));
+                       _("Ham"));
+               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
+                       _("Learn ham"), NULL);  
                gtk_widget_show(toolbar->learn_ham_icon);
        }
        toolbar->learn_btn_type = type; 
@@ -1317,6 +1329,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;
@@ -1552,6 +1586,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           },
@@ -1734,7 +1769,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        break;
                case A_LEARN_SPAM:
                        TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
-                               _("Learn Spam"),
+                               _("Spam"),
                                _("Learn as..."));
                        toolbar_data->learn_spam_btn = item; 
                        toolbar_data->learn_spam_icon = icon_wid; 
@@ -1908,6 +1943,7 @@ Toolbar *toolbar_create(ToolbarType        type,
 
        }
        toolbar_data->toolbar = toolbar;
+       toolbar_data->tooltips = toolbar_tips;
        gtk_widget_show_all(toolbar);
 
        if (type == TOOLBAR_MAIN) {
@@ -1962,6 +1998,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;
@@ -1984,6 +2021,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;