/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include "defs.h"
gtk_tree_store_clear(tree_store);
if (!cancelled &&
- selected_item && selected_item->path && !selected_item->no_select) {
+ selected_item && selected_item->path) {
folder_item = selected_item;
return folder_item;
} else
return NULL;
}
+static void foldersel_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.folderselwin_width = allocation->width;
+ prefs_common.folderselwin_height = allocation->height;
+}
+
static void foldersel_create(void)
{
GtkWidget *vbox;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
+ static GdkGeometry geometry;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "foldersel");
gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
- gtk_window_set_wmclass
- (GTK_WINDOW(window), "folder_selection", "Sylpheed");
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+
gtk_widget_realize(window);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(foldersel_size_allocate_cb), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_size_request(scrolledwin, 300, 360);
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),
GDK_TYPE_PIXBUF,
GDK_TYPE_PIXBUF,
GDK_TYPE_COLOR,
- G_TYPE_BOOLEAN);
+ G_TYPE_INT);
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(tree_store),
FOLDERSEL_FOLDERNAME,
foldersel_folder_name_compare,
g_object_unref(G_OBJECT(tree_store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
FOLDERSEL_FOLDERNAME);
g_signal_connect(G_OBJECT(treeview), "row-activated",
G_CALLBACK(foldersel_tree_activated), NULL);
-
gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
column = gtk_tree_view_column_new();
(column, renderer,
"text", FOLDERSEL_FOLDERNAME,
"foreground-gdk", FOLDERSEL_FOREGROUND,
- "weight-set", FOLDERSEL_BOLD,
+ "weight", FOLDERSEL_BOLD,
NULL);
g_object_set(G_OBJECT(renderer), "weight", PANGO_WEIGHT_BOLD, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
G_CALLBACK(foldersel_entry_activated), NULL);
gtkut_stock_button_set_create(&confirm_area,
- &ok_button, GTK_STOCK_OK,
+ &new_button, GTK_STOCK_NEW,
&cancel_button, GTK_STOCK_CANCEL,
- &new_button, GTK_STOCK_NEW);
+ &ok_button, GTK_STOCK_OK);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
g_signal_connect(G_OBJECT(new_button), "clicked",
G_CALLBACK(foldersel_new_folder), NULL);
+ if (!geometry.min_height) {
+ geometry.min_width = 300;
+ geometry.min_height = 360;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.folderselwin_width,
+ prefs_common.folderselwin_height);
+
gtk_widget_show_all(vbox);
}
{
gchar *name, *tmpname;
GdkPixbuf *pixbuf, *pixbuf_open;
- gboolean use_bold, use_color;
+ gboolean use_color;
+ PangoWeight weight = PANGO_WEIGHT_NORMAL;
GdkColor *foreground = NULL;
static GdkColor color_noselect = {0, COLOR_DIM, COLOR_DIM, COLOR_DIM};
static GdkColor color_new;
}
}
- /* CLAWS: already adds the UI string to the folder name */
-#ifndef CLAWS
- if (!item->parent) {
- switch (FOLDER_TYPE(item->folder)) {
- case F_MH:
- Xstrcat_a(name, name, " (MH)", ); break;
- case F_IMAP:
- Xstrcat_a(name, name, " (IMAP4)", ); break;
- case F_NEWS:
- Xstrcat_a(name, name, " (News)", ); break;
- default:
- break;
- }
- }
-#endif
-
- if (item->stype == F_QUEUE && item->total_msgs > 0) {
+ if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
name = g_strdup_printf("%s (%d)", name, item->total_msgs);
} else if (item->unread_msgs > 0) {
name = g_strdup_printf("%s (%d)", name, item->unread_msgs);
pixbuf_open =
item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
- if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
- item->stype == F_TRASH) {
- use_bold = use_color = FALSE;
- } else if (item->stype == F_QUEUE) {
- use_bold = use_color = (item->total_msgs > 0);
+ if (folder_has_parent_of_type(item, F_DRAFT) ||
+ folder_has_parent_of_type(item, F_OUTBOX) ||
+ folder_has_parent_of_type(item, F_TRASH)) {
+ use_color = FALSE;
+ } else if (folder_has_parent_of_type(item, F_QUEUE)) {
+ use_color = (item->total_msgs > 0);
+ if (item->total_msgs > 0)
+ weight = PANGO_WEIGHT_BOLD;
} else {
- use_bold = (item->unread_msgs > 0);
+ if (item->unread_msgs > 0)
+ weight = PANGO_WEIGHT_BOLD;
use_color = (item->new_msgs > 0);
}
FOLDERSEL_PIXBUF, pixbuf,
FOLDERSEL_PIXBUF_OPEN, pixbuf_open,
FOLDERSEL_FOREGROUND, foreground,
- FOLDERSEL_BOLD, use_bold,
+ FOLDERSEL_BOLD, weight,
-1);
g_free(tmpname);
FOLDERSEL_FOLDERITEM, &item, -1);
selected_item = item;
- if (selected_item && selected_item->path && !selected_item->no_select) {
+ if (selected_item && selected_item->path) {
gchar *id;
id = folder_item_get_identifier(selected_item);
gtk_entry_set_text(GTK_ENTRY(entry), id);
if ((p && FOLDER_TYPE(selected_item->folder) != F_IMAP) ||
(p && FOLDER_TYPE(selected_item->folder) == F_IMAP &&
*(p + 1) != '\0')) {
- alertpanel_error(_("`%c' can't be included in folder name."),
+ alertpanel_error(_("'%c' can't be included in folder name."),
G_DIR_SEPARATOR);
return;
}
/* find whether the directory already exists */
if (folder_find_child_item_by_name(selected_item, new_folder)) {
- alertpanel_error(_("The folder `%s' already exists."),
+ alertpanel_error(_("The folder '%s' already exists."),
disp_name);
return;
}
new_item = folder_create_folder(selected_item, new_folder);
if (!new_item) {
- alertpanel_error(_("Can't create the folder `%s'."), disp_name);
+ alertpanel_error(_("Can't create the folder '%s'."), disp_name);
return;
}