/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * 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
- * 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 <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
#include "progressdialog.h"
#include "gtkutils.h"
#include "utils.h"
+#include "prefs_common.h"
enum {
PROGRESS_IMAGE,
N_PROGRESS_COLUMNS
};
-
-static GtkListStore* progress_dialog_create_data_store(void);
-static gint progress_dialog_list_view_insert_account(GtkWidget *list_view,
- gint row,
- const gchar *account,
- const gchar *status,
- GdkPixbuf *image);
-static GtkWidget *progress_dialog_list_view_create(void);
-static void progress_dialog_create_list_view_columns(GtkTreeView *list_view);
+static gint progress_dialog_insert_account(ProgressDialog *progress,
+ gint row,
+ const gchar *account,
+ const gchar *status,
+ GdkPixbuf *image);
ProgressDialog *progress_dialog_create(void)
{
ProgressDialog *progress;
- GtkWidget *window;
- GtkWidget *vbox;
+ GtkWidget *dialog;
GtkWidget *hbox;
+ GtkWidget *vbox;
GtkWidget *label;
+ GtkWidget *showlog_btn;
GtkWidget *cancel_btn;
- GtkWidget *cancel_area;
GtkWidget *progressbar;
GtkWidget *scrolledwin;
- GtkWidget *clist;
- GtkWidget *list_view;
- gchar *text[] = {NULL, NULL, NULL};
-
- text[1] = _("Account");
- text[2] = _("Status");
+ GtkWidget *treeview;
+ GtkListStore *store;
+ GtkTreeSelection *selection;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
debug_print("Creating progress dialog...\n");
progress = g_new0(ProgressDialog, 1);
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize(window, 460, -1);
- gtk_container_set_border_width(GTK_CONTAINER(window), 8);
- gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
- gtk_widget_realize(window);
+ dialog = gtk_dialog_new();
+ gtk_container_set_border_width(GTK_CONTAINER(dialog), 8);
+ gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
+ gtk_widget_realize(dialog);
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_widget_show(vbox);
+ gtk_container_set_border_width
+ (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 0);
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ gtk_box_set_spacing(GTK_BOX(vbox), 8);
hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox,
+ FALSE, FALSE, 8);
gtk_widget_show(hbox);
label = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
gtk_widget_show(label);
- gtkut_stock_button_set_create
- (&cancel_area, &cancel_btn, GTK_STOCK_CANCEL,
- NULL, NULL, NULL, NULL);
- gtk_box_pack_end(GTK_BOX(vbox), cancel_area, FALSE, FALSE, 0);
+ showlog_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+ _("_View log"),
+ GTK_RESPONSE_NONE);
+ cancel_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_NONE);
gtk_widget_grab_default(cancel_btn);
- gtk_widget_show_all(cancel_area);
+ gtk_widget_grab_focus(cancel_btn);
progressbar = gtk_progress_bar_new();
- gtk_box_pack_start(GTK_BOX(vbox), progressbar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), progressbar,
+ FALSE, FALSE, 0);
gtk_widget_show(progressbar);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwin);
- gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), scrolledwin,
+ TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- /* GTK2: we hide the clist, but it is available for migration
- * purposes. now if there only was a way to catch "set clist
- * things"!.. */
- clist = gtk_clist_new_with_titles(3, text);
- gtk_widget_hide(clist);
- /* gtk_container_add(GTK_CONTAINER(scrolledwin), clist); */
- /* gtk_widget_set_usize(clist, -1, 120); */
- gtk_clist_set_column_justification(GTK_CLIST(clist), 0,
- GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_width(GTK_CLIST(clist), 0, 16);
- gtk_clist_set_column_width(GTK_CLIST(clist), 1, 160);
-
- list_view = progress_dialog_list_view_create();
- gtk_widget_show(list_view);
- gtk_container_add(GTK_CONTAINER(scrolledwin), list_view);
- gtk_widget_set_usize(list_view, -1, 120);
-
- progress->window = window;
+ store = gtk_list_store_new(N_PROGRESS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_POINTER);
+
+ treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ g_object_unref(G_OBJECT(store));
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
+ prefs_common.use_stripes_everywhere);
+ gtk_widget_show(treeview);
+ gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
+ gtk_widget_set_size_request(treeview, -1, 120);
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+ gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
+
+ renderer = gtk_cell_renderer_pixbuf_new();
+ g_object_set(renderer, "xalign", 0.5, NULL);
+ column = gtk_tree_view_column_new_with_attributes
+ (NULL, renderer, "pixbuf", PROGRESS_IMAGE, NULL);
+ gtk_tree_view_column_set_alignment(column, 0.5);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+ gtk_tree_view_column_set_fixed_width(column, 20);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Account"), renderer, "text", PROGRESS_ACCOUNT, NULL);
+ gtk_tree_view_column_set_resizable(column, TRUE);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+ gtk_tree_view_column_set_fixed_width(column, 160);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Status"), renderer, "text", PROGRESS_STATE, NULL);
+ gtk_tree_view_column_set_resizable(column, TRUE);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
+
+ progress->window = dialog;
progress->label = label;
+ progress->showlog_btn = showlog_btn;
progress->cancel_btn = cancel_btn;
progress->progressbar = progressbar;
- progress->clist = clist;
- progress->list_view = list_view;
+ progress->treeview = treeview;
+ progress->store = store;
return progress;
}
}
}
-/*!
- *\return gint Row where account was set
- */
-gint progress_dialog_list_set_account(ProgressDialog *progress,
- gint row,
- const gchar *account_name)
-{
- return progress_dialog_list_view_insert_account(progress->list_view,
- row, account_name, NULL,
- NULL);
-}
-
-/*!
- *\return gint Row where image was set
- */
-gint progress_dialog_list_set_image(ProgressDialog *progress,
- gint row,
- GdkPixbuf *image)
-{
- return progress_dialog_list_view_insert_account(progress->list_view,
- row, NULL, NULL,
- image);
-}
-
/*!
*\return gint Row where status was set
*/
gint row,
const gchar *status)
{
- return progress_dialog_list_view_insert_account(progress->list_view,
- row, NULL, status,
- NULL);
+ return progress_dialog_insert_account(progress, row, NULL,
+ status, NULL);
}
/*!
const gchar *account_name,
const gchar *status)
{
- return progress_dialog_list_view_insert_account(progress->list_view,
- row, account_name,
- status, image);
+ return progress_dialog_insert_account(progress, row, account_name,
+ status, image);
}
-/* XXX: maybe scroll into view, but leaving that for someone else to
- * pickup: I don't have that many accounts... */
-gboolean progress_dialog_list_select_row(ProgressDialog *progress,
- gint row)
+void progress_dialog_scroll_to_row(ProgressDialog *progress, gint row)
{
- GtkTreeSelection *selection = gtk_tree_view_get_selection
- (GTK_TREE_VIEW(progress->list_view));
+ GtkTreeModel *model = GTK_TREE_MODEL(progress->store);
GtkTreeIter iter;
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(progress->list_view));
+ GtkTreePath *path;
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
- return FALSE;
+ return;
- gtk_tree_selection_select_iter(selection, &iter);
-
- return TRUE;
+ path = gtk_tree_model_get_path(model, &iter);
+ gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(progress->treeview),
+ path, NULL, FALSE, 0.0, 0.0);
+ gtk_tree_path_free(path);
}
-static GtkListStore* progress_dialog_create_data_store(void)
-{
- return gtk_list_store_new(N_PROGRESS_COLUMNS,
- GDK_TYPE_PIXBUF,
- G_TYPE_STRING,
- G_TYPE_STRING,
- -1);
-}
-
-static gint progress_dialog_list_view_insert_account(GtkWidget *list_view,
- gint row,
- const gchar *account,
- const gchar *status,
- GdkPixbuf *image)
+static gint progress_dialog_insert_account(ProgressDialog *progress,
+ gint row,
+ const gchar *account,
+ const gchar *status,
+ GdkPixbuf *image)
{
GtkTreeIter iter;
- GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model
- (GTK_TREE_VIEW(list_view)));
+ GtkListStore *store = progress->store;
gint result = -1;
if (account == NULL && status == NULL && image == NULL)
gtk_list_store_set(store, &iter,
PROGRESS_STATE, status,
-1);
- if (image)
+ if (image)
gtk_list_store_set(store, &iter,
PROGRESS_IMAGE, image,
-1);
return result;
}
-
-static GtkWidget *progress_dialog_list_view_create(void)
-{
- GtkTreeView *list_view;
- GtkTreeModel *model;
-
- model = GTK_TREE_MODEL(progress_dialog_create_data_store());
- list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
- g_object_unref(model);
-
- gtk_tree_view_set_rules_hint(list_view, TRUE);
-
- /* create the columns */
- progress_dialog_create_list_view_columns(list_view);
-
- return GTK_WIDGET(list_view);
-}
-
-static void progress_dialog_create_list_view_columns(GtkTreeView *list_view)
-{
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
-
- renderer = gtk_cell_renderer_pixbuf_new();
- column = gtk_tree_view_column_new_with_attributes
- ("", renderer,
- "pixbuf", PROGRESS_IMAGE,
- NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
-
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes
- (_("Account"),
- renderer,
- "text", PROGRESS_ACCOUNT,
- NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
-
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes
- (_("Status"),
- renderer,
- "text", PROGRESS_STATE,
- NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
-}
-
projects / claws.git / blobdiff