Update TortoiseGit Web Information

Signed-off-by: Frank Li <lznuaa@gmail.com>

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

diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
index 3c1e79c..3ac8aa7 100644 (file)
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
@@ -69,7 +69,7 @@ UINT __stdcall TerminateCache(MSIHANDLE hModule)
 \r
 UINT __stdcall OpenDonatePage(MSIHANDLE hModule)\r
 {\r
-       ShellExecute(NULL, _T("open"), _T("http://tortoisesvn.tigris.org/donate.html"), NULL,NULL, SW_SHOW);\r
+       ShellExecute(NULL, _T("open"), _T("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=GJGTG75GV5PL6&lc=C2&item_name=TortoiseGit&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"), NULL,NULL, SW_SHOW);\r
        return ERROR_SUCCESS;\r
 }\r
 \r

diff --git a/src/TortoiseGitSetup/TortoiseSVN.wxs b/src/TortoiseGitSetup/TortoiseSVN.wxs
index 4db1119..3731674 100644 (file)
--- a/src/TortoiseGitSetup/TortoiseSVN.wxs
+++ b/src/TortoiseGitSetup/TortoiseSVN.wxs
@@ -62,13 +62,13 @@
                </Property>\r
                <CustomAction Id="Set_ShowChangelog" Property="ShowChangelog" Value="Yes" Return="check" />\r
                <CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />\r
- <!--          \r
+       \r
     <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
                \r
 \r
     <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
                <Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
--->\r
+\r
                <!-- Unsafe-check properties and custom actions .......................................................................... -->\r
                <Property Id="VSDUIANDADVERTISED">This advertised application will not be installed because it might be unsafe. Contact your administrator to change the installation user interface option of the package to basic.</Property>\r
                <CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />\r

diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index 49008e9..dd6eb17 100644 (file)
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -393,11 +393,11 @@
                  <Control Id="DonateText" Type="Text" X="135" Y="150" Width="200" Height="40" Transparent="yes" NoPrefix="yes">\r
                          <Text>Thanks for using TortoiseGit. You can show your appreciation and support future development by donating!</Text>\r
                  </Control>\r
-        <!--\r
+        \r
                  <Control Id="DonateButton" Type="PushButton" X="279" Y="190" Width="56" Height="17" Disabled="no" Text="Donate!">\r
                          <Publish Event="DoAction" Value="ShowDonatePage">1</Publish>\r
                  </Control>\r
-      -->\r
+      \r
                  <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
@@ -666,11 +666,11 @@
                  <Control Id="DonateText" Type="Text" X="35" Y="150" Width="300" Height="40" Transparent="yes" NoPrefix="yes">\r
                          <Text>Thanks for using TortoiseGit. You can show your appreciation and support future development by donating!</Text>\r
                  </Control>\r
-        <!--\r
+       \r
                  <Control Id="DonateButton" Type="PushButton" X="279" Y="190" Width="56" Height="17" Disabled="no" Text="Donate!">\r
                          <Publish Event="DoAction" Value="ShowDonatePage">1</Publish>\r
                  </Control>\r
--->\r
+\r
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />\r
         <Control Id="Title" Type="Text" X="155" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
           <Text>[DlgTitleFont][Progress1] [ProductName]</Text>\r

diff --git a/src/TortoiseProc/AboutDlg.cpp b/src/TortoiseProc/AboutDlg.cpp
index 95aed51..204a560 100644 (file)
--- a/src/TortoiseProc/AboutDlg.cpp
+++ b/src/TortoiseProc/AboutDlg.cpp
@@ -77,8 +77,8 @@ BOOL CAboutDlg::OnInitDialog()
        SetTimer(ID_EFFECTTIMER, 40, NULL);\r
        SetTimer(ID_DROPTIMER, 1500, NULL);\r
 \r
-       m_cWebLink.SetURL(_T("http://tortoisesvn.net"));\r
-       m_cSupportLink.SetURL(_T("http://tortoisesvn.tigris.org/donate.html"));\r
+       m_cWebLink.SetURL(_T("http://code.google.com/p/tortoisegit/"));\r
+       m_cSupportLink.SetURL(_T("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=GJGTG75GV5PL6&lc=C2&item_name=TortoiseGit&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"));\r
 \r
        CenterWindow(CWnd::FromHandle(hWndExplorer));\r
        GetDlgItem(IDOK)->SetFocus();\r