chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Updated installer graphics and made some other minor changes.

Browse Source
This commit is contained in:
Birunthan Mohanathas
2011-02-03 15:52:45 +00:00
parent 249e021001
commit a8aa2825a2
46 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Library/AboutDialog.cpp
View File

@ -23,7 +23,7 @@
#include "Measure.h"
#include "resource.h"
#include "AboutDialog.h"
#include "../revision-number.h"
#include "../Version.h"
#define LOGTIMER 1
@ -367,7 +367,7 @@ void ScanPlugins()
hSearch = FindFirstFile(files.c_str(), &fileData);
do
{
if(hSearch == INVALID_HANDLE_VALUE) break; // No more files found
if (hSearch == INVALID_HANDLE_VALUE) break; // No more files found
PLUGIN_INFO info;
info.name = fileData.cFileName;
@ -398,14 +398,14 @@ void ScanPlugins()
}
else
{
LogWithArgs(LOG_WARNING, L"Unable to load library: \"%s\", ErrorCode=%u", tmpSz.c_str(), err);
LogWithArgs(LOG_WARNING, L"Unable to load plugin: \"%s\", ErrorCode=%u", tmpSz.c_str(), err);
}
g_Plugins.push_back(info);
}
while(FindNextFile(hSearch, &fileData));
while (FindNextFile(hSearch, &fileData));
FindClose(hSearch);
FindClose(hSearch);
}
void RepositionControls(HWND hwndDlg)
@ -454,7 +454,7 @@ BOOL OnInitAboutDialog(HWND window)
HWND widget;
widget = GetDlgItem(window, IDC_VERSION_STRING);
_snwprintf_s(tmpSz, _TRUNCATE, L"%s %s%s rev %i %s", APPNAME, APPVERSION, revision_beta ? L" Beta" : L"", revision_number, APPBITS);
_snwprintf_s(tmpSz, _TRUNCATE, 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);
@ -467,7 +467,7 @@ BOOL OnInitAboutDialog(HWND window)
widget = GetDlgItem(window, IDC_ABOUT_ENTRIES);
const std::map<std::wstring, CMeterWindow*>& windows = Rainmeter->GetAllMeterWindows();
std::map<std::wstring, CMeterWindow*>::const_iterator iter = windows.begin();
for( ; iter != windows.end(); ++iter)
for ( ; iter != windows.end(); ++iter)
{
CMeterWindow* meterWindow = (*iter).second;
const std::wstring& skinName = meterWindow->GetSkinName();
@ -530,8 +530,8 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa
{
WINDOWPOS* pos = (WINDOWPOS*)lParam;
pos->cx = max(280, pos->cx);
pos->cy = max(280, pos->cy);
pos->cx = max(420, pos->cx);
pos->cy = max(340, pos->cy);
}
break;

10
Library/Library.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#include "..\revision-number.h"
#include "..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@ -191,15 +191,15 @@ EXSTYLE WS_EX_APPWINDOW
CAPTION "About Rainmeter"
FONT 8, "MS Shell Dlg 2", 0, 0, 0x0
BEGIN
CONTROL "List1",IDC_STATISTICS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,118,80,211,100
CTEXT "Get the latest version at: http://www.rainmeter.net",IDC_URL_STRING,15,43,300,8
CTEXT "Rainmeter version 0.0",IDC_VERSION_STRING,15,17,300,8
GROUPBOX "About",IDC_STATIC_ABOUT,7,7,220,69
CTEXT "Rainmeter version 0.0",IDC_VERSION_STRING,15,17,300,8
CTEXT "(Built on ??? ?? ????)",IDC_BUILD_STRING,15,30,300,8
DEFPUSHBUTTON "OK",IDOK,91,204,50,14
CTEXT "Get the latest version at www.rainmeter.net",IDC_URL_STRING,15,43,300,8
CONTROL "Disable check for updates",IDC_DISABLE_VERSION_CHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,67,56,104,10
LISTBOX IDC_ABOUT_ENTRIES,7,80,130,100,LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
CONTROL "List1",IDC_STATISTICS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,118,80,211,100
DEFPUSHBUTTON "OK",IDOK,91,204,50,14
END

5
Library/Rainmeter.h
View File

@ -26,19 +26,16 @@
#include "Litestep.h"
#include "MeterWindow.h"
#include "TrayWindow.h"
#include "../Version.h"
#define MAX_LINE_LENGTH 4096
#define MAKE_VER(major, minor1, minor2) major * 1000000 + minor1 * 1000 + minor2
#define APPNAME L"Rainmeter"
#define APPVERSION L"1.4"
#ifdef _WIN64
#define APPBITS L"(64-bit)"
#else
#define APPBITS L"(32-bit)"
#endif
#define RAINMETER_VERSION MAKE_VER(1, 4, 0)
// Callbacks for Litestep
void RainmeterRefresh(HWND, const char* arg);

2
Library/TrayWindow.cpp
View File

@ -24,7 +24,7 @@
#include "AboutDialog.h"
#include "Error.h"
#include "RainmeterQuery.h"
#include "../revision-number.h"
#include "../Version.h"
#define TRAYTIMER 3

8
Library/lua/include/luaconf.h
View File

@ -333,14 +333,14 @@
** CHANGE it to undefined as soon as your programs use only '...' to
** access vararg parameters (instead of the old 'arg' table).
*/
#define LUA_COMPAT_VARARG
#undef LUA_COMPAT_VARARG
/*
@@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
** CHANGE it to undefined as soon as your programs use 'math.fmod' or
** the new '%' operator instead of 'math.mod'.
*/
#define LUA_COMPAT_MOD
#undef LUA_COMPAT_MOD
/*
@@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
@ -355,7 +355,7 @@
** CHANGE it to undefined as soon as you rename 'string.gfind' to
** 'string.gmatch'.
*/
#define LUA_COMPAT_GFIND
#undef LUA_COMPAT_GFIND
/*
@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
@ -363,7 +363,7 @@
** CHANGE it to undefined as soon as you replace to 'luaL_register'
** your uses of 'luaL_openlib'
*/
#define LUA_COMPAT_OPENLIB
#undef LUA_COMPAT_OPENLIB