Partially reverted f52dffe

This commit is contained in:
Brian Ferguson
2012-11-17 18:49:25 -07:00
parent 651e6594b5
commit 803007b6fe
3 changed files with 16 additions and 52 deletions

View File

@ -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)
{

View File

@ -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