diff --git a/Library/DialogAbout.cpp b/Library/DialogAbout.cpp index eb2e8684..fa5ff4ce 100644 --- a/Library/DialogAbout.cpp +++ b/Library/DialogAbout.cpp @@ -414,26 +414,29 @@ void CDialogAbout::CTabLog::Resize(int w, int h) { SetWindowPos(m_Window, NULL, 0, 0, w, h, SWP_NOMOVE | SWP_NOZORDER); - HWND item = GetDlgItem(m_Window, IDC_ABOUTLOG_ITEMS_LISTVIEW); - SetWindowPos(item, NULL, 0, 0, w, h - 22, SWP_NOMOVE | SWP_NOZORDER); + RECT r; + HWND item = GetDlgItem(m_Window, IDC_ABOUTLOG_ERROR_CHECKBOX); + GetClientRect(item, &r); + + SetWindowPos(item, NULL, 0, h - r.bottom, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + + item = GetDlgItem(m_Window, IDC_ABOUTLOG_WARNING_CHECKBOX); + SetWindowPos(item, NULL, r.right, h - r.bottom, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + + item = GetDlgItem(m_Window, IDC_ABOUTLOG_NOTICE_CHECKBOX); + SetWindowPos(item, NULL, r.right * 2, h - r.bottom, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + + item = GetDlgItem(m_Window, IDC_ABOUTLOG_DEBUG_CHECKBOX); + SetWindowPos(item, NULL, r.right * 3, h - r.bottom, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + + item = GetDlgItem(m_Window, IDC_ABOUTLOG_ITEMS_LISTVIEW); + SetWindowPos(item, NULL, 0, 0, w, h - r.bottom - 7, SWP_NOMOVE | SWP_NOZORDER); // Adjust third colum LVCOLUMN lvc; lvc.mask = LVCF_WIDTH; lvc.cx = w - 183; ListView_SetColumn(item, 2, &lvc); - - item = GetDlgItem(m_Window, IDC_ABOUTLOG_ERROR_CHECKBOX); - SetWindowPos(item, NULL, 0, h - 15, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - - item = GetDlgItem(m_Window, IDC_ABOUTLOG_WARNING_CHECKBOX); - SetWindowPos(item, NULL, 75, h - 15, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - - item = GetDlgItem(m_Window, IDC_ABOUTLOG_NOTICE_CHECKBOX); - SetWindowPos(item, NULL, 150, h - 15, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - - item = GetDlgItem(m_Window, IDC_ABOUTLOG_DEBUG_CHECKBOX); - SetWindowPos(item, NULL, 225, h - 15, 0, 0, SWP_NOSIZE | SWP_NOZORDER); } /* diff --git a/Library/Library.rc b/Library/Library.rc index 23bbd7a7..ff9a3c1e 100644 --- a/Library/Library.rc +++ b/Library/Library.rc @@ -171,7 +171,7 @@ BEGIN MENUITEM "Edit skin", ID_CONTEXT_SKINMENU_EDITSKIN MENUITEM "Refresh skin", ID_CONTEXT_SKINMENU_REFRESH MENUITEM SEPARATOR - MENUITEM "Close skin", ID_CONTEXT_CLOSESKIN + MENUITEM "Unload skin", ID_CONTEXT_CLOSESKIN END END diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index bf35754b..18f69de8 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -30,10 +30,9 @@ #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" -#define RAINMETER_DOWNLOADS L"http://rainmeter.net/RainCMS/?q=Downloads" +#define RAINMETER_OFFICIAL L"http://rainmeter.net/cms/" +#define RAINMETER_MANUAL L"http://rainmeter.net/cms/Manual" +#define RAINMETER_MANUALBETA L"http://rainmeter.net/cms/Manual_beta" #define ZPOS_FLAGS (SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOSENDCHANGING)