From f4920f040bf6481acdc62644ae4219c682a82ad0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 29 Sep 2002 21:46:05 +0000 Subject: [PATCH] online, offline and quicksearch pixmaps follow theme changes --- ChangeLog.claws | 8 ++++++++ configure.in | 2 +- src/mainwindow.c | 28 ++++++++++++++++++++++------ src/mainwindow.h | 2 ++ src/summaryview.c | 9 +++++++++ src/summaryview.h | 1 + 6 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 002ada614..719aeec78 100644 --- 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 diff --git a/configure.in b/configure.in index 7ae62a247..38c1ad9cb 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ MINOR_VERSION=8 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 diff --git a/src/mainwindow.c b/src/mainwindow.c index aa314ace5..6cb5961db 100644 --- 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 *online_status; - GtkWidget *offline_status; + GtkWidget *online_pixmap; + GtkWidget *offline_pixmap; 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); - 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 (); - 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_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); @@ -1005,6 +1005,8 @@ MainWindow *main_window_create(SeparateType type) 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 @@ -1193,6 +1195,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed) { GList *cur; MainWindow *mainwin; + GtkWidget *pixmap; 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); + + 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); diff --git a/src/mainwindow.h b/src/mainwindow.h index 34711de08..7bc9e8907 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -114,6 +114,8 @@ struct _MainWindow GtkWidget *ac_menu; GtkWidget *online_switch; GtkWidget *offline_switch; + GtkWidget *online_pixmap; + GtkWidget *offline_pixmap; /* context IDs for status bar */ gint mainwin_cid; diff --git a/src/summaryview.c b/src/summaryview.c index 9d6967fea..753b3bdc7 100644 --- 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); + summaryview->quick_search_pixmap = pixmap; /* 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_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); @@ -5244,6 +5246,13 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview) 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); } diff --git a/src/summaryview.h b/src/summaryview.h index 80aa929be..a6a001d5e 100644 --- a/src/summaryview.h +++ b/src/summaryview.h @@ -101,6 +101,7 @@ struct _SummaryView GtkWidget *toggle_eventbox; GtkWidget *toggle_arrow; GtkWidget *toggle_search; + GtkWidget *quick_search_pixmap; GtkWidget *popupmenu; GtkWidget *colorlabel_menu; GtkWidget *search_type_opt; -- 2.25.1