settings dialog updated to give "Shell Extended" overlay caching option

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index e92b75c..080f306 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Settings/SetOverlayPage.cpp b/src/TortoiseProc/Settings/SetOverlayPage.cpp
index c729d20..e56b962 100644 (file)
--- a/src/TortoiseProc/Settings/SetOverlayPage.cpp
+++ b/src/TortoiseProc/Settings/SetOverlayPage.cpp
@@ -116,6 +116,7 @@ BEGIN_MESSAGE_MAP(CSetOverlayPage, ISettingsPropPage)
        ON_EN_CHANGE(IDC_INCLUDEPATHS, OnChange)\r
        ON_BN_CLICKED(IDC_CACHEDEFAULT, &CSetOverlayPage::OnChange)\r
        ON_BN_CLICKED(IDC_CACHESHELL, &CSetOverlayPage::OnChange)\r
+       ON_BN_CLICKED(IDC_CACHESHELL2, &CSetOverlayPage::OnChange)\r
        ON_BN_CLICKED(IDC_CACHENONE, &CSetOverlayPage::OnChange)\r
        ON_BN_CLICKED(IDC_UNVERSIONEDASMODIFIED, &CSetOverlayPage::OnChange)\r
        ON_BN_CLICKED(IDC_SHOWEXCLUDEDASNORMAL, &CSetOverlayPage::OnChange)\r
@@ -139,6 +140,9 @@ BOOL CSetOverlayPage::OnInitDialog()
        case 2:\r
                CheckRadioButton(IDC_CACHEDEFAULT, IDC_CACHENONE, IDC_CACHESHELL);\r
                break;\r
+       case 3:\r
+               CheckRadioButton(IDC_CACHEDEFAULT, IDC_CACHENONE, IDC_CACHESHELL2);\r
+               break;\r
        }\r
        GetDlgItem(IDC_UNVERSIONEDASMODIFIED)->EnableWindow(m_dwCacheType == 1);\r
        GetDlgItem(IDC_FLOPPY)->EnableWindow(m_bRemovable);\r
@@ -149,6 +153,7 @@ BOOL CSetOverlayPage::OnInitDialog()
        m_tooltips.AddTool(IDC_INCLUDEPATHS, IDS_SETTINGS_INCLUDELIST_TT);\r
        m_tooltips.AddTool(IDC_CACHEDEFAULT, IDS_SETTINGS_CACHEDEFAULT_TT);\r
        m_tooltips.AddTool(IDC_CACHESHELL, IDS_SETTINGS_CACHESHELL_TT);\r
+       m_tooltips.AddTool(IDC_CACHESHELL2, IDS_SETTINGS_CACHESHELL_TT);//TODO: separate tooltip text\r
        m_tooltips.AddTool(IDC_CACHENONE, IDS_SETTINGS_CACHENONE_TT);\r
        m_tooltips.AddTool(IDC_UNVERSIONEDASMODIFIED, IDS_SETTINGS_UNVERSIONEDASMODIFIED_TT);\r
        m_tooltips.AddTool(IDC_SHOWEXCLUDEDASNORMAL, IDS_SETTINGS_SHOWEXCLUDEDASNORMAL_TT);\r
@@ -177,6 +182,9 @@ void CSetOverlayPage::OnChange()
        case IDC_CACHESHELL:\r
                m_dwCacheType = 2;\r
                break;\r
+       case IDC_CACHESHELL2:\r
+               m_dwCacheType = 3;\r
+               break;\r
        case IDC_CACHENONE:\r
                m_dwCacheType = 0;\r
                break;\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index c4d4763..3c979bf 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -1898,7 +1898,7 @@
                />\r
                <Global\r
                        Name="RESOURCE_FILE"\r
-                       Value="\build\x64\TortoiseGit\src\Resources\TortoiseProcENG.rc"\r
+                       Value="\\geo\msdev\TortoiseGit\src\Resources\TortoiseProcENG.rc"\r
                />\r
        </Globals>\r
 </VisualStudioProject>\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index b2e05d7..3d41299 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