2007-07-14 [colin] 2.10.0cvs25

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index fcd6c903e3c9529f866db6163dfba17a859d040e..49f10a15fefa29d5d72336264819765ad746d26f 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -407,7 +407,7 @@ static void toolbar_set_default_main(void)
                gchar *text;
        } default_toolbar[] = {
 #ifdef MAEMO
-               { A_GO_FOLDERS,    STOCK_PIXMAP_DIR_OPEN,             _("Folders") },
+               { A_GO_FOLDERS,    STOCK_PIXMAP_GO_FOLDERS,             _("Folders") },
                { A_SEPARATOR,     0,                                 ("")         }, 
 #endif
                { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get Mail")},
@@ -778,12 +778,14 @@ static void activate_compose_button (Toolbar           *toolbar,
 {
        if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
                return;
-
        gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
                        : toolbar->compose_news_btn);
-       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
+       gtk_widget_show_now(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
                        : toolbar->compose_mail_btn);
-       toolbar->compose_btn_type = type;       
+       toolbar->compose_btn_type = type;
+       gtk_widget_queue_resize(toolbar->toolbar);
+       gtk_widget_show_now(toolbar->toolbar);
+       GTK_EVENTS_FLUSH();
 }
 
 void toolbar_set_compose_button(Toolbar            *toolbar, 
@@ -804,9 +806,12 @@ static void activate_learn_button (Toolbar           *toolbar,
 
        gtk_widget_hide(type == LEARN_SPAM ? toolbar->learn_ham_btn 
                        : toolbar->learn_spam_btn);
-       gtk_widget_show(type == LEARN_SPAM ? toolbar->learn_spam_btn
+       gtk_widget_show_now(type == LEARN_SPAM ? toolbar->learn_spam_btn
                        : toolbar->learn_ham_btn);
        toolbar->learn_btn_type = type; 
+       gtk_widget_queue_resize(toolbar->toolbar);
+       gtk_widget_show_now(toolbar->toolbar);
+       GTK_EVENTS_FLUSH();
 }
 
 void toolbar_set_learn_button(Toolbar            *toolbar, 
@@ -1561,14 +1566,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        }
 }
 
-#ifndef MAEMO
-#define HOMOGENEOUS TRUE
-#else
-#define HOMOGENEOUS FALSE
-#endif
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
-       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
@@ -1580,7 +1580,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        GtkWidget *child = NULL, *btn = NULL, *arr = NULL;                                              \
        GList *gchild = NULL;                                                                           \
        item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text));                                        \
-       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                              \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
@@ -1893,10 +1893,22 @@ Toolbar *toolbar_create(ToolbarType      type,
        toolbar_data->toolbar = toolbar;
        gtk_widget_show_all(toolbar);
 
-       if (type == TOOLBAR_MAIN)
+       if (type == TOOLBAR_MAIN) {
+#ifdef MAEMO
+               MainWindow *mainwin = mainwindow_get_mainwindow();
+               GtkWidget *progressbar = gtk_progress_bar_new();
+               item = gtk_tool_item_new();
+               gtk_container_add (GTK_CONTAINER (item), progressbar);
+               gtk_widget_show(item);
+               gtk_widget_show(progressbar);
+               gtk_widget_set_size_request(progressbar, 70, -1);
+               gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+               mainwin->progressbar = progressbar;
+#endif
                activate_compose_button(toolbar_data, 
                                        prefs_common.toolbar_style, 
                                        toolbar_data->compose_btn_type);
+       }
        if (type != TOOLBAR_COMPOSE)
                activate_learn_button(toolbar_data, prefs_common.toolbar_style,
                                LEARN_SPAM);