projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace deprecated gtk_window_set_policy
[claws.git] / src / grouplistdialog.c
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index c06a2436c76259dbd75d7542abaa530b46dbaa72..9a90027d8747067df864a67b741acfdba149f061 100644 (file)
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
  *
  * 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
@@ -79,22 +79,20 @@ static gboolean grouplist_recv_func (SockInfo       *sock,
                                         gint            read_bytes,
                                         gpointer        data);
 
                                         gint            read_bytes,
                                         gpointer        data);
 
+static gint window_deleted     (GtkWidget      *widget,
+                                GdkEventAny    *event,
+                                gpointer        data);
 static void ok_clicked         (GtkWidget      *widget,
                                 gpointer        data);
 static void cancel_clicked     (GtkWidget      *widget,
                                 gpointer        data);
 static void refresh_clicked    (GtkWidget      *widget,
                                 gpointer        data);
 static void ok_clicked         (GtkWidget      *widget,
                                 gpointer        data);
 static void cancel_clicked     (GtkWidget      *widget,
                                 gpointer        data);
 static void refresh_clicked    (GtkWidget      *widget,
                                 gpointer        data);
-static void key_pressed                (GtkWidget      *widget,
+static gboolean key_pressed    (GtkWidget      *widget,
                                 GdkEventKey    *event,
                                 gpointer        data);
                                 GdkEventKey    *event,
                                 gpointer        data);
-static void ctree_selected     (GtkCTree       *ctree,
-                                GtkCTreeNode   *node,
-                                gint            column,
-                                gpointer        data);
-static void ctree_unselected   (GtkCTree       *ctree,
-                                GtkCTreeNode   *node,
-                                gint            column,
+static gboolean button_press_cb (GtkCTree      *ctree,
+                                GdkEventButton *button,
                                 gpointer        data);
 static void entry_activated    (GtkEditable    *editable);
 static void search_clicked     (GtkWidget      *widget,
                                 gpointer        data);
 static void entry_activated    (GtkEditable    *editable);
 static void search_clicked     (GtkWidget      *widget,
@@ -164,17 +162,17 @@ static void grouplist_dialog_create(void)
        gint i;
 
        dialog = gtk_dialog_new();
        gint i;
 
        dialog = gtk_dialog_new();
-       gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-       gtk_widget_set_usize(dialog,
-                            GROUPLIST_DIALOG_WIDTH, GROUPLIST_DIALOG_HEIGHT);
+       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_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
        gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
        gtk_container_set_border_width
                (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
        gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
-       gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
-                          GTK_SIGNAL_FUNC(cancel_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
-                          GTK_SIGNAL_FUNC(key_pressed), NULL);
+       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);
        MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
        gtk_widget_realize(dialog);
        MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
        gtk_widget_realize(dialog);
@@ -197,14 +195,14 @@ static void grouplist_dialog_create(void)
 
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(entry), "activate",
-                          GTK_SIGNAL_FUNC(entry_activated), NULL);
+       g_signal_connect(G_OBJECT(entry), "activate",
+                        G_CALLBACK(entry_activated), NULL);
 
        search_button = gtk_button_new_with_label(_(" Search "));
        gtk_box_pack_start(GTK_BOX(hbox), search_button, FALSE, FALSE, 0);
 
 
        search_button = gtk_button_new_with_label(_(" Search "));
        gtk_box_pack_start(GTK_BOX(hbox), search_button, FALSE, FALSE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(search_button), "clicked",
-                          GTK_SIGNAL_FUNC(search_clicked), NULL);
+       g_signal_connect(G_OBJECT(search_button), "clicked",
+                        G_CALLBACK(search_clicked), NULL);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_box_pack_start(GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_box_pack_start(GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0);
@@ -226,10 +224,8 @@ static void grouplist_dialog_create(void)
        for (i = 0; i < 3; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
        for (i = 0; i < 3; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(ctree_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_unselect_row",
-                          GTK_SIGNAL_FUNC(ctree_unselected), NULL);
+       g_signal_connect(G_OBJECT(ctree), "button-press-event",
+                        G_CALLBACK(button_press_cb), NULL);
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -245,12 +241,12 @@ static void grouplist_dialog_create(void)
                          confirm_area);
        gtk_widget_grab_default(ok_button);
 
                          confirm_area);
        gtk_widget_grab_default(ok_button);
 
-       gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
-                          GTK_SIGNAL_FUNC(ok_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
-                          GTK_SIGNAL_FUNC(cancel_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(refresh_button), "clicked",
-                          GTK_SIGNAL_FUNC(refresh_clicked), NULL);
+       g_signal_connect(G_OBJECT(ok_button), "clicked",
+                        G_CALLBACK(ok_clicked), NULL);
+       g_signal_connect(G_OBJECT(cancel_button), "clicked",
+                        G_CALLBACK(cancel_clicked), NULL);
+       g_signal_connect(G_OBJECT(refresh_button), "clicked",
+                        G_CALLBACK(refresh_clicked), NULL);
 
        gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 }
 
        gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 }
@@ -376,6 +372,19 @@ static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
        return node;
 }
 
        return node;
 }
 
+static void grouplist_expand_upwards(GtkCTree *ctree, const gchar *name) {
+       const gchar *ptr;
+       gchar *newname=g_malloc0(strlen(name));
+
+       for (ptr=name; *ptr; ptr++) {
+               if (*ptr == '.')
+                       gtk_ctree_expand(ctree, 
+                               grouplist_hash_get_branch_node(newname));
+               newname[ptr-name] = *ptr;
+       }
+       g_free(newname);
+}
+
 static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
 {
        GSList *cur;
 static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
 {
        GSList *cur;
@@ -399,24 +408,15 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
                        locked = FALSE;
                        return;
                }
                        locked = FALSE;
                        return;
                }
-       } else {
-               gtk_signal_handler_block_by_func
-                       (GTK_OBJECT(ctree), GTK_SIGNAL_FUNC(ctree_unselected),
-                        NULL);
+       } else
                gtk_clist_clear(GTK_CLIST(ctree));
                gtk_clist_clear(GTK_CLIST(ctree));
-               gtk_signal_handler_unblock_by_func
-                       (GTK_OBJECT(ctree), GTK_SIGNAL_FUNC(ctree_unselected),
-                        NULL);
-       }
+
        gtk_entry_set_text(GTK_ENTRY(entry), pattern);
 
        grouplist_hash_init();
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        gtk_entry_set_text(GTK_ENTRY(entry), pattern);
 
        grouplist_hash_init();
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        GTK_SIGNAL_FUNC(ctree_selected),
-                                        NULL);
 
        for (cur = group_list; cur != NULL ; cur = cur->next) {
                NewsGroupInfo *ginfo = (NewsGroupInfo *)cur->data;
 
        for (cur = group_list; cur != NULL ; cur = cur->next) {
                NewsGroupInfo *ginfo = (NewsGroupInfo *)cur->data;
@@ -425,14 +425,13 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
                        node = grouplist_create_branch(ginfo, pattern);
                        if (g_slist_find_custom(subscribed, ginfo->name,
                                                (GCompareFunc)g_strcasecmp)
                        node = grouplist_create_branch(ginfo, pattern);
                        if (g_slist_find_custom(subscribed, ginfo->name,
                                                (GCompareFunc)g_strcasecmp)
-                           != NULL)
+                                               != NULL) {
                                gtk_ctree_select(GTK_CTREE(ctree), node);
                                gtk_ctree_select(GTK_CTREE(ctree), node);
+                       }
                }
        }
                }
        }
