BUG: [ 1535835 ] Import settings from the file

diff --git a/Src/Changes.txt b/Src/Changes.txt
index b8d2ef7..ae739c3 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-08-08 Kimmo
+ BUG: [ 1535835 ] Import settings from the file
+  Src/Common: PreferencesDlg.cpp PreferencesDlg.h
+
 2006-08-07 Jochen
  PATCH: [ 1514487 ] Merge7z DllBuild 0018
   Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h

diff --git a/Src/Common/PreferencesDlg.cpp b/Src/Common/PreferencesDlg.cpp
index 36cfb35..7078443 100644 (file)
--- a/Src/Common/PreferencesDlg.cpp
+++ b/Src/Common/PreferencesDlg.cpp
@@ -17,6 +17,7 @@
 #include "SyntaxColors.h"
 #include "PreferencesDlg.h"
 #include "MainFrm.h"
+#include "coretools.h" //SplitFilename()
 #include "Merge.h" // SelectFile()
 
 #include "winclasses.h"
@@ -252,16 +253,16 @@ void CPreferencesDlg::ReadOptions(BOOL bUpdate)
 
        if (bUpdate)
        {
-               m_pageGeneral.UpdateData(FALSE);
-               m_pageMergeColors.UpdateData(FALSE);
-               m_pageTextColors.UpdateData(FALSE);
-               m_pageSyntaxColors.UpdateData(FALSE);
-               m_pageSystem.UpdateData(FALSE);
-               m_pageCompare.UpdateData(FALSE);
-               m_pageEditor.UpdateData(FALSE);
-               m_pageCodepage.UpdateData(FALSE);
-               m_pageVss.UpdateData(FALSE);
-               m_pageArchive.UpdateData(FALSE);
+               SafeUpdatePage(&m_pageMergeColors, FALSE);
+               SafeUpdatePage(&m_pageMergeColors, FALSE);
+               SafeUpdatePage(&m_pageTextColors, FALSE);
+               SafeUpdatePage(&m_pageSyntaxColors, FALSE);
+               SafeUpdatePage(&m_pageSystem, FALSE);
+               SafeUpdatePage(&m_pageCompare, FALSE);
+               SafeUpdatePage(&m_pageEditor, FALSE);
+               SafeUpdatePage(&m_pageCodepage, FALSE);
+               SafeUpdatePage(&m_pageVss, FALSE);
+               SafeUpdatePage(&m_pageArchive, FALSE);
        }
 }
 
@@ -312,14 +313,40 @@ void CPreferencesDlg::OnImportButton()
  */
 void CPreferencesDlg::OnExportButton()
 {
-       CString s;
+       CString settingsFile;
        CString caption;
        VERIFY(caption.LoadString(IDS_OPT_EXPORT_CAPTION));
-       if (SelectFile(s, NULL, caption, IDS_INIFILES, FALSE))
+       if (SelectFile(settingsFile, NULL, caption, IDS_INIFILES, FALSE))
        {
-               if (m_pOptionsMgr->ExportOptions(s) == OPT_OK)
+               // Add settings file extension if it is missing
+               // So we allow 'filename.otherext' but add extension for 'filename'
+               CString filename;
+               CString extension;
+               SplitFilename(settingsFile, NULL, &filename, &extension);
+               if (extension.IsEmpty())
+               {
+                       CString settingsFileExt(_T("ini"));
+                       settingsFile += _T(".");
+                       settingsFile += settingsFileExt;
+               }
+
+               if (m_pOptionsMgr->ExportOptions(settingsFile) == OPT_OK)
                        AfxMessageBox(IDS_OPT_EXPORT_DONE, MB_ICONINFORMATION);
                else
                        AfxMessageBox(IDS_OPT_EXPORT_ERR, MB_ICONWARNING);
        }
 }
+
+/**
+ * @brief Do a safe UpdateData call for propertypage.
+ * This function does safe UpdateData call for given propertypage. As it is,
+ * all propertypages may not have been yet initialized properly, so we must
+ * have some care when calling updateData for them.
+ * @param [in] pPage Propertypage to update.
+ * @param bSaveAndValidate UpdateData direction parameter.
+ */
+void CPreferencesDlg::SafeUpdatePage(CPropertyPage* pPage, BOOL bSaveAndValidate)
+{
+       if (pPage->GetSafeHwnd() != NULL)
+               pPage->UpdateData(bSaveAndValidate);
+}

diff --git a/Src/Common/PreferencesDlg.h b/Src/Common/PreferencesDlg.h
index 3cb512c..8ec3454 100644 (file)
--- a/Src/Common/PreferencesDlg.h
+++ b/Src/Common/PreferencesDlg.h
@@ -99,6 +99,7 @@ protected:
        CString GetItemPath(HTREEITEM hti);
        void ReadOptions(BOOL bUpdate = FALSE);
        void SaveOptions();
+       void SafeUpdatePage(CPropertyPage* pPage, BOOL bSaveAndValidate);
 
 private:
        COptionsMgr *m_pOptionsMgr;