reverting log plugin to rev 1660

This commit is contained in:
sfb 2011-08-04 09:21:38 -05:00
parent bdac2b9489
commit 4462383a26
2 changed files with 16 additions and 25 deletions

View file

@ -103,7 +103,7 @@ namespace Plugin
QString CLogPlugin::name() const QString CLogPlugin::name() const
{ {
return "LogPlugin"; return "NeL Log";
} }
QString CLogPlugin::version() const QString CLogPlugin::version() const
@ -139,10 +139,10 @@ namespace Plugin
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(Core::Constants::LOG_SECTION); settings->beginGroup(Core::Constants::LOG_SECTION);
bool error = settings->value(Core::Constants::LOG_ERROR, true).toBool(); bool error = settings->value(Core::Constants::LOG_ERROR, true).toBool();
bool warning = settings->value(Core::Constants::LOG_WARNING, true).toBool(); bool warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
bool debug = settings->value(Core::Constants::LOG_DEBUG, true).toBool(); bool debug = settings->value(Core::Constants::LOG_DEBUG, true).toBool();
bool assert = settings->value(Core::Constants::LOG_ASSERT, true).toBool(); bool assert = settings->value(Core::Constants::LOG_ASSERT, true).toBool();
bool info = settings->value(Core::Constants::LOG_INFO, true).toBool(); bool info = settings->value(Core::Constants::LOG_INFO, true).toBool();
settings->endGroup(); settings->endGroup();

View file

@ -28,8 +28,8 @@
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QSettings> #include <QtCore/QSettings>
namespace ExtensionSystem namespace ExtensionSystem
{ {
class IPluginManager; class IPluginManager;
} }
@ -42,10 +42,10 @@ namespace Plugin
: IOptionsPage(parent), : IOptionsPage(parent),
m_logPlugin(logPlugin), m_logPlugin(logPlugin),
m_currentPage(NULL), m_currentPage(NULL),
m_error(true), m_error(true),
m_warning(true), m_warning(true),
m_debug(true), m_debug(true),
m_assert(true), m_assert(true),
m_info(true) m_info(true)
{ {
} }
@ -99,16 +99,7 @@ namespace Plugin
m_info = m_ui.infoCheck->isChecked(); m_info = m_ui.infoCheck->isChecked();
writeSettings(); writeSettings();
ExtensionSystem::IPluginManager *p = Core::ICore::instance()->pluginManager(); m_logPlugin->setDisplayers();
ExtensionSystem::IPluginSpec *spec = p->pluginByName("LogPlugin");
if(spec)
{
ExtensionSystem::IPlugin *plugin = spec->plugin();
CLogPlugin* lp = dynamic_cast<CLogPlugin*>(plugin);
if (lp)
lp->setDisplayers();
}
} }
void CLogSettingsPage::readSettings() void CLogSettingsPage::readSettings()
@ -116,10 +107,10 @@ namespace Plugin
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(Core::Constants::LOG_SECTION); settings->beginGroup(Core::Constants::LOG_SECTION);
m_error = settings->value(Core::Constants::LOG_ERROR, true).toBool(); m_error = settings->value(Core::Constants::LOG_ERROR, true).toBool();
m_warning = settings->value(Core::Constants::LOG_WARNING, true).toBool(); m_warning = settings->value(Core::Constants::LOG_WARNING, true).toBool();
m_debug = settings->value(Core::Constants::LOG_DEBUG, true).toBool(); m_debug = settings->value(Core::Constants::LOG_DEBUG, true).toBool();
m_assert = settings->value(Core::Constants::LOG_ASSERT, true).toBool(); m_assert = settings->value(Core::Constants::LOG_ASSERT, true).toBool();
m_info = settings->value(Core::Constants::LOG_INFO, true).toBool(); m_info = settings->value(Core::Constants::LOG_INFO, true).toBool();
settings->endGroup(); settings->endGroup();
} }