Merge authors: poy (poy) ------------------------------------------------------------ revno: 23 [merge] committer: poy <p...@123gen.com> branch nick: ChatPlugin timestamp: Mon 2013-05-13 19:30:42 +0200 message: merge modified: pluginsdk/PluginDefs.h pluginsdk/UI.cpp pluginsdk/UI.h src/Plugin.cpp src/RuleDlg.cpp
-- lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin Your team Dcplusplus-team is subscribed to branch lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin. To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/ChatPlugin/+edit-subscription
=== modified file 'pluginsdk/PluginDefs.h' --- pluginsdk/PluginDefs.h 2013-04-28 21:08:26 +0000 +++ pluginsdk/PluginDefs.h 2013-05-13 17:18:05 +0000 @@ -444,9 +444,9 @@ /* Add a command identified by "name". "icon" is optional; it is the path to an icon file used to illustrate the command. */ - void (DCAPI *add_command) (const char* name, DCCommandFunc command, const char* icon); + void (DCAPI *add_command) (const char* guid, const char* name, DCCommandFunc command, const char* icon); /* Remove a command previously added with add_command. */ - void (DCAPI *remove_command) (const char* name); + void (DCAPI *remove_command) (const char* guid, const char* name); void (DCAPI *play_sound) (const char* path); void (DCAPI *notify) (const char* title, const char* message); === modified file 'pluginsdk/UI.cpp' --- pluginsdk/UI.cpp 2013-04-23 18:12:02 +0000 +++ pluginsdk/UI.cpp 2013-05-13 17:27:19 +0000 @@ -25,23 +25,24 @@ namespace dcapi { DCUIPtr UI::ui; +string UI::guid; unordered_map<string, pair<UI::Command, string>> UI::commands; -bool UI::init() { +bool UI::init(string pluginGuid) { if(!Core::handle()) { return false; } - init(reinterpret_cast<DCUIPtr>(Core::handle()->query_interface(DCINTF_DCPP_UI, DCINTF_DCPP_UI_VER))); + init(reinterpret_cast<DCUIPtr>(Core::handle()->query_interface(DCINTF_DCPP_UI, DCINTF_DCPP_UI_VER)), move(pluginGuid)); return ui; } -void UI::init(DCUIPtr coreUI) { ui = coreUI; } +void UI::init(DCUIPtr coreUI, string pluginGuid) { ui = coreUI; guid = move(pluginGuid); } DCUIPtr UI::handle() { return ui; } void UI::addCommand(string name, Command command, string icon) { const auto& iter = commands.insert(std::make_pair(move(name), std::make_pair(command, move(icon)))).first; - ui->add_command(iter->first.c_str(), commandCallback, iter->second.second.c_str()); + ui->add_command(guid.c_str(), iter->first.c_str(), commandCallback, iter->second.second.c_str()); } void UI::removeCommand(const string& name) { - ui->remove_command(name.c_str()); + ui->remove_command(guid.c_str(), name.c_str()); commands.erase(name); } === modified file 'pluginsdk/UI.h' --- pluginsdk/UI.h 2013-04-23 18:12:02 +0000 +++ pluginsdk/UI.h 2013-05-13 17:27:19 +0000 @@ -37,8 +37,8 @@ class UI { public: - static bool init(); - static void init(DCUIPtr coreUI); + static bool init(string pluginGuid); + static void init(DCUIPtr coreUI, string pluginGuid); static DCUIPtr handle(); typedef function<void ()> Command; @@ -50,6 +50,7 @@ static DCUIPtr ui; + static string guid; static unordered_map<string, pair<UI::Command, string>> commands; }; === modified file 'src/Plugin.cpp' --- src/Plugin.cpp 2013-05-05 15:10:04 +0000 +++ src/Plugin.cpp 2013-05-13 17:30:42 +0000 @@ -95,7 +95,7 @@ /* Initialization phase. Initiate additional interfaces that you may have included from the plugin SDK. */ Core::init(core); - if(!Config::init(PLUGIN_GUID) || !Hooks::init() || !Logger::init() || !Tagger::init() || !UI::init() || !Util::init()) { + if(!Config::init(PLUGIN_GUID) || !Hooks::init() || !Logger::init() || !Tagger::init() || !UI::init(PLUGIN_GUID) || !Util::init()) { return false; } === modified file 'src/RuleDlg.cpp' --- src/RuleDlg.cpp 2013-05-05 15:10:04 +0000 +++ src/RuleDlg.cpp 2013-05-13 17:30:42 +0000 @@ -108,7 +108,7 @@ } { - auto cur = grid->addChild(GroupBox::Seed(_T("Only apply to hubs whose address matches (empty = all users):")))->addChild(Grid::Seed(1, 2)); + auto cur = grid->addChild(GroupBox::Seed(_T("Only apply to hubs whose address matches (empty = all hubs):")))->addChild(Grid::Seed(1, 2)); cur->column(0).mode = GridInfo::FILL; cur->setSpacing(grid->getSpacing());
_______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : linuxdcpp-team@lists.launchpad.net Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp