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

About dialog now remembers position and size for session and some minor cosmetic and usability improvements.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2011-01-31 07:08:43 +00:00
parent 5ca200556a
commit 9d9e650e80
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Library/AboutDialog.cpp
View File

@ -34,6 +34,7 @@ void UpdateWidgets();
BOOL OnInitAboutDialog(HWND window); BOOL OnInitAboutDialog(HWND window);
HWND g_DialogWin = NULL; HWND g_DialogWin = NULL;
WINDOWPLACEMENT g_DialogPlacement = {0};
struct PLUGIN_INFO struct PLUGIN_INFO
{ {
@ -53,9 +54,23 @@ HWND OpenAboutDialog(HWND hwndOwner, HINSTANCE instance)
{ {
HICON hIcon = LoadIcon(instance, MAKEINTRESOURCE(IDI_TRAY)); HICON hIcon = LoadIcon(instance, MAKEINTRESOURCE(IDI_TRAY));
SendMessage(g_DialogWin, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); SendMessage(g_DialogWin, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
if (g_DialogPlacement.length == 0)
{
g_DialogPlacement.length = sizeof(WINDOWPLACEMENT);
GetWindowPlacement(g_DialogWin, &g_DialogPlacement);
}
SetWindowPlacement(g_DialogWin, &g_DialogPlacement);
}
}
else
{
if (!IsZoomed(g_DialogWin))
{
ShowWindow(g_DialogWin, SW_SHOWNORMAL);
} }
} }
ShowWindow(g_DialogWin, SW_SHOWNORMAL);
UpdateAboutStatistics(); UpdateAboutStatistics();
return g_DialogWin; return g_DialogWin;
@ -154,16 +169,16 @@ void UpdateAboutStatistics(LPCTSTR entryName)
{ {
if (i < count) if (i < count)
{ {
ListView_SetItemText(widget, i, 0, (WCHAR*)(*iter).type.c_str()); ListView_SetItemText(widget, i, 0, (WCHAR*)(*iter).timestamp.c_str());
} }
else else
{ {
vitem.iItem = i; vitem.iItem = i;
vitem.iSubItem = 0; vitem.iSubItem = 0;
vitem.pszText = (WCHAR*)(*iter).type.c_str(); vitem.pszText = (WCHAR*)(*iter).timestamp.c_str();
ListView_InsertItem(widget, &vitem); ListView_InsertItem(widget, &vitem);
} }
ListView_SetItemText(widget, i, 1, (WCHAR*)(*iter).timestamp.c_str()); ListView_SetItemText(widget, i, 1, (WCHAR*)(*iter).type.c_str());
ListView_SetItemText(widget, i, 2, (WCHAR*)(*iter).message.c_str()); ListView_SetItemText(widget, i, 2, (WCHAR*)(*iter).message.c_str());
++i; ++i;
@ -226,11 +241,11 @@ void UpdateAboutStatistics(LPCTSTR entryName)
ListView_InsertItem(widget, &vitem); ListView_InsertItem(widget, &vitem);
} }
ListView_SetItemText(widget, index, 1, (WCHAR*)range.c_str());
if (val) if (val)
{ {
ListView_SetItemText(widget, index, 1, (WCHAR*)val); ListView_SetItemText(widget, index, 2, (WCHAR*)val);
} }
ListView_SetItemText(widget, index, 2, (WCHAR*)range.c_str());
++index; ++index;
} }
} }
@ -269,9 +284,9 @@ void UpdateWidgets()
{ {
LVCOLUMN lvc; LVCOLUMN lvc;
lvc.mask = LVCF_TEXT; lvc.mask = LVCF_TEXT;
lvc.pszText = L"Log Type";
ListView_SetColumn(widget, 0, &lvc);
lvc.pszText = L"Time"; lvc.pszText = L"Time";
ListView_SetColumn(widget, 0, &lvc);
lvc.pszText = L"Type";
ListView_SetColumn(widget, 1, &lvc); ListView_SetColumn(widget, 1, &lvc);
lvc.pszText = L"Message"; lvc.pszText = L"Message";
ListView_SetColumn(widget, 2, &lvc); ListView_SetColumn(widget, 2, &lvc);
@ -331,9 +346,9 @@ void UpdateWidgets()
lvc.mask = LVCF_TEXT; lvc.mask = LVCF_TEXT;
lvc.pszText = L"Measure"; lvc.pszText = L"Measure";
ListView_SetColumn(widget, 0, &lvc); ListView_SetColumn(widget, 0, &lvc);
lvc.pszText = L"Value";
ListView_SetColumn(widget, 1, &lvc);
lvc.pszText = L"Range"; lvc.pszText = L"Range";
ListView_SetColumn(widget, 1, &lvc);
lvc.pszText = L"Value";
ListView_SetColumn(widget, 2, &lvc); ListView_SetColumn(widget, 2, &lvc);
} }
} }
@ -420,10 +435,17 @@ void RepositionControls(HWND hwndDlg)
widget = GetDlgItem(hwndDlg, IDC_ABOUT_ENTRIES); widget = GetDlgItem(hwndDlg, IDC_ABOUT_ENTRIES);
SetWindowPos(widget, NULL, 0, 0, (r.right - 28) / 3, r.bottom - 170, SWP_NOMOVE | SWP_NOZORDER); SetWindowPos(widget, NULL, 0, 0, (r.right - 28) / 3, r.bottom - 170, SWP_NOMOVE | SWP_NOZORDER);
widget = GetDlgItem(hwndDlg, IDC_STATISTICS);
SetWindowPos(widget, NULL, 18 + ((r.right - 28) / 3), 130, 2 * ((r.right - 28) / 3), r.bottom - 170, SWP_NOZORDER);
widget = GetDlgItem(hwndDlg, IDOK); widget = GetDlgItem(hwndDlg, IDOK);
SetWindowPos(widget, NULL, (r.right - br.right) / 2, r.bottom - br.bottom - 9, br.right, br.bottom, SWP_NOZORDER); SetWindowPos(widget, NULL, (r.right - br.right) / 2, r.bottom - br.bottom - 9, br.right, br.bottom, SWP_NOZORDER);
// Set listbox width and adjust third column
widget = GetDlgItem(hwndDlg, IDC_STATISTICS);
SetWindowPos(widget, NULL, 18 + ((r.right - 28) / 3), 130, 2 * ((r.right - 28) / 3), r.bottom - 170, SWP_NOZORDER);
LVCOLUMN lvc;
lvc.mask = LVCF_WIDTH;
lvc.cx = (2 * ((r.right - 28) / 3)) - 190;
ListView_SetColumn(widget, 2, &lvc);
} }
BOOL OnInitAboutDialog(HWND window) BOOL OnInitAboutDialog(HWND window)
@ -477,16 +499,16 @@ BOOL OnInitAboutDialog(HWND window)
LVCOLUMN lvc; LVCOLUMN lvc;
lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
lvc.iSubItem = 0; lvc.iSubItem = 0;
lvc.pszText = L"Log Type"; lvc.pszText = L"Time";
lvc.cx = 110; lvc.cx = 110;
lvc.fmt = LVCFMT_LEFT; // left-aligned column lvc.fmt = LVCFMT_LEFT; // left-aligned column
ListView_InsertColumn(widget, 0, &lvc); ListView_InsertColumn(widget, 0, &lvc);
lvc.iSubItem = 1; lvc.iSubItem = 1;
lvc.cx = 100; lvc.cx = 75;
lvc.pszText = L"Time"; lvc.pszText = L"Type";
ListView_InsertColumn(widget, 1, &lvc); ListView_InsertColumn(widget, 1, &lvc);
lvc.iSubItem = 2; lvc.iSubItem = 2;
lvc.cx = 150; lvc.cx = 180;
lvc.pszText = L"Message"; lvc.pszText = L"Message";
ListView_InsertColumn(widget, 2, &lvc); ListView_InsertColumn(widget, 2, &lvc);
} }
@ -499,7 +521,7 @@ BOOL OnInitAboutDialog(HWND window)
INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
return OnInitAboutDialog(hwndDlg); return OnInitAboutDialog(hwndDlg);
@ -520,6 +542,11 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa
case WM_CLOSE: case WM_CLOSE:
KillTimer(hwndDlg, LOGTIMER); KillTimer(hwndDlg, LOGTIMER);
Rainmeter->SaveSettings(); Rainmeter->SaveSettings();
GetWindowPlacement(hwndDlg, &g_DialogPlacement);
if (g_DialogPlacement.showCmd == SW_SHOWMINIMIZED)
{
g_DialogPlacement.showCmd = SW_SHOWNORMAL;
}
DestroyWindow(hwndDlg); DestroyWindow(hwndDlg);
g_DialogWin = NULL; g_DialogWin = NULL;
g_Plugins.clear(); g_Plugins.clear();

6
Library/lua/LuaScript.cpp
View File

@ -41,15 +41,13 @@ LuaScript::LuaScript(lua_State* p_pState, const char* p_strFile, const char* p_s
if (result) if (result)
{ {
m_bInitialized = false; m_bInitialized = false;
LuaManager::LuaLog(LOG_ERROR, "Script: Cannot run file: %s", p_strFile); LuaManager::LuaLog(LOG_ERROR, "Script: Could not run file: %s", lua_tostring(m_pState, -1));
LuaManager::LuaLog(LOG_ERROR, "Script: %s", lua_tostring(m_pState, -1));
} }
} }
else else
{ {
m_bInitialized = false; m_bInitialized = false;
LuaManager::LuaLog(LOG_ERROR, "Script: Cannot run file: %s", p_strFile); LuaManager::LuaLog(LOG_ERROR, "Script: Could not run file: %s", lua_tostring(m_pState, -1));
LuaManager::LuaLog(LOG_ERROR, "Script: %s", lua_tostring(m_pState, -1));
} }
} }