/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
+ * 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
#include <glib/gi18n.h>
#include <string.h>
#include <gtk/gtk.h>
-#include <gtk/gtktext.h>
#include <gdk/gdkkeysyms.h>
#include "utils.h"
GtkWidget *vbox;
GtkWidget *paned;
GtkWidget *scrolledwindow1;
- GtkWidget *scrolledwindow2;
GtkWidget *tree_view;
GtkWidget *table2;
GtkWidget *pagelabel;
return f1 < f2 ? -1 : (f1 > f2 ? 1 :
(i1 < i2 ? 1 : (i1 > i2 ? -1 : 0)));
}
-
+
+static void prefswindow_build_page(PrefsWindow *prefswindow, PrefsPage *page)
+{
+ GtkWidget *scrolledwin, *tmp;
+
+ if (!page->page_open) {
+ scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(scrolledwin);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwin),
+ page->widget);
+
+ gtk_container_add(GTK_CONTAINER(prefswindow->notebook), scrolledwin);
+ tmp = gtk_bin_get_child(GTK_BIN(scrolledwin));
+
+ gtk_widget_realize(tmp);
+ gtk_widget_realize(page->widget);
+
+ page->widget = scrolledwin;
+ page->page_open = TRUE;
+ }
+}
+
static void prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_pages)
{
GSList *cur;
for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
PrefsPage *page = (PrefsPage *) cur->data;
- if (!page->page_open) {
- page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
- gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
- page->page_open = TRUE;
- }
+ prefswindow_build_page(prefswindow, page);
}
prefs_pages = g_slist_reverse(prefs_pages);
}
static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
PrefsWindow *prefswindow,
- gboolean preload_pages,
- gboolean activate_child)
+ gboolean preload_pages)
{
GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(tree_view)));
gtk_tree_model_foreach(GTK_TREE_MODEL(store),
(GtkTreeModelForeachFunc) find_node_by_name,
&find_name);
- if (find_name.found) {
+ if (find_name.found && page->path[i] != page->path[i-1]) {
node = find_name.node;
gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
PREFS_PAGE_DATA, &prefs_node,
#ifndef GENERIC_UMPC
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
- if (activate_child && gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
+ if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
GtkTreeIter parent = iter;
if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, &parent))
iter = parent;
void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
gpointer data, GDestroyNotify func,
gint *save_width, gint *save_height,
- gboolean preload_pages, gboolean activate_child,
+ gboolean preload_pages,
PrefsOpenCallbackFunc open_cb,
PrefsCloseCallbackFunc close_cb)
{
gint y = gdk_screen_height();
static GdkGeometry geometry;
GtkAdjustment *adj;
- GtkWidget *tmp;
prefswindow = g_new0(PrefsWindow, 1);
gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
- prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_show(prefswindow->scrolledwindow2);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
prefswindow->notebook = gtk_notebook_new();
gtk_widget_show(prefswindow->notebook);
gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefswindow->notebook), TRUE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(prefswindow->notebook), FALSE);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2),
- prefswindow->notebook);
- tmp = gtk_bin_get_child(GTK_BIN(prefswindow->scrolledwindow2));
- gtk_viewport_set_shadow_type(GTK_VIEWPORT(tmp), GTK_SHADOW_NONE);
- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2,
+
+ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->notebook,
0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 4);
prefswindow->empty_page = gtk_label_new("");
gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
prefswindow_build_tree(prefswindow->tree_view, prefs_pages, prefswindow,
- preload_pages, activate_child);
+ preload_pages);
if (open_cb)
open_cb(GTK_WINDOW(prefswindow->window));
gtk_widget_show_all(prefswindow->confirm_area);
gtk_widget_show(prefswindow->vbox);
gtk_widget_show(prefswindow->scrolledwindow1);
- gtk_widget_show(prefswindow->scrolledwindow2);
gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->confirm_area, FALSE, FALSE, 0);
GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
gtk_adjustment_set_value(adj, adj->lower);
gtk_adjustment_changed(adj);
- adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
- gtk_adjustment_set_value(adj, adj->lower);
- gtk_adjustment_changed(adj);
- adj = gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
- gtk_adjustment_set_value(adj, adj->lower);
- gtk_adjustment_changed(adj);
}
void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
PrefsCloseCallbackFunc close_cb)
{
prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
- FALSE, FALSE, open_cb, close_cb);
+ FALSE, open_cb, close_cb);
}
/*!
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
/* don't try to save size to NULL pointers */
if (prefswindow && prefswindow->save_width && prefswindow->save_height) {
GtkTreeIter iter;
GtkAdjustment *adj;
+ if (gtk_tree_path_get_depth(path) < 2)
+ return FALSE;
#ifndef GENERIC_UMPC
if (currently_selected)
return TRUE;
return TRUE;
}
- if (!page->page_open) {
- page->create_widget(page, GTK_WINDOW(prefswindow->window), prefswindow->data);
- gtk_container_add(GTK_CONTAINER(prefswindow->notebook), page->widget);
- page->page_open = TRUE;
- }
+ prefswindow_build_page(prefswindow, page);
i = 0;
while (page->path[i + 1] != 0)
pagenum);
adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+ GTK_SCROLLED_WINDOW(page->widget));
gtk_adjustment_set_value(adj, adj->lower);
gtk_adjustment_changed(adj);
adj = gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+ GTK_SCROLLED_WINDOW(page->widget));
gtk_adjustment_set_value(adj, adj->lower);
gtk_adjustment_changed(adj);
projects / claws.git / blobdiff