-
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          GTK_SIGNAL_FUNC(ctree_selected),
-                                          NULL);
+       for (cur = subscribed; cur; cur = g_slist_next(cur))
+               grouplist_expand_upwards(GTK_CTREE(ctree), (gchar *)cur->data);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -456,16 +455,10 @@ static void grouplist_search(void)
 
 static void grouplist_clear(void)
 {
 
 static void grouplist_clear(void)
 {
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        GTK_SIGNAL_FUNC(ctree_unselected),
-                                        NULL);
        gtk_clist_clear(GTK_CLIST(ctree));
        gtk_entry_set_text(GTK_ENTRY(entry), "");
        news_group_list_free(group_list);
        group_list = NULL;
        gtk_clist_clear(GTK_CLIST(ctree));
        gtk_entry_set_text(GTK_ENTRY(entry), "");
        news_group_list_free(group_list);
        group_list = NULL;
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          GTK_SIGNAL_FUNC(ctree_unselected),
-                                          NULL);
 }
 
 static gboolean grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
 }
 
 static gboolean grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
@@ -484,6 +477,15 @@ static gboolean grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
                return TRUE;
 }
 
                return TRUE;
 }
 
+static gint window_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data)
+{
+       ack = FALSE;
+       if (gtk_main_level() > 1)
+               gtk_main_quit();
+
+       return TRUE;
+}
+
 static void ok_clicked(GtkWidget *widget, gpointer data)
 {
        ack = TRUE;
 static void ok_clicked(GtkWidget *widget, gpointer data)
 {
        ack = TRUE;
@@ -511,38 +513,55 @@ static void refresh_clicked(GtkWidget *widget, gpointer data)
        g_free(str);
 }
 
        g_free(str);
 }
 
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
                cancel_clicked(NULL, NULL);
 {
        if (event && event->keyval == GDK_Escape)
                cancel_clicked(NULL, NULL);
+       return FALSE;
 }
 
 }
 
-static void ctree_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
-                          gpointer data)
+/* clist/ctree clear old selection on click (gtk2 only)
+ * - intercept all button clicks (always return TRUE)
+ * - only allow left button single click
+ * - handle click on expander
+ * - update "subscribed" list and un-/select row
+ */
+static gboolean button_press_cb(GtkCTree *ctree, GdkEventButton *button,
+                               gpointer data)
 {
 {
+       gint row, col;
+       GtkCTreeNode *node;
        NewsGroupInfo *ginfo;
        NewsGroupInfo *ginfo;
+       GSList *list;
 
 
-       ginfo = gtk_ctree_node_get_row_data(ctree, node);
-       if (!ginfo) return;
+       if (button->type != GDK_BUTTON_PRESS) return TRUE;
+       if (button->button != 1) return TRUE;
 
 
-       subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
-}
+       gtk_clist_get_selection_info(GTK_CLIST(ctree), 
+                                    button->x, button->y, &row, &col);
+       node = gtk_ctree_node_nth(ctree, row);
+       if (!node) return TRUE;
 
 
-static void ctree_unselected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
-                            gpointer data)
-{
-       NewsGroupInfo *ginfo;
-       GSList *list;
+       if (gtk_ctree_is_hot_spot(ctree, button->x, button->y)) {
+               gtk_ctree_toggle_expansion(ctree, node);
+               return TRUE;
+       }
 
        ginfo = gtk_ctree_node_get_row_data(ctree, node);
 
        ginfo = gtk_ctree_node_get_row_data(ctree, node);
-       if (!ginfo) return;
+       if (!ginfo) return TRUE;
 
        list = g_slist_find_custom(subscribed, ginfo->name,
                                   (GCompareFunc)g_strcasecmp);
        if (list) {
                g_free(list->data);
                subscribed = g_slist_remove(subscribed, list->data);
 
        list = g_slist_find_custom(subscribed, ginfo->name,
                                   (GCompareFunc)g_strcasecmp);
        if (list) {
                g_free(list->data);
                subscribed = g_slist_remove(subscribed, list->data);
+               gtk_clist_unselect_row(GTK_CLIST(ctree), row, 0);
+       } else {
+               subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
+               gtk_clist_select_row(GTK_CLIST(ctree), row, 0);
        }
        }
+
+       return TRUE;
 }
 
 static void entry_activated(GtkEditable *editable)
 }
 
 static void entry_activated(GtkEditable *editable)
Claws Mail