r22283 - gnucash/trunk/src - Cleanups in save/restore window position and sizes
Geert Janssens
gjanssens at code.gnucash.org
Sat Aug 4 12:08:31 EDT 2012
Author: gjanssens
Date: 2012-08-04 12:08:31 -0400 (Sat, 04 Aug 2012)
New Revision: 22283
Trac: http://svn.gnucash.org/trac/changeset/22283
Modified:
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome/assistant-hierarchy.c
gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c
gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c
gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c
gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
Log:
Cleanups in save/restore window position and sizes
- remove depreciated check on GtkObject flags (no longer required imo)
- save position and size on window destruction consistently
- add save and restore to some additional assistants (not all so far)
Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -117,6 +117,7 @@
static void
delete_hierarchy_dialog (hierarchy_data *data)
{
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(data->dialog));
gtk_widget_destroy (data->dialog);
}
@@ -1117,6 +1118,8 @@
data->balance_hash = g_hash_table_new(NULL, NULL);
+ gnc_restore_window_size (GCONF_SECTION, GTK_WINDOW(data->dialog));
+
g_signal_connect (G_OBJECT(dialog), "destroy",
G_CALLBACK (gnc_hierarchy_destroy_cb), data);
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -206,9 +206,6 @@
g_return_if_fail(section != NULL);
g_return_if_fail(window != NULL);
- if (GTK_OBJECT_FLAGS(window) & GTK_IN_DESTRUCTION)
- return;
-
if (!gnc_gconf_get_bool(GCONF_GENERAL, KEY_SAVE_GEOMETRY, NULL))
return;
Modified: gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/import-export/aqbanking/assistant-ab-initial.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -62,6 +62,7 @@
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_ASSISTANT;
+#define GCONF_SECTION "dialogs/ab_initial"
#define ASSISTANT_AB_INITIAL_CM_CLASS "assistant-ab-initial"
typedef struct _ABInitialInfo ABInitialInfo;
@@ -822,6 +823,7 @@
{
ABInitialInfo *info = user_data;
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
gtk_widget_destroy(info->window);
}
@@ -893,6 +895,8 @@
selection = gtk_tree_view_get_selection(info->account_view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+ gnc_restore_window_size (GCONF_SECTION, GTK_WINDOW(info->window));
+
g_signal_connect(info->account_view, "row-activated",
G_CALLBACK(account_list_clicked_cb), info);
Modified: gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c
===================================================================
--- gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -745,7 +745,6 @@
gnc_gconf_set_int(GCONF_SECTION, PANED_POSITION,
gtk_paned_get_position(GTK_PANED(info->csva.paned)), NULL);
gnc_set_default_directory(GCONF_SECTION, info->starting_dir);
- gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
if (info->failed)
text = _("There was a problem with the export, this could be due to lack of space, "
@@ -838,6 +837,7 @@
g_free(info->file_name);
g_free(info->starting_dir);
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
gtk_widget_destroy (info->window);
}
Modified: gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -372,7 +372,6 @@
/* Save the Window size and directory */
gnc_set_default_directory(GCONF_SECTION, info->starting_dir);
- gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
/* Enable the Assistant Buttons */
gtk_assistant_set_page_complete (assistant, page, TRUE);
@@ -483,6 +482,7 @@
g_free(info->file_name);
g_string_free(info->regexp, TRUE);
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
gtk_widget_destroy (info->window);
}
Modified: gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -1503,7 +1503,6 @@
/* Save the Window size and directory */
gnc_set_default_directory(GCONF_SECTION, info->starting_dir);
- gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
/* Remove the added button */
gtk_assistant_remove_action_widget (assistant, info->help_button);
@@ -1612,6 +1611,7 @@
if (!(info->gnc_csv_importer_gui == NULL))
info->gnc_csv_importer_gui = NULL;
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(info->window));
gtk_widget_destroy (info->window);
}
Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2012-08-04 12:05:52 UTC (rev 22282)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c 2012-08-04 16:08:31 UTC (rev 22283)
@@ -3617,6 +3617,8 @@
box = GTK_WIDGET(gtk_builder_get_object (builder, "currency_picker_hbox"));
gtk_box_pack_start(GTK_BOX(box), qif_win->currency_picker, TRUE, TRUE, 0);
+ gnc_restore_window_size (GCONF_SECTION, GTK_WINDOW(qif_win->window));
+
g_signal_connect( qif_win->window, "destroy",
G_CALLBACK(gnc_ui_qif_import_assistant_destroy), qif_win );
@@ -3638,6 +3640,8 @@
gnc_ui_qif_import_assistant_close_handler( gpointer user_data )
{
QIFImportWindow *qif_win = user_data;
+
+ gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(qif_win->window));
gtk_widget_destroy( qif_win->window );
}
More information about the gnucash-changes
mailing list