/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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 "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtksctree.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <string.h>
#include "grouplistdialog.h"
#include "alertpanel.h"
#include "recv.h"
#include "socket.h"
+#include "prefs_common.h"
#define GROUPLIST_DIALOG_WIDTH 450
#define GROUPLIST_DIALOG_HEIGHT 400
gint count,
gint read_bytes,
gpointer data);
+static void grouplist_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static gint window_deleted (GtkWidget *widget,
GdkEventAny *event,
static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static gboolean button_press_cb (GtkCTree *ctree,
+static gboolean button_press_cb (GtkCMCTree *ctree,
GdkEventButton *button,
gpointer data);
static void entry_activated (GtkEditable *editable);
GNode *node;
FolderItem *item;
- if (dialog && GTK_WIDGET_VISIBLE(dialog)) return NULL;
+ if (dialog && gtk_widget_get_visible(dialog)) return NULL;
if (!dialog)
grouplist_dialog_create();
gtk_widget_hide(dialog);
if (!ack) {
- slist_free_strings(subscribed);
- g_slist_free(subscribed);
+ slist_free_strings_full(subscribed);
subscribed = NULL;
for (node = folder->node->children; node != NULL;
GtkWidget *cancel_button;
GtkWidget *refresh_button;
GtkWidget *scrolledwin;
+ static GdkGeometry geometry;
gchar *titles[3];
gint i;
dialog = gtk_dialog_new();
gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
- gtk_widget_set_size_request(dialog,
- GROUPLIST_DIALOG_WIDTH,
- GROUPLIST_DIALOG_HEIGHT);
gtk_container_set_border_width
- (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+ (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
g_signal_connect(G_OBJECT(dialog), "delete_event",
G_CALLBACK(window_deleted), NULL);
g_signal_connect(G_OBJECT(dialog), "key_press_event",
G_CALLBACK(key_pressed), NULL);
+ g_signal_connect(G_OBJECT(dialog), "size_allocate",
+ G_CALLBACK(grouplist_size_allocate), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
- gtk_widget_realize(dialog);
-
vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+ gtk_container_add(GTK_CONTAINER(
+ gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
hbox = gtk_hbox_new(FALSE, 0);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolledwin),
- GTK_POLICY_ALWAYS,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
titles[0] = _("Newsgroup name");
titles[1] = _("Messages");
titles[2] = _("Type");
- ctree = gtk_ctree_new_with_titles(3, 0, titles);
+ ctree = gtk_sctree_new_with_titles(3, 0, titles);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
- gtk_clist_set_column_width
- (GTK_CLIST(ctree), 0, GROUPLIST_COL_NAME_WIDTH);
- gtk_clist_set_column_auto_resize(GTK_CLIST(ctree), 0, TRUE);
- gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_MULTIPLE);
- gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
- gtk_ctree_set_expander_style(GTK_CTREE(ctree),
- GTK_CTREE_EXPANDER_SQUARE);
+ gtk_cmclist_set_column_width
+ (GTK_CMCLIST(ctree), 0, GROUPLIST_COL_NAME_WIDTH);
+ gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), 0, TRUE);
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
+
+ gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
+
for (i = 0; i < 3; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
g_signal_connect(G_OBJECT(ctree), "button-press-event",
G_CALLBACK(button_press_cb), NULL);
&refresh_button, GTK_STOCK_REFRESH,
&cancel_button, GTK_STOCK_CANCEL,
&ok_button, GTK_STOCK_OK);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
confirm_area);
gtk_widget_grab_default(ok_button);
g_signal_connect(G_OBJECT(refresh_button), "clicked",
G_CALLBACK(refresh_clicked), NULL);
- gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+ if (!geometry.min_width) {
+ geometry.min_width = GROUPLIST_DIALOG_WIDTH;
+ geometry.min_height = GROUPLIST_DIALOG_HEIGHT;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(dialog), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_window_set_default_size(GTK_WINDOW(dialog),
+ prefs_common.news_subscribe_width,
+ prefs_common.news_subscribe_height);
+
+ gtk_widget_show_all(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
}
static GHashTable *branch_node_table;
g_hash_table_destroy(branch_node_table);
}
-static GtkCTreeNode *grouplist_hash_get_branch_node(const gchar *name)
+static GtkCMCTreeNode *grouplist_hash_get_branch_node(const gchar *name)
{
return g_hash_table_lookup(branch_node_table, name);
}
static void grouplist_hash_set_branch_node(const gchar *name,
- GtkCTreeNode *node)
+ GtkCMCTreeNode *node)
{
g_hash_table_insert(branch_node_table, g_strdup(name), node);
}
return g_strndup(name, p - name);
}
-static GtkCTreeNode *grouplist_create_parent(const gchar *name,
+static GtkCMCTreeNode *grouplist_create_parent(const gchar *name,
const gchar *pattern)
{
- GtkCTreeNode *parent;
- GtkCTreeNode *node;
+ GtkCMCTreeNode *parent;
+ GtkCMCTreeNode *node;
gchar *cols[3];
gchar *parent_name;
parent_name = grouplist_get_parent_name(name);
parent = grouplist_create_parent(parent_name, pattern);
- node = parent ? GTK_CTREE_ROW(parent)->children
- : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- node = gtk_sctree_insert_node(GTK_CTREE(ctree), parent, node,
- cols, 0, NULL, NULL, NULL, NULL,
+ node = parent ? GTK_CMCTREE_ROW(parent)->children
+ : GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+ node = gtk_sctree_insert_node(GTK_CMCTREE(ctree), parent, node,
+ cols, 0, NULL, NULL,
FALSE, FALSE);
if (parent && g_pattern_match_simple(pattern, parent_name) == FALSE)
- gtk_ctree_expand(GTK_CTREE(ctree), parent);
- gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, FALSE);
+ gtk_cmctree_expand(GTK_CMCTREE(ctree), parent);
+ gtk_cmctree_node_set_selectable(GTK_CMCTREE(ctree), node, FALSE);
grouplist_hash_set_branch_node(name, node);
return node;
}
-static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
+static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
const gchar *pattern)
{
- GtkCTreeNode *node;
- GtkCTreeNode *parent;
+ GtkCMCTreeNode *node;
+ GtkCMCTreeNode *parent;
gchar *name = (gchar *)ginfo->name;
gchar *parent_name;
gchar *count_str;
parent = grouplist_create_parent(parent_name, pattern);
node = grouplist_hash_get_branch_node(name);
if (node) {
- gtk_sctree_set_node_info(GTK_CTREE(ctree), node, cols[0], 0,
- NULL, NULL, NULL, NULL, FALSE, FALSE);
- gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 1, cols[1]);
- gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 2, cols[2]);
+ gtk_cmctree_set_node_info(GTK_CMCTREE(ctree), node, cols[0], 0,
+ NULL, NULL, FALSE, FALSE);
+ gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 1, cols[1]);
+ gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 2, cols[2]);
} else {
- node = parent ? GTK_CTREE_ROW(parent)->children
- : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- node = gtk_sctree_insert_node(GTK_CTREE(ctree), parent, node,
- cols, 0, NULL, NULL, NULL, NULL,
+ node = parent ? GTK_CMCTREE_ROW(parent)->children
+ : GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+ node = gtk_sctree_insert_node(GTK_CMCTREE(ctree), parent, node,
+ cols, 0, NULL, NULL,
TRUE, FALSE);
if (parent &&
g_pattern_match_simple(pattern, parent_name) == FALSE)
- gtk_ctree_expand(GTK_CTREE(ctree), parent);
+ gtk_cmctree_expand(GTK_CMCTREE(ctree), parent);
}
- gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, TRUE);
+ gtk_cmctree_node_set_selectable(GTK_CMCTREE(ctree), node, TRUE);
if (node)
- gtk_ctree_node_set_row_data(GTK_CTREE(ctree), node, ginfo);
+ gtk_cmctree_node_set_row_data(GTK_CMCTREE(ctree), node, ginfo);
g_free(parent_name);
return node;
}
-static void grouplist_expand_upwards(GtkCTree *ctree, const gchar *name) {
+static void grouplist_expand_upwards(GtkCMCTree *ctree, const gchar *name) {
const gchar *ptr;
gchar *newname=g_malloc0(strlen(name));
for (ptr=name; *ptr; ptr++) {
if (*ptr == '.')
- gtk_ctree_expand(ctree,
+ gtk_cmctree_expand(ctree,
grouplist_hash_get_branch_node(newname));
newname[ptr-name] = *ptr;
}
{
static GdkCursor *watch_cursor = NULL;
GSList *cur;
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
GPatternSpec *pspec;
+ GdkWindow *window;
if (locked) return;
locked = TRUE;
if (!watch_cursor)
watch_cursor = gdk_cursor_new(GDK_WATCH);
- gdk_window_set_cursor(dialog->window, watch_cursor);
+ window = gtk_widget_get_window(dialog);
+ gdk_window_set_cursor(window, watch_cursor);
main_window_cursor_wait(mainwindow_get_mainwindow());
GTK_EVENTS_FLUSH();
if (group_list == NULL && ack == TRUE) {
alertpanel_error(_("Can't retrieve newsgroup list."));
locked = FALSE;
- gdk_window_set_cursor(dialog->window, NULL);
+ gdk_window_set_cursor(window, NULL);
main_window_cursor_normal(mainwindow_get_mainwindow());
return;
}
} else
- gtk_clist_clear(GTK_CLIST(ctree));
+ gtk_cmclist_clear(GTK_CMCLIST(ctree));
gtk_entry_set_text(GTK_ENTRY(entry), pattern);
grouplist_hash_init();
- gtk_clist_freeze(GTK_CLIST(ctree));
+ gtk_cmclist_freeze(GTK_CMCLIST(ctree));
pspec = g_pattern_spec_new(pattern);
if (g_slist_find_custom(subscribed, ginfo->name,
(GCompareFunc)g_ascii_strcasecmp)
!= NULL)
- gtk_ctree_select(GTK_CTREE(ctree), node);
+ gtk_cmctree_select(GTK_CMCTREE(ctree), node);
}
}
for (cur = subscribed; cur; cur = g_slist_next(cur))
- grouplist_expand_upwards(GTK_CTREE(ctree), (gchar *)cur->data);
+ grouplist_expand_upwards(GTK_CMCTREE(ctree), (gchar *)cur->data);
g_pattern_spec_free(pspec);
- gtk_clist_thaw(GTK_CLIST(ctree));
+ gtk_cmclist_thaw(GTK_CMCLIST(ctree));
grouplist_hash_done();
gtk_label_set_text(GTK_LABEL(status_label), _("Done."));
- gdk_window_set_cursor(dialog->window, NULL);
+ gdk_window_set_cursor(window, NULL);
main_window_cursor_normal(mainwindow_get_mainwindow());
locked = FALSE;
static void grouplist_clear(void)
{
- gtk_clist_clear(GTK_CLIST(ctree));
+ gtk_cmclist_clear(GTK_CMCLIST(ctree));
gtk_entry_set_text(GTK_ENTRY(entry), "");
news_group_list_free(group_list);
group_list = NULL;
g_snprintf(buf, sizeof(buf),
_("%d newsgroups received (%s read)"),
- count, to_human_readable(read_bytes));
+ count, to_human_readable((goffset)read_bytes));
gtk_label_set_text(GTK_LABEL(status_label), buf);
GTK_EVENTS_FLUSH();
if (ack == FALSE)
return TRUE;
}
+static void grouplist_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
+{
+ cm_return_if_fail( allocation != NULL );
+
+ prefs_common.news_subscribe_width = allocation->width;
+ prefs_common.news_subscribe_height = allocation->height;
+}
+
static gint window_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data)
{
ack = FALSE;
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
cancel_clicked(NULL, NULL);
return FALSE;
}
* - handle click on expander
* - update "subscribed" list and un-/select row
*/
-static gboolean button_press_cb(GtkCTree *ctree, GdkEventButton *button,
+static gboolean button_press_cb(GtkCMCTree *ctree, GdkEventButton *button,
gpointer data)
{
gint row, col;
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
NewsGroupInfo *ginfo;
GSList *list;
if (button->type != GDK_BUTTON_PRESS) return TRUE;
if (button->button != 1) return TRUE;
- gtk_clist_get_selection_info(GTK_CLIST(ctree),
+ gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree),
button->x, button->y, &row, &col);
- node = gtk_ctree_node_nth(ctree, row);
+ node = gtk_cmctree_node_nth(ctree, row);
if (!node) return TRUE;
- if (gtk_ctree_is_hot_spot(ctree, button->x, button->y)) {
- gtk_ctree_toggle_expansion(ctree, node);
+ if (gtk_cmctree_is_hot_spot(ctree, button->x, button->y)) {
+ gtk_cmctree_toggle_expansion(ctree, node);
return TRUE;
}
- ginfo = gtk_ctree_node_get_row_data(ctree, node);
+ ginfo = gtk_cmctree_node_get_row_data(ctree, node);
if (!ginfo) return TRUE;
list = g_slist_find_custom(subscribed, ginfo->name,
if (list) {
g_free(list->data);
subscribed = g_slist_remove(subscribed, list->data);
- gtk_clist_unselect_row(GTK_CLIST(ctree), row, 0);
+ gtk_cmclist_unselect_row(GTK_CMCLIST(ctree), row, 0);
} else {
subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
- gtk_clist_select_row(GTK_CLIST(ctree), row, 0);
+ gtk_cmclist_select_row(GTK_CMCLIST(ctree), row, 0);
}
return TRUE;
projects / claws.git / blobdiff