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 opens with Log selected as default. Changed DisableDrag=1/0 to DisableDragging=1/0.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2010-11-27 10:57:59 +00:00
parent 04208a97c3
commit 559b5ae05f
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/AboutDialog.cpp
View File

@ -459,6 +459,10 @@ BOOL OnInitAboutDialog(HWND window)
SendMessage(widget, LB_INSERTSTRING, 1, (LPARAM) L"Plugins"); SendMessage(widget, LB_INSERTSTRING, 1, (LPARAM) L"Plugins");
SendMessage(widget, LB_INSERTSTRING, 2, (LPARAM) L"--------------------"); SendMessage(widget, LB_INSERTSTRING, 2, (LPARAM) L"--------------------");
// Select Log entry
SendMessage(widget, LB_SETCURSEL, 0, 0);
SetTimer(window, LOGTIMER, 1000, NULL);
if (g_DialogWin == NULL) if (g_DialogWin == NULL)
{ {
// Add columns to the list view // Add columns to the list view
@ -470,17 +474,17 @@ 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"Measure"; lvc.pszText = L"Log Type";
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 = 100;
lvc.pszText = L"Value"; lvc.pszText = L"Time";
ListView_InsertColumn(widget, 1, &lvc); ListView_InsertColumn(widget, 1, &lvc);
lvc.iSubItem = 2; lvc.iSubItem = 2;
lvc.cx = 150; lvc.cx = 150;
lvc.pszText = L"Range"; lvc.pszText = L"Message";
ListView_InsertColumn(widget, 2, &lvc); ListView_InsertColumn(widget, 2, &lvc);
ScanPlugins(); ScanPlugins();

2
Library/MeterWindow.cpp
View File

@ -3490,7 +3490,7 @@ LRESULT CMeterWindow::OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/ */
LRESULT CMeterWindow::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT CMeterWindow::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
if (m_WindowDraggable && !Rainmeter->GetDisableDrag()) if (m_WindowDraggable && !Rainmeter->GetDisableDragging())
{ {
POINT pos; POINT pos;
pos.x = (SHORT)LOWORD(lParam); pos.x = (SHORT)LOWORD(lParam);

16
Library/Rainmeter.cpp
View File

@ -1188,7 +1188,7 @@ CRainmeter::CRainmeter()
m_DisableRDP = false; m_DisableRDP = false;
m_DisableDrag = false; m_DisableDragging = false;
m_Logging = false; m_Logging = false;
@ -2776,7 +2776,7 @@ void CRainmeter::ReadGeneralSettings(const std::wstring& iniFile)
c_GlobalConfig.netInSpeed = parser.ReadFloat(L"Rainmeter", L"NetInSpeed", 0.0); c_GlobalConfig.netInSpeed = parser.ReadFloat(L"Rainmeter", L"NetInSpeed", 0.0);
c_GlobalConfig.netOutSpeed = parser.ReadFloat(L"Rainmeter", L"NetOutSpeed", 0.0); c_GlobalConfig.netOutSpeed = parser.ReadFloat(L"Rainmeter", L"NetOutSpeed", 0.0);
m_DisableDrag = 0!=parser.ReadInt(L"Rainmeter", L"DisableDrag", 0); m_DisableDragging = 0!=parser.ReadInt(L"Rainmeter", L"DisableDragging", 0);
m_DisableRDP = 0!=parser.ReadInt(L"Rainmeter", L"DisableRDP", 0); m_DisableRDP = 0!=parser.ReadInt(L"Rainmeter", L"DisableRDP", 0);
m_ConfigEditor = parser.ReadString(L"Rainmeter", L"ConfigEditor", L""); m_ConfigEditor = parser.ReadString(L"Rainmeter", L"ConfigEditor", L"");
@ -3274,10 +3274,10 @@ void CRainmeter::ShowContextMenu(POINT pos, CMeterWindow* meterWindow)
{ {
AppendMenu(configMenu, MF_SEPARATOR, 0, NULL); AppendMenu(configMenu, MF_SEPARATOR, 0, NULL);
AppendMenu(configMenu, 0, ID_CONTEXT_OPENSKINSFOLDER, L"Open Skins\' Folder"); AppendMenu(configMenu, 0, ID_CONTEXT_OPENSKINSFOLDER, L"Open Skins\' Folder");
AppendMenu(configMenu, 0, ID_CONTEXT_DISABLEDRAG, L"Disable Drag"); AppendMenu(configMenu, 0, ID_CONTEXT_DISABLEDRAG, L"Disable Dragging");
AppendMenu(configMenu, 0, ID_CONTEXT_MANAGESKINS, L"Manage Skins..."); AppendMenu(configMenu, 0, ID_CONTEXT_MANAGESKINS, L"Manage Skins...");
if (m_DisableDrag) if (m_DisableDragging)
{ {
CheckMenuItem(configMenu, ID_CONTEXT_DISABLEDRAG, MF_BYCOMMAND | MF_CHECKED); CheckMenuItem(configMenu, ID_CONTEXT_DISABLEDRAG, MF_BYCOMMAND | MF_CHECKED);
} }
@ -3541,7 +3541,7 @@ HMENU CRainmeter::CreateSkinMenu(CMeterWindow* meterWindow, int index, HMENU con
CheckMenuItem(settingsMenu, ID_CONTEXT_SKINMENU_REMEMBERPOSITION, MF_BYCOMMAND | MF_CHECKED); CheckMenuItem(settingsMenu, ID_CONTEXT_SKINMENU_REMEMBERPOSITION, MF_BYCOMMAND | MF_CHECKED);
} }
if (m_DisableDrag) if (m_DisableDragging)
{ {
EnableMenuItem(settingsMenu, ID_CONTEXT_SKINMENU_DRAGGABLE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(settingsMenu, ID_CONTEXT_SKINMENU_DRAGGABLE, MF_BYCOMMAND | MF_GRAYED);
} }
@ -3789,10 +3789,10 @@ void CRainmeter::SetDebug(bool debug)
WritePrivateProfileString(L"Rainmeter", L"Debug", debug ? L"1" : L"0", m_IniFile.c_str()); WritePrivateProfileString(L"Rainmeter", L"Debug", debug ? L"1" : L"0", m_IniFile.c_str());
} }
void CRainmeter::SetDisableDrag(bool drag) void CRainmeter::SetDisableDragging(bool dragging)
{ {
m_DisableDrag = drag; m_DisableDragging = dragging;
WritePrivateProfileString(L"Rainmeter", L"DisableDrag", drag ? L"1" : L"0", m_IniFile.c_str()); WritePrivateProfileString(L"Rainmeter", L"DisableDragging", dragging ? L"1" : L"0", m_IniFile.c_str());
} }
void CRainmeter::TestSettingsFile(bool bDefaultIniLocation) void CRainmeter::TestSettingsFile(bool bDefaultIniLocation)

6
Library/Rainmeter.h
View File

@ -200,8 +200,8 @@ public:
bool GetDisableRDP() { return m_DisableRDP; } bool GetDisableRDP() { return m_DisableRDP; }
bool GetDisableDrag() { return m_DisableDrag; } bool GetDisableDragging() { return m_DisableDragging; }
void SetDisableDrag(bool drag); void SetDisableDragging(bool dragging);
void AddAboutLogInfo(const LOG_INFO& logInfo); void AddAboutLogInfo(const LOG_INFO& logInfo);
const std::list<LOG_INFO>& GetAboutLogData() { return m_LogData; } const std::list<LOG_INFO>& GetAboutLogData() { return m_LogData; }
@ -291,7 +291,7 @@ private:
bool m_DisableRDP; bool m_DisableRDP;
bool m_DisableDrag; bool m_DisableDragging;
bool m_Logging; bool m_Logging;

2
Library/TrayWindow.cpp
View File

@ -444,7 +444,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
} }
else if(wParam == ID_CONTEXT_DISABLEDRAG) else if(wParam == ID_CONTEXT_DISABLEDRAG)
{ {
Rainmeter->SetDisableDrag(!Rainmeter->GetDisableDrag()); Rainmeter->SetDisableDragging(!Rainmeter->GetDisableDragging());
} }
else if(wParam == ID_CONTEXT_EDITCONFIG) else if(wParam == ID_CONTEXT_EDITCONFIG)
{ {