online, offline and quicksearch pixmaps follow theme changes

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 002ada614c1a0af2ed5f4f1890e5805eedadfa02..719aeec784f9097f94436cecec940e619949181b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-09-29 [colin]     0.8.3claws37
+
+       * src/mainwindow.[ch]
+               online/offline status pixmaps follow theme
+               changes
+       * src/summaryview.[ch]
+               quicksearch pixmap follows theme changes
+

 2002-09-29 [thorsten]  0.8.3claws36
 
        * src/compose.c
 2002-09-29 [thorsten]  0.8.3claws36
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 7ae62a247d597cba6c98158df410bb6ff8a0f395..38c1ad9cb53e38b6c81aee7b99a158bd928de179 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws36
+EXTRA_VERSION=claws37

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mainwindow.c b/src/mainwindow.c
index aa314ace52afe275d0de785bad4cbdac7a19014f..6cb5961db153ae1adf8c5d3307b886f0d337f540 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -860,8 +860,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
        GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;

-       GtkWidget *online_status;
-       GtkWidget *offline_status;
+       GtkWidget *online_pixmap;
+       GtkWidget *offline_pixmap;

        GtkWidget *online_switch;
        GtkWidget *offline_switch;
 
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
 


@@ -945,15 +945,15 @@ MainWindow *main_window_create(SeparateType type)
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 
        gtk_widget_set_usize(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
 

-       online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
-       offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+       online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+       offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);

        online_switch = gtk_button_new ();
        offline_switch = gtk_button_new ();
        online_switch = gtk_button_new ();
        offline_switch = gtk_button_new ();

-       gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+       gtk_container_add (GTK_CONTAINER(online_switch), online_pixmap);

        gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
        gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);

-       gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+       gtk_container_add (GTK_CONTAINER(offline_switch), offline_pixmap);

        gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
        gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
        gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
        gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);


@@ -1005,6 +1005,8 @@ MainWindow *main_window_create(SeparateType type)
        
        mainwin->online_switch     = online_switch;
        mainwin->offline_switch    = offline_switch;
        
        mainwin->online_switch     = online_switch;
        mainwin->offline_switch    = offline_switch;

+       mainwin->online_pixmap     = online_pixmap;
+       mainwin->offline_pixmap    = offline_pixmap;

        
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
        
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id


@@ -1193,6 +1195,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 {
        GList *cur;
        MainWindow *mainwin;
 {
        GList *cur;
        MainWindow *mainwin;

+       GtkWidget *pixmap;

 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
 
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;


@@ -1207,6 +1210,19 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                        set_toolbar_style(mainwin);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
                        set_toolbar_style(mainwin);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);

+
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
+                                            mainwin->online_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->online_pixmap = pixmap;
+                       pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+                       gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch), 
+                                            mainwin->offline_pixmap);
+                       gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
+                       gtk_widget_show(pixmap);
+                       mainwin->offline_pixmap = pixmap;

                }
                
                summary_redisplay_msg(mainwin->summaryview);
                }
                
                summary_redisplay_msg(mainwin->summaryview);

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 34711de082f0e796484df0b2b835a2b9f463ab4f..7bc9e890790a235ef1c6a75a025d8842ef3e7b99 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -114,6 +114,8 @@ struct _MainWindow
        GtkWidget *ac_menu;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;
        GtkWidget *ac_menu;
        GtkWidget *online_switch;
        GtkWidget *offline_switch;

+       GtkWidget *online_pixmap;
+       GtkWidget *offline_pixmap;

 
        /* context IDs for status bar */
        gint mainwin_cid;
 
        /* context IDs for status bar */
        gint mainwin_cid;

diff --git a/src/summaryview.c b/src/summaryview.c
index 9d6967feab50661bc18638d01848f2b0d03efa1d..753b3bdc7ff1a25d5ec9ba48eea315add6236b70 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -687,6 +687,7 @@ void summary_init(SummaryView *summaryview)
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
        gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
        gtk_widget_show(pixmap);
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
        gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
        gtk_widget_show(pixmap);

+       summaryview->quick_search_pixmap = pixmap;

        
        /* Init summaryview prefs */
        summaryview->sort_key = SORT_BY_NONE;
        
        /* Init summaryview prefs */
        summaryview->sort_key = SORT_BY_NONE;


@@ -5237,6 +5238,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);

+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);

 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);


@@ -5244,6 +5246,13 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->folder_pixmap = pixmap; 
 
        gtk_widget_show(pixmap);
        summaryview->folder_pixmap = pixmap; 
 

+       pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+       gtk_container_remove (GTK_CONTAINER(summaryview->toggle_search), 
+                             summaryview->quick_search_pixmap);
+       gtk_container_add(GTK_CONTAINER(summaryview->toggle_search), pixmap);
+       gtk_widget_show(pixmap);
+       summaryview->quick_search_pixmap = pixmap;
+

        folderview_unselect(summaryview->folderview);
        folderview_select(summaryview->folderview, summaryview->folder_item);
 }
        folderview_unselect(summaryview->folderview);
        folderview_select(summaryview->folderview, summaryview->folder_item);
 }

diff --git a/src/summaryview.h b/src/summaryview.h
index 80aa929be6dba2bf0e2f2009ac51e31ca43a613c..a6a001d5eb590c987d073ba256a438d97c9d45d1 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -101,6 +101,7 @@ struct _SummaryView
        GtkWidget *toggle_eventbox;
        GtkWidget *toggle_arrow;
        GtkWidget *toggle_search;
        GtkWidget *toggle_eventbox;
        GtkWidget *toggle_arrow;
        GtkWidget *toggle_search;

+       GtkWidget *quick_search_pixmap;

        GtkWidget *popupmenu;
        GtkWidget *colorlabel_menu;
        GtkWidget *search_type_opt;
        GtkWidget *popupmenu;
        GtkWidget *colorlabel_menu;
        GtkWidget *search_type_opt;