QIF import: Show the druid's documentation pages by default. Previously these pages were hidden by default.

BP


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16976 57a11ea4-9604-0410-9ed3-97b8803252fd

configure.in

@@ -1499,6 +1499,7 @@ AC_CONFIG_FILES(po/Makefile.in
           src/import-export/qif-import/Makefile
           src/import-export/qif/Makefile
           src/import-export/qif/test/Makefile
+          src/import-export/qif-import/schemas/Makefile
           src/import-export/qif-import/test/Makefile
           src/import-export/qif-io-core/Makefile
           src/import-export/qif-io-core/test/Makefile

src/import-export/qif-import/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = . test
+SUBDIRS = . test schemas
 
 pkglib_LTLIBRARIES=libgncmod-qif-import.la
 

src/import-export/qif-import/druid-qif-import.c

@@ -2057,6 +2057,7 @@ gnc_ui_qif_import_druid_make(void)
   
   QIFImportWindow * retval;
   GladeXML        * xml;
+  GError * err = NULL;
   SCM  load_map_prefs;
   SCM  mapping_info;
   SCM  create_ticker_map;
@@ -2209,8 +2210,19 @@ gnc_ui_qif_import_druid_make(void)
   retval->doc_pages        = NULL;
   retval->commodity_pages = NULL;
 
+  /* Get the user's preference for showing documentation pages. */
   retval->show_doc_pages = 
-    gnc_gconf_get_bool("dialogs/import/qif", "show_doc", NULL);
+    gnc_gconf_get_bool("dialogs/import/qif", "show_doc", &err);
+  if (err != NULL) {
+    /* The setting can't be found. */
+    printf("QIF import: gnc_gconf_get_bool error: %s\n", err->message);
+    g_error_free(err);
+
+    /* Show documentation pages by default. */
+    printf("QIF import: Couldn't get show_doc setting from gconf.\n");
+    printf("QIF import: Documentation pages will be shown by default.\n");
+    retval->show_doc_pages = TRUE;
+  }
 
   for(i=0; i < NUM_PRE_PAGES; i++) {
     retval->pre_comm_pages = 

src/import-export/qif-import/schemas/Makefile.am

@@ -0,0 +1,21 @@
+schemadir   = @GCONF_SCHEMA_FILE_DIR@
+schemas_in_files = \
+  apps_gnucash_import_qif.schemas.in
+schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+EXTRA_DIST = $(schemas_in_files)
+
+CLEANFILES = $(schema_DATA)
+
+install-data-local:
+if GCONF_SCHEMAS_INSTALL
+	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+endif
+
+uninstall-local:
+if GCONF_SCHEMAS_INSTALL
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
+endif

src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+  <schemalist>
+
+    <schema>
+      <key>/schemas/apps/gnucash/dialogs/import/qif/show_doc</key>
+      <applyto>/apps/gnucash/dialogs/import/qif/show_doc</applyto>
+      <owner>gnucash</owner>
+      <type>bool</type>
+      <default>TRUE</default>
+      <locale name="C">
+        <short>Show documentation</short>
+        <long>
+          Show some documentation-only pages in QIF Import druid.
+	</long>
+      </locale>
+    </schema>
+
+  </schemalist>
+</gconfschemafile>