diff --git a/Language/Resource.rc b/Language/Resource.rc index 667e6e4c..001edfad 100644 --- a/Language/Resource.rc +++ b/Language/Resource.rc @@ -211,8 +211,8 @@ STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg 2", 0, 0, 0x0 { PUSHBUTTON STR_ACTIVESKINS, IDC_MANAGESKINS_ACTIVESKINS_BUTTON, 0, 0, 145, 14, WS_TABSTOP - CONTROL "", IDC_MANAGESKINS_SKINS_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, 0, 18, 145, 228 - CONTROL "Create .rmskin package...", IDC_MANAGESKINS_CREATEPACKAGE_LINK, "SysLink", 0x0, 0, 250, 145, 14 + CONTROL "", IDC_MANAGESKINS_SKINS_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, 0, 18, 145, 221 + PUSHBUTTON "Create .rmskin package...", IDC_MANAGESKINS_CREATEPACKAGE_BUTTON, 0, 244, 145, 14, WS_TABSTOP LTEXT "N/A", IDC_MANAGESKINS_FILE_TEXT, 165, 0, 130, 14, SS_ENDELLIPSIS | SS_NOPREFIX LTEXT "N/A", IDC_MANAGESKINS_CONFIG_TEXT, 165, 16, 130, 9, SS_ENDELLIPSIS | SS_NOPREFIX diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp index 2609b423..132248fd 100644 --- a/Library/DialogManage.cpp +++ b/Library/DialogManage.cpp @@ -886,6 +886,13 @@ INT_PTR CDialogManage::CTabSkins::OnCommand(WPARAM wParam, LPARAM lParam) } break; + case IDC_MANAGESKINS_CREATEPACKAGE_BUTTON: + { + std::wstring file = Rainmeter->GetPath() + L"SkinInstaller.exe"; + RunFile(file.c_str(), L"/Packager"); + } + break; + case IDC_MANAGESKINS_LOAD_BUTTON: { if (!m_SkinWindow) @@ -1151,12 +1158,7 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam) switch (nm->code) { case NM_CLICK: - if (nm->idFrom == IDC_MANAGESKINS_CREATEPACKAGE_LINK) - { - std::wstring file = Rainmeter->GetPath() + L"SkinInstaller.exe"; - RunFile(file.c_str(), L"/Packager"); - } - else if (nm->idFrom == IDC_MANAGESKINS_ADDMETADATA_LINK) + if (nm->idFrom == IDC_MANAGESKINS_ADDMETADATA_LINK) { std::wstring file = Rainmeter->GetSkinPath() + m_SkinFolderPath; file += L'\\'; diff --git a/Library/resource.h b/Library/resource.h index 7e305dec..9799a487 100644 --- a/Library/resource.h +++ b/Library/resource.h @@ -47,7 +47,7 @@ #define IDC_MANAGESKINS_ACTIVESKINS_BUTTON 1000 #define IDC_MANAGESKINS_SKINS_TREEVIEW 1001 -#define IDC_MANAGESKINS_CREATEPACKAGE_LINK 1002 +#define IDC_MANAGESKINS_CREATEPACKAGE_BUTTON 1002 #define IDC_MANAGESKINS_FILE_TEXT 1003 #define IDC_MANAGESKINS_CONFIG_TEXT 1004 #define IDC_MANAGESKINS_LOAD_BUTTON 4056 // IDM_MANAGESKINSMENU_LOAD