diff --git a/Library/CommandHandler.cpp b/Library/CommandHandler.cpp index 1f4ec2d4..5c33c28d 100644 --- a/Library/CommandHandler.cpp +++ b/Library/CommandHandler.cpp @@ -715,7 +715,7 @@ void CommandHandler::DoManageBang(std::vector& args, MeterWindow* const size_t argsSize = args.size(); if (argsSize >= 2 && argsSize <= 3) { - DialogManage::OpenSkin(args[0].c_str(), + DialogManage::Open(args[0].c_str(), args[1].c_str(), (argsSize == 3) ? args[2].c_str() : L""); } diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp index 84c02272..2007fd0f 100644 --- a/Library/DialogManage.cpp +++ b/Library/DialogManage.cpp @@ -118,25 +118,23 @@ void DialogManage::OpenSkin(MeterWindow* meterWindow) } /* -** Opens the Manage dialog Skins tab with config and/or skin selected. +** Opens the Manage dialog tab with parameters ** */ -void DialogManage::OpenSkin(const WCHAR* tabName, const WCHAR* param1, const WCHAR* param2) +void DialogManage::Open(const WCHAR* tabName, const WCHAR* param1, const WCHAR* param2) { Open(tabName); if (c_Dialog) { - // Make sure "Skins" was defined in the bang + // "Skins" tab if (_wcsicmp(tabName, L"Skins") == 0) { - // For "Skins": // |param1| represents the config (ie. "illustro\Clock") // |param2| represents the file (ie. "Clock.ini") std::wstring name = param1; - // Allow just a config to be selected if (param2) { name += L'\\'; diff --git a/Library/DialogManage.h b/Library/DialogManage.h index c23e1a73..96cefecb 100644 --- a/Library/DialogManage.h +++ b/Library/DialogManage.h @@ -30,10 +30,10 @@ public: static Dialog* GetDialog() { return c_Dialog; } + static void Open(const WCHAR* tabName, const WCHAR* param1, const WCHAR* param2); static void Open(const WCHAR* name); static void Open(int tab = 0); static void OpenSkin(MeterWindow* meterWindow); - static void OpenSkin(const WCHAR* tabName, const WCHAR* param1, const WCHAR* param2); static void UpdateSkins(MeterWindow* meterWindow, bool deleted = false);