/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
GtkWidget *statusbar_create(void)
{
GtkWidget *statusbar;
+ GtkWidget *child;
+ GtkWidget *parent;
+ GtkWidget *hbox;
statusbar = gtk_statusbar_new();
gtk_widget_set_size_request(statusbar, 1, -1);
statusbar_list = g_list_append(statusbar_list, statusbar);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar),
FALSE);
+#else
+ gtk_window_set_has_resize_grip(GTK_WINDOW(statusbar),
+ FALSE);
+#endif
gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
-
- g_object_ref(GTK_STATUSBAR(statusbar)->label);
- gtk_container_remove(GTK_CONTAINER(GTK_STATUSBAR(statusbar)->frame),
- GTK_STATUSBAR(statusbar)->label);
- gtk_widget_hide(GTK_STATUSBAR(statusbar)->frame);
- gtk_box_pack_start (GTK_BOX(statusbar), GTK_STATUSBAR(statusbar)->label,
- TRUE, TRUE, 0);
- g_object_unref(GTK_STATUSBAR(statusbar)->label);
- gtk_container_remove(GTK_CONTAINER(statusbar),
- GTK_STATUSBAR(statusbar)->frame);
- GTK_STATUSBAR(statusbar)->frame = gtk_frame_new(NULL);
+#if GTK_CHECK_VERSION (2, 19, 1)
+ child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
+#else
+ child = GTK_STATUSBAR(statusbar)->label;
+#endif
+ parent = gtk_widget_get_parent(child);
+ gtk_container_remove(GTK_CONTAINER(parent), g_object_ref(child));
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(parent), hbox);
+ gtk_widget_show(hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), child, TRUE, TRUE, 0);
+ g_object_unref(child);
return statusbar;
}
{
LogText *logtext = (LogText *) source;
- g_return_val_if_fail(logtext != NULL, TRUE);
- g_return_val_if_fail(logtext->text != NULL, TRUE);
+ cm_return_val_if_fail(logtext != NULL, TRUE);
+ cm_return_val_if_fail(logtext->text != NULL, TRUE);
statusbar_pop_all();
if (logtext->type == LOG_NORMAL) {
void statusbar_progress_all (gint done, gint total, gint step)
{
+ GtkProgressBar *progressbar = GTK_PROGRESS_BAR(
+ mainwindow_get_mainwindow()->progressbar);
gchar buf[32];
+
if (total && done % step == 0) {
- g_snprintf(buf, sizeof(buf), "%d / %d", done, total);
- gtk_progress_bar_set_text
- (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
- gtk_progress_bar_set_fraction
- (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
+#ifdef GENERIC_UMPC
+ /* use a more compact format */
+ const gchar *format = "%d/%d";
+#else
+ const gchar *format = "%d / %d";
+#endif
+ g_snprintf(buf, sizeof(buf), format, done, total);
+ gtk_progress_bar_set_text(progressbar, buf);
+ gtk_progress_bar_set_fraction(progressbar,
(total == 0) ? 0 : (gfloat)done / (gfloat)total);
+ if (!gtkut_widget_get_visible(GTK_WIDGET(progressbar)))
+ gtk_widget_show(GTK_WIDGET(progressbar));
} else if (total == 0) {
- gtk_progress_bar_set_text
- (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
- gtk_progress_bar_set_fraction
- (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), 0.0);
+ gtk_progress_bar_set_text(progressbar, "");
+ gtk_progress_bar_set_fraction(progressbar, 0.0);
+ gtk_widget_hide(GTK_WIDGET(progressbar));
}
}