diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:09 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:09 +0200 |
| commit | 110fc5dee14fc7988f631a158e50d283446aba7a (patch) | |
| tree | 7c19dfd3bdb8c4636409ec80a38c70499ac006db /lib/process_xml.h | |
| parent | 5.14 (diff) | |
| download | FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.gz FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.bz2 FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.zip | |
5.15
Diffstat (limited to 'lib/process_xml.h')
| -rw-r--r-- | lib/process_xml.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/lib/process_xml.h b/lib/process_xml.h index 9dda330e..8a65d67a 100644 --- a/lib/process_xml.h +++ b/lib/process_xml.h @@ -99,6 +99,8 @@ struct OptionalDialogs bool warningUnresolvedConflicts; bool warningDatabaseError; bool warningRecyclerMissing; + bool warningInputFieldEmpty; + bool warningDirectoryLockFailed; bool popupOnConfigChange; bool confirmSyncStart; }; @@ -124,7 +126,7 @@ struct ViewFilterDefault bool createLeft, createRight, updateLeft, updateRight, deleteLeft, deleteRight, doNothing; //action view }; -wxString getGlobalConfigFile(); +Zstring getGlobalConfigFile(); struct XmlGlobalSettings { @@ -173,6 +175,23 @@ struct XmlGlobalSettings cfgFileHistMax(30), folderHistMax(15), onCompletionHistoryMax(8), +#ifdef FFS_WIN + defaultExclusionFilter(Zstr("\\System Volume Information\\") Zstr("\n") + Zstr("\\$Recycle.Bin\\") Zstr("\n") + Zstr("\\RECYCLER\\") Zstr("\n") + Zstr("\\RECYCLED\\") Zstr("\n") + Zstr("*\\desktop.ini") Zstr("\n") + Zstr("*\\thumbs.db")), +#elif defined FFS_LINUX + defaultExclusionFilter(Zstr("/.Trash-*/") Zstr("\n") + Zstr("/.recycle/")), +#elif defined FFS_MAC + defaultExclusionFilter(Zstr("/.fseventsd/") Zstr("\n") + Zstr("/.Spotlight-V100/") Zstr("\n") + Zstr("/.Trashes/") Zstr("\n") + Zstr("/._.Trashes") Zstr("\n") + Zstr("*/.DS_Store")), +#endif //deleteOnBothSides(false), useRecyclerForManualDeletion(true), //enable if OS supports it; else user will have to activate first and then get an error message #if defined FFS_WIN || defined FFS_MAC @@ -218,10 +237,10 @@ struct XmlGlobalSettings ExternalApps externelApplications; - std::vector<wxString> cfgFileHistory; + std::vector<Zstring> cfgFileHistory; size_t cfgFileHistMax; - std::vector<wxString> lastUsedConfigFiles; + std::vector<Zstring> lastUsedConfigFiles; std::vector<Zstring> folderHistoryLeft; std::vector<Zstring> folderHistoryRight; @@ -230,6 +249,8 @@ struct XmlGlobalSettings std::vector<std::wstring> onCompletionHistory; size_t onCompletionHistoryMax; + Zstring defaultExclusionFilter; + //bool deleteOnBothSides; bool useRecyclerForManualDeletion; bool textSearchRespectCase; |