linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3116
committer: crise <crise@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-11-08 14:41:54 +0200
message:
  namespace cpp sdk classes under 'dcapi'; update dev plugins menu item to reflect plugins current state
modified:
  plugins/Dev/Dialog.cpp
  plugins/Dev/Plugin.cpp
  plugins/Dev/Plugin.h
  plugins/Script/LuaExec.h
  plugins/Script/LuaManager.cpp
  plugins/Script/Plugin.cpp
  plugins/Script/ScriptInstance.cpp
  plugins/Test/Plugin.cpp
  pluginsdk/cpp/pluginsdk/Config.cpp
  pluginsdk/cpp/pluginsdk/Config.h
  pluginsdk/cpp/pluginsdk/Core.cpp
  pluginsdk/cpp/pluginsdk/Core.h
  pluginsdk/cpp/pluginsdk/Logger.cpp
  pluginsdk/cpp/pluginsdk/Logger.h
  pluginsdk/cpp/pluginsdk/Util.cpp
  pluginsdk/cpp/pluginsdk/Util.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'plugins/Dev/Dialog.cpp'
--- plugins/Dev/Dialog.cpp	2012-11-06 17:50:04 +0000
+++ plugins/Dev/Dialog.cpp	2012-11-08 12:41:54 +0000
@@ -35,6 +35,9 @@
 
 #define noFilter _T("0 - No filtering")
 
+using dcapi::Core;
+using dcapi::Util;
+
 HINSTANCE Dialog::instance;
 Dialog* dlg = nullptr;
 

=== modified file 'plugins/Dev/Plugin.cpp'
--- plugins/Dev/Plugin.cpp	2012-11-06 17:50:04 +0000
+++ plugins/Dev/Plugin.cpp	2012-11-08 12:41:54 +0000
@@ -24,18 +24,21 @@
 #include <pluginsdk/Logger.h>
 #include <pluginsdk/Util.h>
 
+using dcapi::Config;
+using dcapi::Core;
+using dcapi::Logger;
+using dcapi::Util;
+
 Plugin* Plugin::instance = nullptr;
 
-const char* switchText = "Dev plugin: enable/disable";
-
-Plugin::Plugin() {
+Plugin::Plugin() : commandName(PLUGIN_NAME ": enable") {
 }
 
 Plugin::~Plugin() {
 	clearHooks();
 
 	if(ui) {
-		ui->remove_command(switchText);
+		ui->remove_command(commandName.c_str());
 	}
 }
 
@@ -66,7 +69,11 @@
 }
 
 void Plugin::dlgClosed() {
+	auto oldCommand = instance->commandName;
 	instance->close();
+
+	instance->ui->remove_command(oldCommand.c_str());
+	instance->ui->add_command(instance->commandName.c_str(), [] { instance->onSwitched(); });
 }
 
 void Plugin::addHooks() {
@@ -94,12 +101,14 @@
 	dialog.create();
 	addHooks();
 	Config::setConfig("Enabled", true);
+	commandName = PLUGIN_NAME ": disable";
 }
 
 void Plugin::close() {
 	Config::setConfig("Enabled", false);
 	clearHooks();
 	dialog.close();
+	commandName = PLUGIN_NAME ": enable";
 }
 
 void Plugin::onLoad(DCCorePtr core, bool install, Bool& loadRes) {
@@ -117,22 +126,26 @@
 	if(install) {
 		Config::setConfig("Enabled", true);
 
-		Logger::log("The dev plugin has been installed; check the \"" + string(switchText) + "\" command and the /raw chat command.");
+		Logger::log("The dev plugin has been installed; check the plugins menu and the /raw chat command.");
 	}
 
 	if(Config::getBoolConfig("Enabled")) {
 		start();
 	}
 
-	ui->add_command(switchText, [] { instance->onSwitched(); });
+	ui->add_command(commandName.c_str(), [] { instance->onSwitched(); });
 }
 
 void Plugin::onSwitched() {
+	auto oldCommand = commandName;
 	if(events.empty()) {
 		start();
 	} else {
 		close();
 	}
+
+	ui->remove_command(oldCommand.c_str());
+	ui->add_command(commandName.c_str(), [] { instance->onSwitched(); });
 }
 
 Bool Plugin::onHubDataIn(HubDataPtr hHub, const char* message) {

=== modified file 'plugins/Dev/Plugin.h'
--- plugins/Dev/Plugin.h	2012-11-04 19:15:24 +0000
+++ plugins/Dev/Plugin.h	2012-11-08 12:41:54 +0000
@@ -59,6 +59,8 @@
 
 	Dialog dialog;
 
+	string commandName;
+
 	/** @todo switch to dcpp::Singleton when <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51494>
 	is fixed */
 	static Plugin* instance;

=== modified file 'plugins/Script/LuaExec.h'
--- plugins/Script/LuaExec.h	2012-11-04 19:15:24 +0000
+++ plugins/Script/LuaExec.h	2012-11-08 12:41:54 +0000
@@ -30,7 +30,7 @@
 			lua_call(L, 1, 0);
 		}
 		else {  /* no _ALERT function; print it on stderr */
-			Logger::log(Util::toUtf8(string("Lua ERROR: ") + lua_tostring(L, -2)));
+			dcapi::Logger::log(dcapi::Util::toUtf8(string("Lua ERROR: ") + lua_tostring(L, -2)));
 			lua_pop(L, 2);  /* remove error message and _ALERT */
 		}
 	}

