ProgressDlg, Pull: Took m_GitStatus into account for detecting problems.

[tortoisegit/TortoiseGitJp.git] / src / Utils / SoundUtils.cpp

diff --git a/src/Utils/SoundUtils.cpp b/src/Utils/SoundUtils.cpp
index 8167d3c..1aa855c 100644 (file)
--- a/src/Utils/SoundUtils.cpp
+++ b/src/Utils/SoundUtils.cpp
@@ -18,10 +18,11 @@
 //\r
 #include "StdAfx.h"\r
 #include "registry.h"\r
-#include "resource.h"\r
-#include "AppUtils.h"\r
+#include "..\TortoiseProc\resource.h"\r
+#include "..\TortoiseProc\AppUtils.h"\r
 #include "PathUtils.h"\r
 #include ".\soundutils.h"\r
+#include "mmsystem.h"\r
 \r
 #pragma comment(lib, "Winmm")\r
 \r
@@ -33,18 +34,18 @@ CSoundUtils::~CSoundUtils(void)
 {\r
 }\r
 \r
-void CSoundUtils::RegisterTSVNSounds()\r
+void CSoundUtils::RegisterTGitSounds()\r
 {\r
        // create the event labels\r
-       CRegString eventlabelerr = CRegString(_T("AppEvents\\EventLabels\\TSVN_Error\\"));\r
+       CRegString eventlabelerr = CRegString(_T("AppEvents\\EventLabels\\TGit_Error\\"));\r
        eventlabelerr = CString(MAKEINTRESOURCE(IDS_ERR_ERROR));\r
-       CRegString eventlabelwarn = CRegString(_T("AppEvents\\EventLabels\\TSVN_Warning\\"));\r
+       CRegString eventlabelwarn = CRegString(_T("AppEvents\\EventLabels\\TGit_Warning\\"));\r
        eventlabelwarn = CString(MAKEINTRESOURCE(IDS_WARN_WARNING));\r
-       CRegString eventlabelnote = CRegString(_T("AppEvents\\EventLabels\\TSVN_Notification\\"));\r
+       CRegString eventlabelnote = CRegString(_T("AppEvents\\EventLabels\\TGit_Notification\\"));\r
        eventlabelnote = CString(MAKEINTRESOURCE(IDS_WARN_NOTE));\r
        \r
        CRegString appscheme = CRegString(_T("AppEvents\\Schemes\\Apps\\TortoiseProc\\"));\r
-       appscheme = _T("TortoiseSVN");\r
+       appscheme = _T("TortoiseGit");\r
 \r
        CString apppath = CPathUtils::GetAppDirectory();\r
        \r
@@ -61,39 +62,39 @@ void CSoundUtils::RegisterTSVNSounds()
                CString name = schemenames.GetNext(pos);\r
                if ((name.CompareNoCase(_T(".none"))!=0)&&(name.CompareNoCase(_T(".nosound"))!=0))\r
                {\r
-                       CString errorkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TSVN_Error\\") + name + _T("\\");\r
+                       CString errorkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TGit_Error\\") + name + _T("\\");\r
                        CRegString errorkeyval = CRegString(errorkey);\r
                        if (((CString)(errorkeyval)).IsEmpty())\r
                        {\r
-                               errorkeyval = apppath + _T("TortoiseSVN_Error.wav");\r
+                               errorkeyval = apppath + _T("TortoiseGit_Error.wav");\r
                        }\r
-                       CString warnkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TSVN_Warning\\") + name + _T("\\");\r
+                       CString warnkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TGit_Warning\\") + name + _T("\\");\r
                        CRegString warnkeyval = CRegString(warnkey);\r
                        if (((CString)(warnkeyval)).IsEmpty())\r
                        {\r
-                               warnkeyval = apppath + _T("TortoiseSVN_Warning.wav");\r
+                               warnkeyval = apppath + _T("TortoiseGit_Warning.wav");\r
                        }\r
-                       CString notificationkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TSVN_Notification\\") + name + _T("\\");\r
+                       CString notificationkey = _T("AppEvents\\Schemes\\Apps\\TortoiseProc\\TGit_Notification\\") + name + _T("\\");\r
                        CRegString notificationkeyval = CRegString(notificationkey);\r
                        if (((CString)(notificationkeyval)).IsEmpty())\r
                        {\r
-                               notificationkeyval = apppath + _T("TortoiseSVN_Notification.wav");\r
+                               notificationkeyval = apppath + _T("TortoiseGit_Notification.wav");\r
                        }\r
                }               \r
        }\r
 }\r
 \r
-void CSoundUtils::PlayTSVNWarning()\r
+void CSoundUtils::PlayTGitWarning()\r
 {\r
-       PlaySound(_T("TSVN_Warning"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
+       PlaySound(_T("TGit_Warning"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
 }\r
 \r
-void CSoundUtils::PlayTSVNError()\r
+void CSoundUtils::PlayTGitError()\r
 {\r
-       PlaySound(_T("TSVN_Error"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
+       PlaySound(_T("TGit_Error"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
 }\r
 \r
-void CSoundUtils::PlayTSVNNotification()\r
+void CSoundUtils::PlayTGitNotification()\r
 {\r
-       PlaySound(_T("TSVN_Notification"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
+       PlaySound(_T("TGit_Notification"), NULL, SND_APPLICATION | SND_ASYNC | SND_NODEFAULT);\r
 }
\ No newline at end of file