/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
#include "logwindow.h"
#include "utils.h"
GdkEventKey *event,
LogWindow *logwin);
static void size_allocate_cb (GtkWidget *widget,
- GtkAllocation *allocation);
+ GtkAllocation *allocation,
+ gpointer data);
static gboolean log_window_append (gpointer source,
gpointer data);
static void log_window_clip (LogWindow *logwin,
*\brief Save Gtk object size to prefs dataset
*/
static void size_allocate_cb(GtkWidget *widget,
- GtkAllocation *allocation)
+ GtkAllocation *allocation,
+ gpointer data)
{
+ gint *prefs_logwin_width = NULL;
+ gint *prefs_logwin_height = NULL;
+ LogInstance instance = GPOINTER_TO_INT(data);
+
g_return_if_fail(allocation != NULL);
- prefs_common.logwin_width = allocation->width;
- prefs_common.logwin_height = allocation->height;
+ get_log_prefs(instance, &prefs_logwin_width, &prefs_logwin_height);
+ g_return_if_fail(prefs_logwin_width != NULL);
+ g_return_if_fail(prefs_logwin_height != NULL);
+
+ *prefs_logwin_width = allocation->width;
+ *prefs_logwin_height = allocation->height;
}
-LogWindow *log_window_create(void)
+LogWindow *log_window_create(LogInstance instance)
{
LogWindow *logwin;
GtkWidget *window;
GtkTextBuffer *buffer;
GtkTextIter iter;
static GdkGeometry geometry;
+ gint *prefs_logwin_width = NULL;
+ gint *prefs_logwin_height = NULL;
debug_print("Creating log window...\n");
+ get_log_prefs(instance, &prefs_logwin_width, &prefs_logwin_height);
+ g_return_val_if_fail(prefs_logwin_width != NULL, NULL);
+ g_return_val_if_fail(prefs_logwin_height != NULL, NULL);
+
logwin = g_new0(LogWindow, 1);
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(window), _("Protocol log"));
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "logwindow");
+ gtk_window_set_title(GTK_WINDOW(window), get_log_title(instance));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
g_object_ref(G_OBJECT(logwin->buffer));
gtk_text_view_set_buffer(GTK_TEXT_VIEW(text), NULL);
logwin->hidden = TRUE;
+ logwin->never_shown = TRUE;
gtk_text_buffer_get_start_iter(buffer, &iter);
logwin->end_mark = gtk_text_buffer_create_mark(buffer, "end", &iter, FALSE);
gtk_widget_show(text);
g_signal_connect(G_OBJECT(window), "size_allocate",
- G_CALLBACK(size_allocate_cb), NULL);
+ G_CALLBACK(size_allocate_cb), GINT_TO_POINTER(instance));
if (!geometry.min_height) {
geometry.min_width = 520;
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.logwin_width,
- prefs_common.logwin_height);
+ gtk_widget_set_size_request(window, *prefs_logwin_width,
+ *prefs_logwin_height);
logwin->window = window;
logwin->scrolledwin = scrolledwin;
logwin->text = text;
- logwin->hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, log_window_append, logwin);
+ logwin->hook_id = hooks_register_hook(get_log_hook(instance), log_window_append, logwin);
+
+ gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(text), logwin->end_mark);
return logwin;
}
+#define LOG_COLORS 8
+
void log_window_init(LogWindow *logwin)
{
GtkTextBuffer *buffer;
GdkColormap *colormap;
- GdkColor color[5];
- gboolean success[5];
+ GdkColor color[LOG_COLORS];
+ gboolean success[LOG_COLORS];
gint i;
gtkut_convert_int_to_gdk_color(prefs_common.log_msg_color, &color[0]);
gtkut_convert_int_to_gdk_color(prefs_common.log_error_color, &color[2]);
gtkut_convert_int_to_gdk_color(prefs_common.log_in_color, &color[3]);
gtkut_convert_int_to_gdk_color(prefs_common.log_out_color, &color[4]);
+ gtkut_convert_int_to_gdk_color(prefs_common.log_status_ok_color, &color[5]);
+ gtkut_convert_int_to_gdk_color(prefs_common.log_status_nok_color, &color[6]);
+ gtkut_convert_int_to_gdk_color(prefs_common.log_status_skip_color, &color[7]);
logwin->msg_color = color[0];
logwin->warn_color = color[1];
logwin->error_color = color[2];
logwin->in_color = color[3];
logwin->out_color = color[4];
+ logwin->status_ok_color = color[5];
+ logwin->status_nok_color = color[6];
+ logwin->status_skip_color = color[7];
colormap = gdk_drawable_get_colormap(logwin->window->window);
- gdk_colormap_alloc_colors(colormap, color, 5, FALSE, TRUE, success);
+ gdk_colormap_alloc_colors(colormap, color, LOG_COLORS, FALSE, TRUE, success);
- for (i = 0; i < 5; i++) {
+ for (i = 0; i < LOG_COLORS; i++) {
if (success[i] == FALSE) {
GtkStyle *style;
g_warning("LogWindow: color allocation failed\n");
style = gtk_widget_get_style(logwin->window);
logwin->msg_color = logwin->warn_color =
- logwin->error_color = logwin->in_color =
- logwin->out_color = style->black;
+ logwin->error_color = logwin->in_color =
+ logwin->out_color = logwin->status_ok_color =
+ logwin->status_nok_color = logwin->status_skip_color =
+ style->black;
break;
}
}
gtk_text_buffer_create_tag(buffer, "output",
"foreground-gdk", &logwin->out_color,
NULL);
+ gtk_text_buffer_create_tag(buffer, "status_ok",
+ "foreground-gdk", &logwin->status_ok_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "status_nok",
+ "foreground-gdk", &logwin->status_nok_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "status_skip",
+ "foreground-gdk", &logwin->status_skip_color,
+ NULL);
}
+#undef LOG_COLORS
+
void log_window_show(LogWindow *logwin)
{
GtkTextView *text = GTK_TEXT_VIEW(logwin->text);
GtkTextMark *mark;
logwin->hidden = FALSE;
- gtk_text_view_set_buffer(GTK_TEXT_VIEW(logwin->text), logwin->buffer);
+
+ if (logwin->never_shown)
+ gtk_text_view_set_buffer(GTK_TEXT_VIEW(logwin->text), logwin->buffer);
+
+ logwin->never_shown = FALSE;
mark = gtk_text_buffer_get_mark(buffer, "end");
gtk_text_view_scroll_mark_onscreen(text, mark);
+ gtk_window_deiconify(GTK_WINDOW(logwin->window));
gtk_widget_show(logwin->window);
+ gtk_window_present(GTK_WINDOW(logwin->window));
+#ifdef MAEMO
+ maemo_window_full_screen_if_needed(GTK_WINDOW(logwin->window));
+ maemo_connect_key_press_to_mainwindow(GTK_WINDOW(logwin->window));
+#endif
}
static void log_window_jump_to_error(LogWindow *logwin)
case LOG_ERROR:
tag = "error";
head = "*** ";
+ logwindow->has_error = TRUE;
+ break;
+ case LOG_STATUS_OK:
+ tag = "status_ok";
+ head = "> ";
+ break;
+ case LOG_STATUS_NOK:
+ tag = "status_nok";
+ head = "> ";
+ break;
+ case LOG_STATUS_SKIP:
+ tag = "status_skip";
+ head = "> skipped: ";
break;
default:
tag = NULL;
break;
}
-
- if (tag == NULL) {
- if (strstr(logtext->text, "] POP3>")
- || strstr(logtext->text, "] IMAP4>")
- || strstr(logtext->text, "] SMTP>")
- || strstr(logtext->text, "] ESMTP>")
- || strstr(logtext->text, "] NNTP>"))
- tag = "output";
- if (strstr(logtext->text, "] POP3<")
- || strstr(logtext->text, "] IMAP4<")
- || strstr(logtext->text, "] SMTP<")
- || strstr(logtext->text, "] ESMTP<")
- || strstr(logtext->text, "] NNTP<"))
- tag = "input";
+
+ if (logtext->instance == LOG_PROTOCOL) {
+ if (tag == NULL) {
+ if (strstr(logtext->text, "] POP3>")
+ || strstr(logtext->text, "] IMAP4>")
+ || strstr(logtext->text, "] SMTP>")
+ || strstr(logtext->text, "] ESMTP>")
+ || strstr(logtext->text, "] NNTP>"))
+ tag = "output";
+ if (strstr(logtext->text, "] POP3<")
+ || strstr(logtext->text, "] IMAP4<")
+ || strstr(logtext->text, "] SMTP<")
+ || strstr(logtext->text, "] ESMTP<")
+ || strstr(logtext->text, "] NNTP<"))
+ tag = "input";
+ }
}
if (head)
if (!logwindow->hidden) {
GtkAdjustment *vadj = text->vadjustment;
gfloat upper = vadj->upper - vadj->page_size;
- if (vadj->value == upper)
+ if (vadj->value == upper ||
+ (upper - vadj->value < 16 && vadj->value < 8))
gtk_text_view_scroll_mark_onscreen(text, logwindow->end_mark);
}
static void hide_cb(GtkWidget *widget, LogWindow *logwin)
{
- gtk_text_view_set_buffer(GTK_TEXT_VIEW(logwin->text), NULL);
logwin->hidden = TRUE;
}
return;
gtk_text_buffer_get_start_iter(textbuf, &start_iter);
gtk_text_buffer_delete(textbuf, &start_iter, &end_iter);
+ if (logwin->has_error) {
+ gtk_text_buffer_get_start_iter(textbuf, &start_iter);
+ if (mainwindow_get_mainwindow() && !gtk_text_iter_forward_to_tag_toggle(&start_iter, logwin->error_tag)) {
+ mainwindow_clear_error(mainwindow_get_mainwindow());
+ logwin->has_error = FALSE;
+ }
+ }
}
}