Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 32 insertions, 27 deletions

diff --git a/app/bin/include/paramfilelist.h b/app/bin/include/paramfilelist.h
index a1c081d..2893292 100644
--- a/app/bin/include/paramfilelist.h
+++ b/app/bin/include/paramfilelist.h
@@ -1,32 +1,37 @@
 #ifndef HAVE_PARAMFILELIST_H
-	#define HAVE_PARAMFILELIST_H
-	#include <stdbool.h>
-	#include "include/paramfile.h"
+#define HAVE_PARAMFILELIST_H
+#include <stdbool.h>
+#include "include/paramfile.h"
 
-	typedef struct {
-		char * name;				/** < name of parameter file */
-		char * contents;
-		bool deleted;
-		bool valid;					/** < FALSE for dropped file */
-		bool favorite;
-		enum paramFileState trackState;
-	} paramFileInfo_t;
-	typedef paramFileInfo_t * paramFileInfo_p;
+typedef struct {
+	char * name;				/** < name of parameter file */
+	char * contents;
+	int deleted;
+	int deletedShadow;
+	int valid;					/** < FALSE for dropped file */
+	bool favorite;
+	enum paramFileState trackState;
+	enum paramFileState structureState;
+} paramFileInfo_t;
+typedef paramFileInfo_t * paramFileInfo_p;
 
-	#define paramFileInfo(N) DYNARR_N( paramFileInfo_t, paramFileInfo_da, N )
-	
-	char *GetParamFileDir(void);
-	void SetParamFileDir(char *fullPath);
-	void LoadParamFileList(void);
-	BOOL_T ReadDefaultParams(const char * dirName);
-	void SaveParamFileList(void);
-	int GetParamFileCount();
-	void UpdateParamFileList(void);
-	void ParamFilesChange(long changes);
-	int LoadParamFile(int files, char ** fileName, void * data);
-	BOOL_T ParamFileListInit(void);
+#define paramFileInfo(N) DYNARR_N( paramFileInfo_t, paramFileInfo_da, N )
 
-	void SearchUiOk(void * junk);
-	bool ReloadParamFile(wIndex_t index);
-	bool UnloadParamFile(wIndex_t fileIndex);
+char *GetParamFileDir(void);
+void SetParamFileDir(char *fullPath);
+void LoadParamFileList(void);
+//BOOL_T ReadDefaultParams(const char * dirName);
+void SaveParamFileList(void);
+int GetParamFileCount();
+void UpdateParamFileList(void);
+void ParamFilesChange(long changes);
+int LoadParamFile(int files, char ** fileName, void * data);
+//	void InitializeParamDir(void);
+void ParamFileListConfirmChange(void);
+void ParamFileListCancelChange(void);
+BOOL_T ParamFileListInit(void);
+
+void SearchUiOk(void * junk);
+bool ReloadParamFile(wIndex_t index);
+bool UnloadParamFile(wIndex_t fileIndex);
 #endif // !HAVE_PARAMFILELIST_H