- Some changes for online manual.

- About dialog now indicates "Beta" or not beta on version information.
This commit is contained in:
spx 2010-08-05 17:48:52 +00:00
parent cce8a5ead4
commit 98c1f70f17
3 changed files with 10 additions and 6 deletions

View File

@ -292,7 +292,7 @@ BOOL OnInitAboutDialog(HWND window)
HWND widget; HWND widget;
widget = GetDlgItem(window, IDC_VERSION_STRING); 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); SetWindowText(widget, tmpSz);
widget = GetDlgItem(window, IDC_BUILD_STRING); widget = GetDlgItem(window, IDC_BUILD_STRING);

View File

@ -24,11 +24,16 @@
#include "AboutDialog.h" #include "AboutDialog.h"
#include "Error.h" #include "Error.h"
#include "RainmeterQuery.h" #include "RainmeterQuery.h"
#include "../revision-number.h"
#include <io.h> #include <io.h>
#include <ShellAPI.h> #include <ShellAPI.h>
#define TRAYTIMER 3 #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; extern CRainmeter* Rainmeter;
using namespace Gdiplus; 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) else if(wParam == ID_CONTEXT_SHOW_HELP)
{ {
std::wstring help = Rainmeter->GetPath(); LSExecute(NULL, revision_beta ? RAINMETER_MANUALBETA : RAINMETER_MANUAL, SW_SHOWNORMAL);
help = L"\"" + help + L"Rainmeter.chm\"";
LSExecute(NULL, help.c_str(), SW_SHOWNORMAL);
} }
else if(wParam == ID_CONTEXT_NEW_VERSION) 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) else if(wParam == ID_CONTEXT_REFRESH)
{ {

View File

@ -1,2 +1,3 @@
#pragma once #pragma once
const int revision_number = 482; const int revision_number = 482;
const bool revision_beta = true;