From b32c4323f3439dd70a19428f2a901afeec272e71 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 14 Jul 2007 13:30:51 +0000 Subject: [PATCH] 2007-07-14 [colin] 2.10.0cvs25 * src/mainwindow.c * src/toolbar.c Maemo: put the progress bar in the toolbar --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 8 +++++--- src/toolbar.c | 14 +++++++++++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f8e4b18d..ffcd15591 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-14 [colin] 2.10.0cvs25 + + * src/mainwindow.c + * src/toolbar.c + Maemo: put the progress bar in the + toolbar + 2007-07-14 [colin] 2.10.0cvs24 * src/prefs_common.c diff --git a/PATCHSETS b/PATCHSETS index e2e72bd64..b23b7d6c3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2678,3 +2678,4 @@ ( cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/toolbar.c; ) > 2.10.0cvs22.patchset ( cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/toolbar.c; ) > 2.10.0cvs23.patchset ( cvs diff -u -r 1.155.2.68 -r 1.155.2.69 src/Makefile.am; cvs diff -u -r 1.204.2.139 -r 1.204.2.140 src/prefs_common.c; cvs diff -u -r 1.25.2.40 -r 1.25.2.41 src/stock_pixmap.c; cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/stock_pixmap.h; cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/toolbar.c; diff -u /dev/null src/pixmaps/go_folders.xpm; ) > 2.10.0cvs24.patchset +( cvs diff -u -r 1.274.2.196 -r 1.274.2.197 src/mainwindow.c; cvs diff -u -r 1.43.2.73 -r 1.43.2.74 src/toolbar.c; ) > 2.10.0cvs25.patchset diff --git a/configure.ac b/configure.ac index ccd5b04c1..836312c98 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=24 +EXTRA_VERSION=25 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index 1c2e834ad..b4ff0a888 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1378,6 +1378,7 @@ MainWindow *main_window_create() } /* link window to mainwin->window to avoid gdk warnings */ mainwin->window = window; + mainwin_list = g_list_append(mainwin_list, mainwin); #ifdef MAEMO mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, @@ -1431,10 +1432,11 @@ MainWindow *main_window_create() statusbar = statusbar_create(); gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0); +#ifndef MAEMO progressbar = gtk_progress_bar_new(); gtk_widget_set_size_request(progressbar, 120, 1); gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0); - +#endif online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE); offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE); online_switch = gtk_button_new (); @@ -1522,7 +1524,9 @@ MainWindow *main_window_create() mainwin->vbox_body = vbox_body; mainwin->hbox_stat = hbox_stat; mainwin->statusbar = statusbar; +#ifndef MAEMO mainwin->progressbar = progressbar; +#endif mainwin->statuslabel = statuslabel; mainwin->online_switch = online_switch; mainwin->online_pixmap = online_pixmap; @@ -1682,8 +1686,6 @@ MainWindow *main_window_create() if (!hand_cursor) hand_cursor = gdk_cursor_new(GDK_HAND2); - mainwin_list = g_list_append(mainwin_list, mainwin); - /* init work_offline */ if (prefs_common.work_offline) online_switch_clicked (GTK_BUTTON(online_switch), mainwin); diff --git a/src/toolbar.c b/src/toolbar.c index ed9130bfd..49f10a15f 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -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); -- 2.25.1