/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>
#include <stdarg.h>
#include "mainwindow.h"
#include "log.h"
#include "hooks.h"
-#ifdef MAEMO
-#ifdef CHINOOK
-#include <hildon/hildon-banner.h>
-#else
-#include <hildon-widgets/hildon-banner.h>
-#endif
-#endif
-
-
#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);
-
- 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);
+ 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;
}
statusbar_puts(statusbar, buf);
}
-#ifdef MAEMO
-static GSList *banner_texts = NULL;
-static GtkWidget *banner = NULL;
-void statuswindow_print_all(const gchar *format, ...)
-{
- va_list args;
- gchar buf[BUFFSIZE];
- GList *cur;
-
- va_start(args, format);
- g_vsnprintf(buf, sizeof(buf), format, args);
- va_end(args);
-
- for (cur = statusbar_list; cur != NULL; cur = cur->next)
- statusbar_puts(GTK_STATUSBAR(cur->data), buf);
- if (mainwindow_get_mainwindow()) {
- if (banner != NULL) {
- gchar *last_text = (gchar *)banner_texts->data;
- if (!strcmp2(last_text, buf))
- return;
- }
- statusbar_pop_all();
- if (banner == NULL) {
- banner = hildon_banner_show_animation(
- mainwindow_get_mainwindow()->window,
- NULL,
- buf);
- g_object_ref(banner);
- banner_texts = g_slist_prepend(banner_texts, g_strdup(buf));
- } else {
- hildon_banner_set_text(HILDON_BANNER(banner), buf);
- banner_texts = g_slist_prepend(banner_texts, g_strdup(buf));
- }
- }
-}
-
-void statuswindow_pop_all(void)
-{
- GList *cur;
- gint cid;
-
- for (cur = statusbar_list; cur != NULL; cur = cur->next) {
- cid = gtk_statusbar_get_context_id(GTK_STATUSBAR(cur->data),
- "Standard Output");
- gtk_statusbar_pop(GTK_STATUSBAR(cur->data), cid);
- }
- if (banner && banner_texts) {
- gchar *old_text = (gchar *)banner_texts->data;
- gchar *prev_text = NULL;
- banner_texts = g_slist_remove(banner_texts, old_text);
- g_free(old_text);
- if (banner_texts) {
- prev_text = (gchar *)banner_texts->data;
- hildon_banner_set_text(HILDON_BANNER(banner), prev_text);
- } else {
- gtk_widget_destroy(banner);
- g_object_unref(banner);
- banner = NULL;
- }
- }
-}
-#endif
-
void statusbar_print_all(const gchar *format, ...)
{
va_list args;
{
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) {
- 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),
- (total == 0) ? 0 : (gfloat)done / (gfloat)total);
+#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
- (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));
}
}
projects / claws.git / blobdiff