r15085 - gnucash/trunk/src/gnome - Activate QSF Import/Export again. This is an unstable branch, after all. Reverts r14147, r14148. bug#342515

[Christian Stimming]

Author: cstim
Date: 2006-11-04 17:06:15 -0500 (Sat, 04 Nov 2006)
New Revision: 15085
Trac: http://svn.gnucash.org/trac/changeset/15085

Modified:
   gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
   gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
Log:
Activate QSF Import/Export again. This is an unstable branch, after all. Reverts r14147, r14148. bug#342515

Modified: gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2006-11-04 21:57:16 UTC (rev 15084)
+++ gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c	2006-11-04 22:06:15 UTC (rev 15085)
@@ -56,9 +56,7 @@
 #include "gnc-session.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
-#ifdef QSF_IMPORT_NO_LONGER_BROKEN
 static QofLogModule log_module = GNC_MOD_GUI;
-#endif
 
 static void gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass);
 static void gnc_plugin_basic_commands_init (GncPluginBasicCommands *plugin);
@@ -69,13 +67,9 @@
 static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *data);
-#ifdef QSF_IMPORT_NO_LONGER_BROKEN
 static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data);
-#endif
 static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data);
-#ifdef QSF_EXPORT_NO_LONGER_BROKEN
 static void gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data);
-#endif
 static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindowActionData *data);
 static void gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindowActionData *data);
@@ -112,22 +106,18 @@
   { "FileSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>s",
     NULL,
     G_CALLBACK (gnc_main_window_cmd_file_save_as) },
-#ifdef QSF_IMPORT_NO_LONGER_BROKEN
   { "FileImportQSFAction", GTK_STOCK_CONVERT,
     N_("_QSF Import"), NULL,
     N_("Import a QSF object file"),
     G_CALLBACK (gnc_main_window_cmd_file_qsf_import) },
-#endif
   { "FileExportAccountsAction", GTK_STOCK_CONVERT,
     N_("Export _Accounts"), NULL,
     N_("Export the account hierarchy to a new GnuCash datafile"),
     G_CALLBACK (gnc_main_window_cmd_file_export_accounts) },
-#ifdef QSF_EXPORT_NO_LONGER_BROKEN
   { "FileExportChartAction", GTK_STOCK_CONVERT,
     N_("Export _Chart of Accounts to QSF"), NULL,
     N_("Export the chart of accounts for a date with balances as QSF"),
     G_CALLBACK (gnc_main_window_cmd_file_chart_export) },
-#endif
 
   /* Edit menu */
 
@@ -359,7 +349,7 @@
   gnc_window_set_progressbar_window (NULL);
   /* FIXME GNOME 2 Port (update the title etc.) */
 }
-#ifdef QSF_IMPORT_NO_LONGER_BROKEN
+
 static void
 qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs )
 {
@@ -412,7 +402,7 @@
   gtk_widget_show (file_select);
   gnc_window_set_progressbar_window(NULL);
 }
-#endif
+
 static void
 gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data)
 {
@@ -425,7 +415,6 @@
   /* gnc_refresh_main_window_info (); */
 }
 
-#ifdef QSF_EXPORT_NO_LONGER_BROKEN
 static void
 gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data)
 {
@@ -437,7 +426,6 @@
   /* FIXME GNOME 2 Port (update the title etc.) */
   /* gnc_refresh_main_window_info (); */
 }
-#endif
 
 static void
 gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data)

Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml	2006-11-04 21:57:16 UTC (rev 15084)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml	2006-11-04 22:06:15 UTC (rev 15085)
@@ -15,12 +15,12 @@
         <menuitem name="FileSave" action="FileSaveAction"/>
         <menuitem name="FileSaveAs" action="FileSaveAsAction"/>
       </placeholder>
-      <!-- menu name="FileImport" action="FileImportAction">
+      <menu name="FileImport" action="FileImportAction">
         <menuitem name="FileImportQSF" action="FileImportQSFAction"/>
-      </menu -->
+      </menu>
       <menu name="FileExport" action="FileExportAction">
         <menuitem name="FileExportAccounts" action="FileExportAccountsAction"/>
-        <!-- menuitem name="FileExportChart" action="FileExportChartAction"/ -->
+        <menuitem name="FileExportChart" action="FileExportChartAction"/>
       </menu>
     </menu>