/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2013 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
-#include <gtk/gtkstatusbar.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
#include <stdarg.h>
-#include "intl.h"
+#include "mainwindow.h"
#include "statusbar.h"
#include "gtkutils.h"
#include "utils.h"
#define BUFFSIZE 1024
static GList *statusbar_list = NULL;
-gint statusbar_puts_all_hook_id = -1;
+static gulong statusbar_puts_all_hook_id = HOOK_NONE;
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);
gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar),
FALSE);
+ gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
+ child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
+ 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;
}
cid = gtk_statusbar_get_context_id(statusbar, "Standard Output");
gtk_statusbar_pop(statusbar, cid);
gtk_statusbar_push(statusbar, cid, buf);
- gtkut_widget_wait_for_draw(GTK_WIDGET(statusbar)->parent);
+ gtkut_widget_draw_now(GTK_WIDGET(statusbar));
g_free(buf);
}
}
}
-gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
+static gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
{
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_verbosity_set(gboolean verbose)
{
- if (verbose && (statusbar_puts_all_hook_id == -1)) {
+ if (verbose && (statusbar_puts_all_hook_id == HOOK_NONE)) {
statusbar_puts_all_hook_id =
hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook, NULL);
- } else if (!verbose && (statusbar_puts_all_hook_id != -1)) {
+ } else if (!verbose && (statusbar_puts_all_hook_id != HOOK_NONE)) {
hooks_unregister_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook_id);
- statusbar_puts_all_hook_id = -1;
+ statusbar_puts_all_hook_id = HOOK_NONE;
statusbar_pop_all();
}
}
+
+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) {
+#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,
+ (gfloat)done / (gfloat)total);
+ if (!gtk_widget_get_visible(GTK_WIDGET(progressbar)))
+ gtk_widget_show(GTK_WIDGET(progressbar));
+ } else if (total == 0) {
+ gtk_progress_bar_set_text(progressbar, "");
+ gtk_progress_bar_set_fraction(progressbar, 0.0);
+ gtk_widget_hide(GTK_WIDGET(progressbar));
+ }
+}