From: Kimmo Varis Date: Thu, 13 Nov 2003 13:03:16 +0000 (+0000) Subject: BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent X-Git-Tag: 2.16.5~7509 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0931aff0908662e69207e15ea3876f79a4bda9cb;p=winmerge-jp%2Fwinmerge-jp.git BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent --- diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 49fea703b..3aa63006f 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -163,6 +163,7 @@ CMainFrame::CMainFrame() m_bAllowMixedEol = theApp.GetProfileInt(_T("Settings"), _T("AllowMixedEOL"), NULL); theApp.SetFileFilterPath(theApp.GetProfileString(_T("Settings"), _T("FileFilterPath"), _T(""))); m_sExtEditorPath = theApp.GetProfileString(_T("Settings"), _T("ExternalEditor"), _T("")); + bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), UNPACK_MANUAL); m_bReuseDirDoc = TRUE; // TODO: read preference for logging @@ -2197,14 +2198,15 @@ void CMainFrame::OnPluginUnpackMode(UINT nID ) bUnpackerMode = UNPACK_AUTO; break; } + theApp.WriteProfileInt(_T("Settings"), _T("UnpackerMode"), bUnpackerMode); } void CMainFrame::OnUpdatePluginUnpackMode(CCmdUI* pCmdUI) { if (pCmdUI->m_nID == ID_UNPACK_MANUAL) - pCmdUI->SetCheck(UNPACK_MANUAL == bUnpackerMode); + pCmdUI->SetRadio(UNPACK_MANUAL == bUnpackerMode); if (pCmdUI->m_nID == ID_UNPACK_AUTO) - pCmdUI->SetCheck(UNPACK_AUTO == bUnpackerMode); + pCmdUI->SetRadio(UNPACK_AUTO == bUnpackerMode); } /** diff --git a/Src/readme.txt b/Src/readme.txt index 0bbc2d332..508fbf4fd 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,6 +1,8 @@ 2003-11-13 Kimmo PATCH: [ 838084 ] Add * to newer file's date field in dir compare WinMerge: DirView.cpp DirViewColHandler.cpp + BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent + WinMerge: MainFrm.cpp 2003-11-13 Laoran PATCH: [ 838354 ] Revisit Speedup Speed up display of large differences