AUDIT: r23525 - gnucash/trunk/src/import-export/qif-import - Qif Import Assistant: Don't disable the whole dialog, just the Forward button

John Ralls jralls at code.gnucash.org
Mon Dec 9 22:34:27 EST 2013


Author: jralls
Date: 2013-12-09 22:34:27 -0500 (Mon, 09 Dec 2013)
New Revision: 23525
Trac: http://svn.gnucash.org/trac/changeset/23525

Modified:
   gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
   gnucash/trunk/src/import-export/qif-import/assistant-qif-import.glade
Log:
Qif Import Assistant: Don't disable the whole dialog, just the Forward button

The Qif import assistant would at many steps block entirely, requiring the
user to either do whatever is necessary to move forward or to quit and
restart Gnucash. That's a bit rude, so set pages as GTK_ASSISTANT_TYPE_CONTENT
instead of GTK_ASSISTANT_TYPE_PROGRESS.

Fix the file selection page so that the forward button isn't enabled until
a file is selected.

BP

Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c	2013-12-09 09:36:00 UTC (rev 23524)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.c	2013-12-10 03:34:27 UTC (rev 23525)
@@ -1548,7 +1548,7 @@
     GtkWidget *page = gtk_assistant_get_nth_page (assistant, num);
 
     /* Enable the Assistant Buttons */
-    gtk_assistant_set_page_complete (assistant, page, TRUE);
+    gtk_assistant_set_page_complete (assistant, page, FALSE);
 }
 
 

Modified: gnucash/trunk/src/import-export/qif-import/assistant-qif-import.glade
===================================================================
--- gnucash/trunk/src/import-export/qif-import/assistant-qif-import.glade	2013-12-09 09:36:00 UTC (rev 23524)
+++ gnucash/trunk/src/import-export/qif-import/assistant-qif-import.glade	2013-12-10 03:34:27 UTC (rev 23525)
@@ -99,7 +99,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Select a QIF file to load</property>
       </packing>
     </child>
@@ -246,7 +246,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Load QIF files</property>
       </packing>
     </child>
@@ -307,7 +307,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Set a date format for this QIF file</property>
       </packing>
     </child>
@@ -393,7 +393,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Set the default QIF account name</property>
         <property name="complete">True</property>
       </packing>
@@ -515,7 +515,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Accounts and stock holdings</property>
       </packing>
     </child>
@@ -621,7 +621,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Match QIF accounts with GnuCash accounts</property>
       </packing>
     </child>
@@ -649,7 +649,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Income and Expense categories</property>
       </packing>
     </child>
@@ -755,7 +755,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Match QIF categories with GnuCash accounts</property>
       </packing>
     </child>
@@ -781,7 +781,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Payees and memos</property>
       </packing>
     </child>
@@ -887,7 +887,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Match payees/memos to GnuCash accounts</property>
       </packing>
     </child>
@@ -998,12 +998,12 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Tradable commodities</property>
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="convert_progress_page">
+      <object class="GtkVBox" id="convert_content_page">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">12</property>
@@ -1173,7 +1173,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Match existing transactions</property>
       </packing>
     </child>
@@ -1272,7 +1272,7 @@
         </child>
       </object>
       <packing>
-        <property name="page_type">progress</property>
+        <property name="page_type">content</property>
         <property name="title" translatable="yes">Select possible duplicates</property>
       </packing>
     </child>



More information about the gnucash-changes mailing list