From c46b00d19d0e6efb43f26c9d2304d600139abbd6 Mon Sep 17 00:00:00 2001 From: hiro Date: Tue, 25 Nov 2008 06:18:23 +0000 Subject: added message label to the folder selection dialog. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2077 ee746299-78ed-0310-b773-934348b2243d --- src/foldersel.c | 25 ++++++++++++++++++++++++- src/foldersel.h | 12 ++++++++---- src/mainwindow.c | 3 ++- src/summaryview.c | 10 ++++++---- 4 files changed, 40 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/foldersel.c b/src/foldersel.c index 982223cf..d945af5d 100644 --- a/src/foldersel.c +++ b/src/foldersel.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -80,6 +81,7 @@ static GdkPixbuf *folderopen_pixbuf; static GdkPixbuf *foldernoselect_pixbuf; static GtkWidget *window; +static GtkWidget *label; static GtkWidget *treeview; static GtkWidget *entry; static GtkWidget *confirm_area; @@ -147,6 +149,15 @@ static gboolean tree_view_folder_item_func (GtkTreeModel *model, FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type, const gchar *default_folder) +{ + return foldersel_folder_sel_full(cur_folder, type, default_folder, + NULL); +} + +FolderItem *foldersel_folder_sel_full(Folder *cur_folder, + FolderSelectionType type, + const gchar *default_folder, + const gchar *message) { selected_item = NULL; sel_type = type; @@ -156,6 +167,12 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type, foldersel_init(); } + if (message) { + gtk_widget_show(label); + gtk_label_set_text(GTK_LABEL(label), message); + } else + gtk_widget_hide(label); + foldersel_set_tree(cur_folder); /* select current */ @@ -203,6 +220,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type, gtk_main_iteration(); gtk_widget_hide(window); + gtk_label_set_text(GTK_LABEL(label), ""); gtk_entry_set_text(GTK_ENTRY(entry), ""); gtk_tree_store_clear(tree_store); @@ -245,10 +263,15 @@ static void foldersel_create(void) MANAGE_WINDOW_SIGNALS_CONNECT(window); vbox = gtk_vbox_new(FALSE, 4); + gtk_widget_set_size_request(vbox, -1, 420); gtk_container_add(GTK_CONTAINER(window), vbox); + label = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 2); + scrolledwin = gtk_scrolled_window_new(NULL, NULL); - gtk_widget_set_size_request(scrolledwin, 300, 360); + gtk_widget_set_size_request(scrolledwin, 300, -1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), diff --git a/src/foldersel.h b/src/foldersel.h index e1b065b2..80b078d9 100644 --- a/src/foldersel.h +++ b/src/foldersel.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * 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 @@ -33,8 +33,12 @@ typedef enum FOLDER_SEL_MOVE_FOLDER } FolderSelectionType; -FolderItem *foldersel_folder_sel(Folder *cur_folder, - FolderSelectionType type, - const gchar *default_folder); +FolderItem *foldersel_folder_sel (Folder *cur_folder, + FolderSelectionType type, + const gchar *default_folder); +FolderItem *foldersel_folder_sel_full(Folder *cur_folder, + FolderSelectionType type, + const gchar *default_folder, + const gchar *message); #endif /* __FOLDERSEL_H__ */ diff --git a/src/mainwindow.c b/src/mainwindow.c index 3818ff7c..dfe126f2 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -3789,7 +3789,8 @@ static void goto_folder_cb(MainWindow *mainwin, guint action, { FolderItem *to_folder; - to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL); + to_folder = foldersel_folder_sel_full(NULL, FOLDER_SEL_ALL, NULL, + _("Select folder to open")); if (to_folder) folderview_select(mainwin->folderview, to_folder); diff --git a/src/summaryview.c b/src/summaryview.c index 0239b78d..aa6e0b4e 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3422,8 +3422,9 @@ void summary_move_to(SummaryView *summaryview) if (!summaryview->folder_item || FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return; - to_folder = foldersel_folder_sel(summaryview->folder_item->folder, - FOLDER_SEL_MOVE, NULL); + to_folder = foldersel_folder_sel_full(summaryview->folder_item->folder, + FOLDER_SEL_MOVE, NULL, + _("Select folder to move")); summary_move_selected_to(summaryview, to_folder); } @@ -3518,8 +3519,9 @@ void summary_copy_to(SummaryView *summaryview) if (!summaryview->folder_item) return; - to_folder = foldersel_folder_sel(summaryview->folder_item->folder, - FOLDER_SEL_COPY, NULL); + to_folder = foldersel_folder_sel_full(summaryview->folder_item->folder, + FOLDER_SEL_COPY, NULL, + _("Select folder to copy")); summary_copy_selected_to(summaryview, to_folder); } -- cgit v1.2.3