diff --git a/Language/Resource.rc b/Language/Resource.rc index df80639b..eda3df17 100644 --- a/Language/Resource.rc +++ b/Language/Resource.rc @@ -280,26 +280,23 @@ IDD_MANAGESETTINGS_DIALOG DIALOGEX 15, 30, 470, 260 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 { - GROUPBOX STR_GENERAL, IDC_STATIC, 0, 0, 468, 139 + GROUPBOX STR_GENERAL, IDC_STATIC, 0, 0, 468, 118 LTEXT STR_LANGUAGESC, IDC_STATIC, 6, 16, 87, 14 COMBOBOX IDC_MANAGESETTINGS_LANGUAGE_COMBOBOX, 87, 13, 222, 14, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP //AUTOCHECKBOX "Run automatically at startup", IDC_MANAGESETTINGS_AUTOSTART_CHECKBOX, 6, 16, 140, 9, WS_DISABLED - LTEXT "Skin path:", IDC_STATIC, 6, 37, 87, 9 - EDITTEXT IDC_MANAGESETTINGS_SKINPATH_TEXT, 87, 34, 222, 14, ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP - PUSHBUTTON "...", IDC_MANAGESETTINGS_SKINPATH_BUTTON, 313, 34, 25, 14, WS_TABSTOP - LTEXT "Editor:", IDC_STATIC, 6, 58, 87, 9 - EDITTEXT IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT, 87, 55, 222, 14, ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP - PUSHBUTTON "...", IDC_MANAGESETTINGS_CONFIGEDITOR_BUTTON, 313, 55, 25, 14, WS_TABSTOP - AUTOCHECKBOX STR_CHECKFORUPDATES, IDC_MANAGESETTINGS_CHECKUPDATES_CHECKBOX, 6, 76, 150, 9 - AUTOCHECKBOX STR_DISABLEDRAGGING, IDC_MANAGESETTINGS_LOCKSKINS_CHECKBOX, 6, 89, 150, 9 - AUTOCHECKBOX "Show notification area icon", IDC_MANAGESETTINGS_TRAYICON_CHECKBOX, 6, 102, 150, 9 - PUSHBUTTON STR_RESETSTATISTICS, IDC_MANAGESETTINGS_RESETSTATISTICS_BUTTON, 6, 118, NUM_BUTTONWIDTH + 20, 14, WS_TABSTOP + LTEXT "Editor:", IDC_STATIC, 6, 37, 87, 9 + EDITTEXT IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT, 87, 34, 222, 14, ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_TABSTOP + PUSHBUTTON "...", IDC_MANAGESETTINGS_CONFIGEDITOR_BUTTON, 313, 34, 25, 14, WS_TABSTOP + AUTOCHECKBOX STR_CHECKFORUPDATES, IDC_MANAGESETTINGS_CHECKUPDATES_CHECKBOX, 6, 55, 150, 9 + AUTOCHECKBOX STR_DISABLEDRAGGING, IDC_MANAGESETTINGS_LOCKSKINS_CHECKBOX, 6, 68, 150, 9 + AUTOCHECKBOX "Show notification area icon", IDC_MANAGESETTINGS_TRAYICON_CHECKBOX, 6, 81, 150, 9 + PUSHBUTTON STR_RESETSTATISTICS, IDC_MANAGESETTINGS_RESETSTATISTICS_BUTTON, 6, 97, NUM_BUTTONWIDTH + 20, 14, WS_TABSTOP - GROUPBOX STR_LOGGING, IDC_STATIC, 0, 146, 468, 66 - AUTOCHECKBOX STR_DEBUGMODE, IDC_MANAGESETTINGS_VERBOSELOGGING_CHECKBOX, 6, 162, 200, 9 - AUTOCHECKBOX STR_LOGTOFILE, IDC_MANAGESETTINGS_LOGTOFILE_CHECKBOX, 6, 175, 200, 9 - PUSHBUTTON STR_SHOWLOGFILE, IDC_MANAGESETTINGS_SHOWLOGFILE_BUTTON, 6, 191, NUM_BUTTONWIDTH + 20, 14 - PUSHBUTTON STR_DELETELOGFILE, IDC_MANAGESETTINGS_DELETELOGFILE_BUTTON, NUM_BUTTONWIDTH + 30, 191, NUM_BUTTONWIDTH + 20, 14 + GROUPBOX STR_LOGGING, IDC_STATIC, 0, 125, 468, 66 + AUTOCHECKBOX STR_DEBUGMODE, IDC_MANAGESETTINGS_VERBOSELOGGING_CHECKBOX, 6, 141, 200, 9 + AUTOCHECKBOX STR_LOGTOFILE, IDC_MANAGESETTINGS_LOGTOFILE_CHECKBOX, 6, 154, 200, 9 + PUSHBUTTON STR_SHOWLOGFILE, IDC_MANAGESETTINGS_SHOWLOGFILE_BUTTON, 6, 170, NUM_BUTTONWIDTH + 20, 14 + PUSHBUTTON STR_DELETELOGFILE, IDC_MANAGESETTINGS_DELETELOGFILE_BUTTON, NUM_BUTTONWIDTH + 30, 170, NUM_BUTTONWIDTH + 20, 14 } ///////////////////////////////////////////////////////////////////////////// diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp index 4fb1384d..9d30c1a5 100644 --- a/Library/DialogManage.cpp +++ b/Library/DialogManage.cpp @@ -1671,7 +1671,6 @@ void CDialogManage::CTabSettings::Initialize() EnableWindow(GetDlgItem(m_Window, IDC_MANAGESETTINGS_SHOWLOGFILE_BUTTON), isLogFile); EnableWindow(GetDlgItem(m_Window, IDC_MANAGESETTINGS_DELETELOGFILE_BUTTON), isLogFile); - Edit_SetText(GetDlgItem(m_Window, IDC_MANAGESETTINGS_SKINPATH_TEXT), Rainmeter->GetSkinPath().c_str()); Edit_SetText(GetDlgItem(m_Window, IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT), Rainmeter->GetSkinEditor().c_str()); bool iconEnabled = Rainmeter->GetTrayWindow()->IsTrayIconEnabled(); @@ -1796,36 +1795,6 @@ INT_PTR CDialogManage::CTabSettings::OnCommand(WPARAM wParam, LPARAM lParam) Rainmeter->SetDebug(!Rainmeter->GetDebug()); break; - case IDC_MANAGESETTINGS_SKINPATH_TEXT: - if (HIWORD(wParam) == EN_CHANGE) - { - WCHAR buffer[MAX_PATH]; - if (GetWindowText((HWND)lParam, buffer, _countof(buffer)) > 0) - { - Rainmeter->SetSkinPath(buffer); - } - } - break; - - case IDC_MANAGESETTINGS_SKINPATH_BUTTON: - { - WCHAR buffer[MAX_PATH]; - WCHAR* temp; - BROWSEINFO bi = {0}; - bi.hwndOwner = c_Dialog->GetWindow(); - bi.lpszTitle = L"Select a new Skins folder:\r\n\r\nNote: Changes take place next time you load Rainmeter."; - bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE; - - PIDLIST_ABSOLUTE pidl = SHBrowseForFolder(&bi); - if (pidl && SHGetPathFromIDList(pidl, buffer)) - { - temp = wcscat(buffer, L"\\"); - Edit_SetText(GetDlgItem(m_Window, IDC_MANAGESETTINGS_SKINPATH_TEXT), temp); - CoTaskMemFree(pidl); - } - } - break; - case IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT: if (HIWORD(wParam) == EN_CHANGE) { diff --git a/Library/resource.h b/Library/resource.h index 6b2fc9d8..f1878f52 100644 --- a/Library/resource.h +++ b/Library/resource.h @@ -91,11 +91,9 @@ #define IDC_MANAGESETTINGS_SHOWLOGFILE_BUTTON 1005 #define IDC_MANAGESETTINGS_DELETELOGFILE_BUTTON 1006 #define IDC_MANAGESETTINGS_LANGUAGE_COMBOBOX 1007 -#define IDC_MANAGESETTINGS_SKINPATH_TEXT 1008 -#define IDC_MANAGESETTINGS_SKINPATH_BUTTON 1009 -#define IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT 1010 -#define IDC_MANAGESETTINGS_CONFIGEDITOR_BUTTON 1011 -#define IDC_MANAGESETTINGS_TRAYICON_CHECKBOX 1012 +#define IDC_MANAGESETTINGS_CONFIGEDITOR_TEXT 1008 +#define IDC_MANAGESETTINGS_CONFIGEDITOR_BUTTON 1009 +#define IDC_MANAGESETTINGS_TRAYICON_CHECKBOX 1010 #define ID_STR_ISRTL 2000 #define ID_STR_UPDATEAVAILABLE 2001