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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/Application.rc
View File

@ -2,7 +2,7 @@
// Caution! Do not modify this file without changing \install\UpdateApplicationRC.au3
//
#include "resource.h"
#include "..\revision-number.h"
#include "..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////

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

2
Plugins/PluginAdvancedCPU/AdvancedCPU.cpp
View File

@ -23,7 +23,7 @@
#include <map>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
//ULONGLONG GetPerfData(PCTSTR ObjectName, PCTSTR InstanceName, PCTSTR CounterName);
void UpdateProcesses();

2
Plugins/PluginAdvancedCPU/PluginAdvancedCPU.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginCoreTemp/PluginCoreTemp.cpp
View File

@ -24,7 +24,7 @@
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
extern "C"
{

2
Plugins/PluginCoreTemp/PluginCoreTemp.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginExample/ExamplePlugin.c
View File

@ -22,7 +22,7 @@
#include <math.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
//#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
//#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
__declspec( dllexport ) UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id);

2
Plugins/PluginExample/PluginExample.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
View File

@ -22,7 +22,7 @@
#include <map>
#include "FolderInfo.h"
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
#define UPDATE_TIME_MIN_MS 10000

2
Plugins/PluginFolderInfo/PluginFolderInfo.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginMediaKey/PluginMediaKey.cpp
View File

@ -20,7 +20,7 @@
#include <string>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginMediaKey/PluginMediaKey.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginPerfMon/PerfData.cpp
View File

@ -23,7 +23,7 @@
#include <crtdbg.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
ULONGLONG GetPerfData(PCTSTR ObjectName, PCTSTR InstanceName, PCTSTR CounterName);

2
Plugins/PluginPerfMon/PluginPerfMon.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginPing/Ping.cpp
View File

@ -29,7 +29,7 @@
#include <stdlib.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginPing/PluginPing.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginPower/PluginPower.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginPower/PowerPlugin.cpp
View File

@ -26,7 +26,7 @@
#include <Powrprof.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
typedef struct _PROCESSOR_POWER_INFORMATION
{

2
Plugins/PluginQuote/PluginQuote.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginQuote/Quote.cpp
View File

@ -28,7 +28,7 @@
#include <shlwapi.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginRecycleManager/PluginRecycleManager.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginRecycleManager/RecycleManager.cpp
View File

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <time.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginResMon/PluginResMon.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginResMon/ResMon.cpp
View File

@ -34,7 +34,7 @@
#include <psapi.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginSpeedFan/PluginSpeedFan.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginSpeedFan/SpeedFanPlugin.cpp
View File

@ -24,7 +24,7 @@
#include <map>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginSysInfo/PluginSysInfo.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginSysInfo/SysInfo.cpp
View File

@ -26,7 +26,7 @@
#include <Iphlpapi.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginVirtualDesktops/PluginVirtualDesktops.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginVirtualDesktops/VirtualDesktops.cpp
View File

@ -72,7 +72,7 @@
#include "../../Library/Export.h"
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
extern "C"
{

2
Plugins/PluginWebParser/PluginWebParser.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginWebParser/WebParser.cpp
View File

@ -32,7 +32,7 @@
#include "..\..\Library\pcre-8.10/pcre.h"
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginWifiStatus/PluginWifiStatus.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginWifiStatus/WifiStatus.cpp
View File

@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma comment( lib, "wlanapi.lib")
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginWin7Audio/PluginWin7Audio.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginWin7Audio/Win7AudioPlugin.cpp
View File

@ -32,7 +32,7 @@
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
#define SAFE_RELEASE(punk) \
if ((punk) != NULL) { (punk)->Release(); (punk) = NULL; }

2
Plugins/PluginWindowMessage/PluginWindowMessage.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginWindowMessage/WindowMessagePlugin.cpp
View File

@ -26,7 +26,7 @@
#include <time.h>
#include "..\..\Library\Export.h" // Rainmeter's exported functions
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
/* The exported functions */
extern "C"

2
Plugins/PluginiTunes/PluginiTunes.rc
View File

@ -1,7 +1,7 @@
// Microsoft Developer Studio generated resource script.
//
#include "..\..\revision-number.h"
#include "..\..\Version.h"
#define APSTUDIO_READONLY_SYMBOLS
#include "windows.h"
#undef APSTUDIO_READONLY_SYMBOLS

2
Plugins/PluginiTunes/iTunesPlugin.cpp
View File

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <map>
#include <time.h>
#include "../../Library/DisableThreadLibraryCalls.h" // contains DllMain entry point
#include "..\..\Library\DisableThreadLibraryCalls.h" // contains DllMain entry point
const int VOLUME_STEP = 5;

13
Version.h Normal file
View File

@ -0,0 +1,13 @@
#pragma once
#define MAKE_VER(major, minor1, minor2) major * 1000000 + minor1 * 1000 + minor2
#define FILEVER 1,4,0,733
#define PRODUCTVER 1,4,0,733
#define STRFILEVER "1.4.0.733"
#define STRPRODUCTVER "1.4.0.733"
#define APPVERSION L"1.4.0"
#define RAINMETER_VERSION MAKE_VER(1, 4, 0)
const int revision_number = 733;
const bool revision_beta = true;

8
revision-number.h
View File

@ -1,8 +0,0 @@
#pragma once
#define FILEVER 1,4,0,728
#define PRODUCTVER 1,4,0,728
#define STRFILEVER "1.4.0.728"
#define STRPRODUCTVER "1.4.0.728"
const int revision_number = 728;
const bool revision_beta = true;