X-Git-Url: https://git.brokenzipper.com/gitweb?p=chaz%2Fhomebank;a=blobdiff_plain;f=src%2Fui-assist-import.h;fp=src%2Fimport.h;h=2cdc89a37b65e08a0271db297f11d0efd66c6bf7;hp=6ef596a420dc8bce7d4a08cc5281afae8e638572;hb=59c5e08a64798d4303ae7eb3a2713bc93d98fa7b;hpb=8988b3bef0760b4cab8144715cc3d8f55688861c

diff --git a/src/import.h b/src/ui-assist-import.h
similarity index 74%
rename from src/import.h
rename to src/ui-assist-import.h
index 6ef596a..2cdc89a 100644
--- a/src/import.h
+++ b/src/ui-assist-import.h
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2014 Maxime DOYEN
+ *  Copyright (C) 1995-2016 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -20,45 +20,20 @@
 #ifndef __HOMEBANK_IMPORT_H__
 #define __HOMEBANK_IMPORT_H__
 
-#define QIF_UNKNOW_ACCOUNT_NAME "(unknown)"
-
 
 enum
 {
-	PAGE_INTRO,
-	PAGE_FILE,
-	PAGE_RESULT,
-	PAGE_OPTIONS,
+	PAGE_WELCOME,
+	PAGE_SELECTFILE,
+	PAGE_IMPORT,
+	PAGE_PROPERTIES,
+	PAGE_ACCOUNT,
+	PAGE_TRANSACTION,
 	PAGE_CONFIRM,
 	NUM_PAGE
 };
 
 
-typedef struct _OfxContext OfxContext;
-struct _OfxContext
-{
-	GList		*trans_list;
-	Account 	*curr_acc;
-	gboolean	curr_acc_isnew;
-};
-
-
-typedef struct _ImportContext ImportContext;
-struct _ImportContext
-{
-	GList		*trans_list;		// trn storage
-	gint 		cnt_initial_acc;	//max key account when start
-	gint		cnt_new_acc;		//
-	gint		cnt_new_ope;
-	gint		cnt_new_pay;
-	gint		cnt_new_cat;
-	gint		datefmt;
-	const gchar		*encoding;
-	gint		cnt_err_date;
-	gint		nb_duplicate;
-};
-
-
 struct import_data
 {
 	GtkWidget	*assistant;
@@ -77,10 +52,10 @@ struct import_data
 	GtkWidget	*TX_filepath;
 	GtkWidget	*TX_filename;
 	GtkWidget	*TX_encoding;
+	GtkWidget	*TX_datefmt;
+
 	GtkWidget	*TX_filedetails;
 
-	GtkWidget	*GR_error;
-	GtkWidget   *GR_options;
 	GtkWidget   *GR_duplicate;
 
 //	GtkWidget	*LA_acc;
@@ -89,9 +64,13 @@ struct import_data
 	GtkWidget	*BT_refresh;
 	GtkWidget	*CY_dateorder;
 
+	GtkWidget   *IM_acc;
+	GtkWidget   *LB_acc;
 	GtkWidget	*LV_acc;
 	GtkWidget	*BT_edit;
 	
+	GtkWidget   *IM_txn;
+	GtkWidget   *LB_txn;
 	GtkWidget	*imported_ope;
 	GtkWidget	*duplicat_ope;
 	
@@ -123,17 +102,18 @@ struct import_data
 
 struct import_target_data
 {
+	GtkWidget   *label1, *label2;
 	GtkWidget	*getwidget1;
 	GtkWidget	*getwidget2;
 	GtkWidget	*radio[2];
 };
 
 
-GtkWidget *ui_import_window_new (void);
+GtkWidget *ui_import_assistant_new (gint filetype);
 Account *import_create_account(gchar *name, gchar *number);
 const gchar *homebank_file_getencoding(gchar *filename);
 gchar *homebank_utf8_ensure(gchar *buffer);
 
-#endif
 
+#endif