diff --git a/Library/AboutDialog.cpp b/Library/AboutDialog.cpp index b2348bb8..ad111321 100644 --- a/Library/AboutDialog.cpp +++ b/Library/AboutDialog.cpp @@ -292,7 +292,7 @@ BOOL OnInitAboutDialog(HWND window) HWND widget; widget = GetDlgItem(window, IDC_VERSION_STRING); - swprintf(tmpSz, L"%s %s rev %i %s", APPNAME, APPVERSION, revision_number, APPBITS); + swprintf(tmpSz, L"%s %s%s rev %i %s", APPNAME, APPVERSION, revision_beta ? L" Beta" : L"", revision_number, APPBITS); SetWindowText(widget, tmpSz); widget = GetDlgItem(window, IDC_BUILD_STRING); diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index a4000d48..8fa0c17a 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -24,11 +24,16 @@ #include "AboutDialog.h" #include "Error.h" #include "RainmeterQuery.h" +#include "../revision-number.h" #include #include #define TRAYTIMER 3 +#define RAINMETER_OFFICIAL L"http://rainmeter.net/RainCMS/" +#define RAINMETER_MANUAL L"http://rainmeter.net/RainCMS/?q=Manual" +#define RAINMETER_MANUALBETA L"http://rainmeter.net/RainCMS/?q=ManualBeta" + extern CRainmeter* Rainmeter; using namespace Gdiplus; @@ -405,13 +410,11 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA } else if(wParam == ID_CONTEXT_SHOW_HELP) { - std::wstring help = Rainmeter->GetPath(); - help = L"\"" + help + L"Rainmeter.chm\""; - LSExecute(NULL, help.c_str(), SW_SHOWNORMAL); + LSExecute(NULL, revision_beta ? RAINMETER_MANUALBETA : RAINMETER_MANUAL, SW_SHOWNORMAL); } else if(wParam == ID_CONTEXT_NEW_VERSION) { - LSExecute(NULL, L"http://rainmeter.net/RainCMS/", SW_SHOWNORMAL); + LSExecute(NULL, RAINMETER_OFFICIAL, SW_SHOWNORMAL); } else if(wParam == ID_CONTEXT_REFRESH) { diff --git a/revision-number.h b/revision-number.h index 0e07484e..a8ac538a 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,2 +1,3 @@ #pragma once -const int revision_number = 482; \ No newline at end of file +const int revision_number = 482; +const bool revision_beta = true; \ No newline at end of file