Tweaks to Settings, General. Added some _T() forgotten on earlier commits. Disabled...

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 387b491..97885fa 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -504,11 +504,11 @@ BOOL CGit::CheckMsysGitDir()
                CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
                str=msysinstalldir;\r
         // check it has a trailing blank\r
-        if (str.Right(1) != "\\")\r
+        if (str.Right(1) != _T("\\"))\r
         {\r
-            str += "\\";\r
+            str += _T("\\");\r
         }\r
-               str+="bin";\r
+               str+=_T("bin");\r
                msysdir=str;\r
                msysdir.write();\r
 \r
@@ -538,7 +538,7 @@ BOOL CGit::CheckMsysGitDir()
        if ( oldpath_s.Find( path ) < 0  &&  oldpath_s.Right( unterminated_path.GetLength() ) != unterminated_path )\r
        {\r
                // not already there, see if we have to take out one we added last time\r
-               if ( ms_LastMsysGitDir != "" )\r
+               if ( ms_LastMsysGitDir != _T("") )\r
                {\r
                        // we have added one so take it out\r
                        int index = oldpath_s.Find( ms_LastMsysGitDir );\r

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 0a1b783..5cc9561 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Settings/SetMainPage.cpp b/src/TortoiseProc/Settings/SetMainPage.cpp
index b479277..a8e9e1c 100644 (file)
--- a/src/TortoiseProc/Settings/SetMainPage.cpp
+++ b/src/TortoiseProc/Settings/SetMainPage.cpp
@@ -89,6 +89,8 @@ BOOL CSetMainPage::OnInitDialog()
        // disable features that have not yet been implemented\r
        GetDlgItem(IDC_CHECKNEWERVERSION)->EnableWindow( FALSE );\r
        GetDlgItem(IDC_CHECKNEWERBUTTON)->EnableWindow( FALSE );\r
+       GetDlgItem(IDC_SOUNDS)->EnableWindow( FALSE );\r
+       GetDlgItem(IDC_SOUNDS_TEXT)->EnableWindow( FALSE );\r
        \r
        EnableToolTips();\r
 \r

diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp
index 2d100c7..e6560a6 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.cpp
+++ b/src/TortoiseProc/TortoiseProc.cpp
@@ -58,16 +58,16 @@ BEGIN_MESSAGE_MAP(CTortoiseProcApp, CWinAppEx)
        ON_COMMAND(ID_HELP, CWinAppEx::OnHelp)\r
 END_MESSAGE_MAP()\r
 \r
-CString g_version;\r
+//CString g_version;\r
 //CString CGit::m_MsysGitPath;\r
 //////////////////////////////////////////////////////////////////////////\r
 \r
 CTortoiseProcApp::CTortoiseProcApp()\r
 {\r
        EnableHtmlHelp();\r
-       int argc = 0;\r
-       g_version=_T("abc");\r
-       const char* const * argv = NULL;\r
+//     int argc = 0;\r
+//     g_version=_T("abc");\r
+//     const char* const * argv = NULL;\r
 //     apr_app_initialize(&argc, &argv, NULL);\r
 //     svn_dso_initialize2();\r
        SYS_IMAGE_LIST();\r
@@ -126,16 +126,16 @@ BOOL CTortoiseProcApp::InitInstance()
                if(CMessageBox::Show(NULL,_T("MSysGit(http://code.google.com/p/msysgit) have not installed Correctly\n\\r
 or MSysGit Path setting error\n\\r
 Click Yes to open setting dialog to setup MSysGit Path"),\r
-                                                       _T("TortoiseGit"),MB_YESNO|MB_ICONERROR)==IDYES);\r
+                                                       _T("TortoiseGit"),MB_YESNO|MB_ICONERROR)==IDYES)\r
                {\r
-                       //todo open setting\r
-                               CSettings dlg(IDS_PROC_SETTINGS_TITLE);\r
-                               dlg.SetTreeViewMode(TRUE, TRUE, TRUE);\r
-                               dlg.SetTreeWidth(220);\r
-\r
-                               dlg.DoModal();\r
-                               dlg.HandleRestart();\r
-                               return TRUE;\r
+                       // open settings dialog\r
+                       CSettings dlg(IDS_PROC_SETTINGS_TITLE);\r
+                       dlg.SetTreeViewMode(TRUE, TRUE, TRUE);\r
+                       dlg.SetTreeWidth(220);\r
+                       \r
+                       dlg.DoModal();\r
+                       dlg.HandleRestart();\r
+                       return TRUE;\r
                }\r
                return FALSE;   \r
        }\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 7a43b72..63938bb 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