=== modified file 'plugins/Script/LuaManager.cpp'
--- plugins/Script/LuaManager.cpp	2012-11-04 19:15:24 +0000
+++ plugins/Script/LuaManager.cpp	2012-11-08 12:41:54 +0000
@@ -27,6 +27,10 @@
 
 #include <boost/lexical_cast.hpp>
 
+using dcapi::Config;
+using dcapi::Logger;
+using dcapi::Util;
+
 const char LuaManager::className[] = "DC";
 Lunar<LuaManager>::RegType LuaManager::methods[] = {
 	{"SendHubMessage", &LuaManager::SendHubMessage },

=== modified file 'plugins/Script/Plugin.cpp'
--- plugins/Script/Plugin.cpp	2012-11-05 20:39:11 +0000
+++ plugins/Script/Plugin.cpp	2012-11-08 12:41:54 +0000
@@ -26,6 +26,11 @@
 
 #include <boost/filesystem/operations.hpp>
 
+using dcapi::Config;
+using dcapi::Core;
+using dcapi::Logger;
+using dcapi::Util;
+
 Plugin* Plugin::instance = nullptr;
 
 Plugin::Plugin() { L = nullptr; }

=== modified file 'plugins/Script/ScriptInstance.cpp'
--- plugins/Script/ScriptInstance.cpp	2012-11-04 19:15:24 +0000
+++ plugins/Script/ScriptInstance.cpp	2012-11-08 12:41:54 +0000
@@ -26,6 +26,10 @@
 #include <pluginsdk/Logger.h>
 #include <pluginsdk/Util.h>
 
+using dcapi::Config;
+using dcapi::Logger;
+using dcapi::Util;
+
 lua_State* ScriptInstance::L = NULL;
 CriticalSection ScriptInstance::cs;
 

=== modified file 'plugins/Test/Plugin.cpp'
--- plugins/Test/Plugin.cpp	2012-11-04 19:15:24 +0000
+++ plugins/Test/Plugin.cpp	2012-11-08 12:41:54 +0000
@@ -24,6 +24,11 @@
 #include <pluginsdk/Logger.h>
 #include <pluginsdk/Util.h>
 
+using dcapi::Config;
+using dcapi::Core;
+using dcapi::Logger;
+using dcapi::Util;
+
 Plugin* Plugin::instance = nullptr;
 
 Plugin::Plugin() {

=== modified file 'pluginsdk/cpp/pluginsdk/Config.cpp'
--- pluginsdk/cpp/pluginsdk/Config.cpp	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Config.cpp	2012-11-08 12:41:54 +0000
@@ -20,6 +20,8 @@
 
 #include "Config.h"
 
+namespace dcapi {
+
 DCConfigPtr Config::config;
 
 bool Config::init(DCCorePtr core) {
@@ -43,3 +45,5 @@
 void Config::freeCoreConfig(ConfigValuePtr value) { config->release(value); }
 
 string Config::getPath(PathType type) { return config->get_path(type); }
+
+} // namespace dcapi

=== modified file 'pluginsdk/cpp/pluginsdk/Config.h'
--- pluginsdk/cpp/pluginsdk/Config.h	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Config.h	2012-11-08 12:41:54 +0000
@@ -26,6 +26,8 @@
 
 #include <pluginsdk/PluginDefs.h>
 
+namespace dcapi {
+
 using std::string;
 
 class Config
@@ -69,4 +71,6 @@
 	return ret;
 }
 
+} // namespace dcapi
+
 #endif

=== modified file 'pluginsdk/cpp/pluginsdk/Core.cpp'
--- pluginsdk/cpp/pluginsdk/Core.cpp	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Core.cpp	2012-11-08 12:41:54 +0000
@@ -20,6 +20,8 @@
 
 #include "Core.h"
 
+namespace dcapi {
+
 DCCorePtr Core::core;
 string Core::appName;
 
@@ -27,3 +29,5 @@
 	core = corePtr;
 	appName = core->host_name();
 }
+
+} // namespace dcapi

=== modified file 'pluginsdk/cpp/pluginsdk/Core.h'
--- pluginsdk/cpp/pluginsdk/Core.h	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Core.h	2012-11-08 12:41:54 +0000
@@ -26,6 +26,8 @@
 
 #include <pluginsdk/PluginDefs.h>
 
+namespace dcapi {
+
 using std::string;
 
 class Core
@@ -39,4 +41,6 @@
 	static DCCorePtr core;
 };
 
+} // namespace dcapi
+
 #endif

