/*
* 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 <glib.h>
#include <glib/gi18n.h>
#include <string.h>
#include <gtk/gtk.h>
-#include <gtk/gtktext.h>
#include <gdk/gdkkeysyms.h>
#include "utils.h"
#include "prefswindow.h"
#include "gtkutils.h"
#include "prefs_common.h"
+#include "gtk/manage_window.h"
enum {
PREFS_PAGE_TITLE, /* page title */
GtkWidget *vbox;
GtkWidget *paned;
GtkWidget *scrolledwindow1;
- GtkWidget *scrolledwindow2;
GtkWidget *tree_view;
GtkWidget *table2;
GtkWidget *pagelabel;
GtkWidget *labelframe;
- GtkWidget *frame;
+ GtkWidget *vbox2;
GtkWidget *notebook;
GtkWidget *confirm_area;
GtkWidget *ok_btn;
GtkWidget *apply_btn;
gint *save_width;
gint *save_height;
+ PrefsCloseCallbackFunc open_cb;
+ PrefsCloseCallbackFunc close_cb;
GtkWidget *empty_page;
gpointer data;
GSList *prefs_pages;
- GtkDestroyNotify func;
+ GDestroyNotify func;
};
struct _PrefsTreeNode
}
}
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
static void prefs_show_sections(PrefsWindow *prefswindow)
{
gint max;
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
save_all_pages(prefswindow->prefs_pages);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
prefs_show_sections(prefswindow);
#endif
}
close_all_pages(prefswindow->prefs_pages);
+ if (prefswindow->close_cb)
+ prefswindow->close_cb(GTK_WINDOW(prefswindow->window));
+
gtk_widget_destroy(prefswindow->window);
g_slist_free(prefswindow->prefs_pages);
if(prefswindow->func != NULL)
close_prefs_window(prefswindow);
}
}
-
+#ifndef MAEMO
static void cancel_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
close_prefs_window(prefswindow);
}
-
+#endif
static gboolean window_closed(GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
save_all_pages(prefswindow->prefs_pages);
#endif
close_prefs_window(prefswindow);
return FALSE;
}
-
+#ifndef MAEMO
static gboolean prefswindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
PrefsWindow *data)
{
if (event) {
switch (event->keyval) {
- case GDK_Escape :
-#ifndef MAEMO
+ case GDK_KEY_Escape :
cancel_button_clicked(NULL, data);
-#else
- ok_button_clicked(NULL, data);
-#endif
break;
- case GDK_Return :
- case GDK_KP_Enter :
+ case GDK_KEY_Return :
+ case GDK_KEY_KP_Enter :
focused_child = gtkut_get_focused_child
(GTK_CONTAINER(data->notebook));
/* Press ok, if the focused child is not a text view
}
return FALSE;
}
-
+#endif
typedef struct FindNodeByName {
const gchar *name;
gboolean found;
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)));
GSList *cur;
gint index; /* index in pages list */
+#ifndef GENERIC_UMPC
GtkTreeSelection *selection;
GtkTreeIter iter;
- GtkAdjustment *adj;
+#endif
for (cur = prefs_pages, index = 0; cur != NULL; cur = g_slist_next(cur), index++) {
PrefsPage *page = (PrefsPage *)cur->data;
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,
prefswindow_build_all_pages(prefswindow, prefs_pages);
/* select first one or its first child if necessary */
+#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;
}
gtk_tree_selection_select_iter(selection, &iter);
}
-
- adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
- gtk_adjustment_set_value(adj, 0);
- adj = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
- gtk_adjustment_set_value(adj, 0);
- adj = gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
- gtk_adjustment_set_value(adj, 0);
+#endif
}
void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
- gpointer data, GtkDestroyNotify func,
+ 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)
{
PrefsWindow *prefswindow;
gint x = gdk_screen_width();
gint y = gdk_screen_height();
static GdkGeometry geometry;
+ GtkAdjustment *adj;
prefswindow = g_new0(PrefsWindow, 1);
prefswindow->prefs_pages = g_slist_copy(prefs_pages);
prefswindow->save_width = save_width;
prefswindow->save_height = save_height;
+ prefswindow->open_cb = open_cb;
+ prefswindow->close_cb = close_cb;
prefswindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefswindow");
gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
gtk_window_set_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
+ gtk_window_set_transient_for (GTK_WINDOW(prefswindow->window),
+ GTK_WINDOW(mainwindow_get_mainwindow()->window));
gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
prefswindow->vbox = gtk_vbox_new(FALSE, 6);
prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(prefswindow->scrolledwindow1);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
+ GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
prefswindow->tree_view);
- prefswindow->frame = gtk_frame_new(NULL);
- gtk_widget_show(prefswindow->frame);
- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
+ prefswindow->vbox2 = gtk_vbox_new(FALSE, 2);
+ gtk_widget_show(prefswindow->vbox2);
- gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->frame);
+ gtk_paned_add2(GTK_PANED(prefswindow->paned), prefswindow->vbox2);
prefswindow->table2 = gtk_table_new(1, 2, FALSE);
gtk_widget_show(prefswindow->table2);
- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
+ gtk_container_add(GTK_CONTAINER(prefswindow->vbox2), prefswindow->table2);
prefswindow->labelframe = gtk_frame_new(NULL);
gtk_widget_show(prefswindow->labelframe);
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);
- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->scrolledwindow2,
- 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 8, 8);
+
+ 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_widget_show(prefswindow->empty_page);
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_grab_focus(prefswindow->tree_view);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
gtkut_stock_button_set_create(&prefswindow->confirm_area,
&prefswindow->apply_btn, GTK_STOCK_APPLY,
&prefswindow->cancel_btn, GTK_STOCK_CANCEL,
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);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
G_CALLBACK(ok_button_clicked), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked",
G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
#endif
- /* connect to callback only if we hhave non-NULL pointers to store size to */
+ /* connect to callback only if we have non-NULL pointers to store size to */
if (prefswindow->save_width && prefswindow->save_height) {
g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
G_CALLBACK(prefs_size_allocate_cb), prefswindow);
}
+ MANAGE_WINDOW_SIGNALS_CONNECT(prefswindow->window);
+
if (!geometry.min_height) {
if (x < 800 && y < 600) {
*(prefswindow->save_height));
}
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
prefs_show_sections(prefswindow);
#endif
gtk_widget_show(prefswindow->window);
#ifdef MAEMO
maemo_window_full_screen_if_needed(GTK_WINDOW(prefswindow->window));
#endif
+ adj = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
+ gtk_adjustment_changed(adj);
}
void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
- gint *save_width, gint *save_height)
+ gint *save_width, gint *save_height,
+ PrefsOpenCallbackFunc open_cb,
+ PrefsCloseCallbackFunc close_cb)
{
prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
- FALSE, FALSE);
+ 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) {
PrefsTreeNode *prefsnode;
PrefsPage *page;
PrefsWindow *prefswindow = (PrefsWindow *) data;
+ gfloat lower;
gchar *labeltext;
gint pagenum, i;
GtkTreeIter iter;
GtkAdjustment *adj;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
if (currently_selected)
return TRUE;
#endif
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_adjustment_set_value(adj, 0);
+ GTK_SCROLLED_WINDOW(page->widget));
+ lower = gtk_adjustment_get_lower(adj);
+ gtk_adjustment_set_value(adj, lower);
+ gtk_adjustment_changed(adj);
adj = gtk_scrolled_window_get_hadjustment(
- GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
- gtk_adjustment_set_value(adj, 0);
+ GTK_SCROLLED_WINDOW(page->widget));
+ gtk_adjustment_set_value(adj, lower);
+ gtk_adjustment_changed(adj);
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
prefs_show_page(prefswindow);
#endif
return TRUE;
projects / claws.git / blobdiff