r22353 - gnucash/trunk/src/import-export - Bug #682869 - In CSV transaction importer, re-implement double mouse click for file selection.
Mike Evans
mikee at code.gnucash.org
Sat Sep 1 10:54:52 EDT 2012
Author: mikee
Date: 2012-09-01 10:54:52 -0400 (Sat, 01 Sep 2012)
New Revision: 22353
Trac: http://svn.gnucash.org/trac/changeset/22353
Modified:
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-account-import.glade
gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c
Log:
Bug #682869 - In CSV transaction importer, re-implement double mouse click for file selection.
>From a patch by Bob.
Patch also resizes small OK button.
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-30 17:37:05 UTC (rev 22352)
+++ gnucash/trunk/src/import-export/csv-export/assistant-csv-export.c 2012-09-01 14:54:52 UTC (rev 22353)
@@ -145,6 +145,10 @@
DEBUG("file_name selected is %s", info->file_name);
DEBUG("starting directory is %s", info->starting_dir);
+
+ /* Step to next page if page is complete */
+ if(gtk_assistant_get_page_complete(assistant, page))
+ gtk_assistant_set_current_page (assistant, num + 1);
}
@@ -849,7 +853,7 @@
{
GtkBuilder *builder;
GtkWidget *window;
- GtkWidget *box;
+ GtkWidget *box, *h_box;
GtkWidget *button;
GtkWidget *table, *hbox;
time_t start_time, end_time;
@@ -975,11 +979,17 @@
/* File chooser Page */
info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_SAVE);
button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ gtk_widget_set_size_request (button, 100, -1);
gtk_widget_show (button);
- gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), button);
+ h_box = gtk_hbox_new(TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(h_box), button, FALSE, FALSE, 0);
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), h_box);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (csv_export_file_chooser_confirm_cb), info);
+
+
+
box = GTK_WIDGET(gtk_builder_get_object(builder, "file_page"));
gtk_box_pack_start (GTK_BOX (box), info->file_chooser, TRUE, TRUE, 6);
gtk_widget_show (info->file_chooser);
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-30 17:37:05 UTC (rev 22352)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.c 2012-09-01 14:54:52 UTC (rev 22353)
@@ -494,7 +494,7 @@
{
GtkBuilder *builder;
GtkWidget *window;
- GtkWidget *box;
+ GtkWidget *box, *h_box;
GtkWidget *button;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
@@ -511,13 +511,35 @@
/* Load default settings */
load_settings (info);
+ /* Enable buttons on all page. */
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
+ GTK_WIDGET(gtk_builder_get_object(builder, "start_page")),
+ TRUE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
+ GTK_WIDGET(gtk_builder_get_object(builder, "file_page")),
+ FALSE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
+ GTK_WIDGET(gtk_builder_get_object(builder, "import_tree_page")),
+ TRUE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
+ GTK_WIDGET(gtk_builder_get_object(builder, "end_page")),
+ FALSE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
+ GTK_WIDGET(gtk_builder_get_object(builder, "summary_page")),
+ TRUE);
+
/* Start Page */
/* File chooser Page */
info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+ g_signal_connect (G_OBJECT (info->file_chooser), "file-activated",
+ G_CALLBACK (csv_import_file_chooser_confirm_cb), info);
button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ gtk_widget_set_size_request (button, 100, -1);
gtk_widget_show (button);
- gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), button);
+ h_box = gtk_hbox_new(TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(h_box), button, FALSE, FALSE, 0);
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), h_box);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (csv_import_file_chooser_confirm_cb), info);
Modified: gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.glade
===================================================================
--- gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.glade 2012-08-30 17:37:05 UTC (rev 22352)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-account-import.glade 2012-09-01 14:54:52 UTC (rev 22353)
@@ -69,7 +69,6 @@
</child>
</object>
<packing>
- <property name="page_type">progress</property>
<property name="title" translatable="yes">Choose File to Import</property>
</packing>
</child>
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-30 17:37:05 UTC (rev 22352)
+++ gnucash/trunk/src/import-export/csv-import/assistant-csv-trans-import.c 2012-09-01 14:54:52 UTC (rev 22353)
@@ -1666,7 +1666,10 @@
/* File chooser Page */
info->file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+ g_signal_connect (G_OBJECT (info->file_chooser), "file-activated",
+ G_CALLBACK (csv_import_trans_file_chooser_confirm_cb), info);
button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ gtk_widget_set_size_request (button, 100, -1);
gtk_widget_show (button);
h_box = gtk_hbox_new(TRUE, 0);
gtk_box_pack_start(GTK_BOX(h_box), button, FALSE, FALSE, 0);
More information about the gnucash-changes
mailing list