=== modified file 'pluginsdk/cpp/pluginsdk/Logger.cpp'
--- pluginsdk/cpp/pluginsdk/Logger.cpp	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Logger.cpp	2012-11-08 12:41:54 +0000
@@ -20,6 +20,8 @@
 
 #include "Logger.h"
 
+namespace dcapi {
+
 DCLogPtr Logger::logger;
 
 bool Logger::init(DCCorePtr core) {
@@ -29,3 +31,5 @@
 void Logger::init(DCLogPtr coreLogger) { logger = coreLogger; }
 
 void Logger::log(const string& message) { logger->log(message.c_str()); }
+
+} // namespace dcapi

=== modified file 'pluginsdk/cpp/pluginsdk/Logger.h'
--- pluginsdk/cpp/pluginsdk/Logger.h	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Logger.h	2012-11-08 12:41:54 +0000
@@ -26,6 +26,8 @@
 
 #include <pluginsdk/PluginDefs.h>
 
+namespace dcapi {
+
 using std::string;
 
 class Logger
@@ -40,4 +42,6 @@
 	static DCLogPtr logger;
 };
 
+} // namespace dcapi
+
 #endif

=== modified file 'pluginsdk/cpp/pluginsdk/Util.cpp'
--- pluginsdk/cpp/pluginsdk/Util.cpp	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Util.cpp	2012-11-08 12:41:54 +0000
@@ -20,6 +20,8 @@
 
 #include "Util.h"
 
+namespace dcapi {
+
 DCUtilsPtr Util::utils;
 
 bool Util::init(DCCorePtr core) {
@@ -68,3 +70,5 @@
 	res.resize(utils->to_utf8(&res[0], &str[0], str.size()));
 	return res;
 }
+
+} // namespace dcapi

=== modified file 'pluginsdk/cpp/pluginsdk/Util.h'
--- pluginsdk/cpp/pluginsdk/Util.h	2012-11-04 19:15:24 +0000
+++ pluginsdk/cpp/pluginsdk/Util.h	2012-11-08 12:41:54 +0000
@@ -26,6 +26,8 @@
 
 #include <pluginsdk/PluginDefs.h>
 
+namespace dcapi {
+
 using std::string;
 #ifdef _UNICODE
 using std::wstring;
@@ -53,4 +55,6 @@
 	static DCUtilsPtr utils;
 };
 
+} // namespace dcapi
+
 #endif