aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-23 23:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from default

Browse source 
--HG--
branch : gsoc2011-worldeditorqt
This commit is contained in:
dnk-88 2011-07-13 04:10:35 +03:00
commit 14459c702f
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/tools/3d/object_viewer_qt/src/main.cpp
View file

@ -124,6 +124,7 @@ sint main(int argc, char **argv)
nlinfo("Welcome to NeL Object Viewer Qt!"); nlinfo("Welcome to NeL Object Viewer Qt!");
} }
QApplication::setGraphicsSystem("raster");
QApplication app(argc, argv); QApplication app(argc, argv);
QSplashScreen *splash = new QSplashScreen(); QSplashScreen *splash = new QSplashScreen();
splash->setPixmap(QPixmap(":/images/nel_ide_load.png")); splash->setPixmap(QPixmap(":/images/nel_ide_load.png"));

2
code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_plugin.cpp
View file

@ -68,7 +68,7 @@ namespace Plugin
{ {
Q_UNUSED(errorString); Q_UNUSED(errorString);
m_plugMan = pluginManager; m_plugMan = pluginManager;
m_logSettingsPage = new CLogSettingsPage(this); m_logSettingsPage = new CLogSettingsPage(this, this);
addAutoReleasedObject(m_logSettingsPage); addAutoReleasedObject(m_logSettingsPage);
return true; return true;
} }

11
code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.cpp
View file

@ -38,8 +38,9 @@ namespace Plugin
class CLogPlugin; class CLogPlugin;
CLogSettingsPage::CLogSettingsPage(QObject *parent) CLogSettingsPage::CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent)
: IOptionsPage(parent), : IOptionsPage(parent),
m_logPlugin(logPlugin),
m_currentPage(NULL), m_currentPage(NULL),
m_error(true), m_error(true),
m_warning(true), m_warning(true),
@ -98,13 +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::IPlugin *plugin = p->pluginByName("LogPlugin")->plugin();
CLogPlugin* lp = dynamic_cast<CLogPlugin*>(plugin);
if (lp)
{
lp->setDisplayers();
}
} }
void CLogSettingsPage::readSettings() void CLogSettingsPage::readSettings()

5
code/nel/tools/3d/object_viewer_qt/src/plugins/log/log_settings_page.h
View file

@ -29,6 +29,8 @@ class QWidget;
namespace Plugin namespace Plugin
{ {
class CLogPlugin;
/** /**
@class CLogSettingsPage @class CLogSettingsPage
*/ */
@ -36,7 +38,7 @@ namespace Plugin
{ {
Q_OBJECT Q_OBJECT
public: public:
CLogSettingsPage(QObject *parent = 0); CLogSettingsPage(CLogPlugin *logPlugin, QObject *parent = 0);
virtual ~CLogSettingsPage() {} virtual ~CLogSettingsPage() {}
virtual QString id() const; virtual QString id() const;
@ -53,6 +55,7 @@ namespace Plugin
void readSettings(); void readSettings();
void writeSettings(); void writeSettings();
CLogPlugin *m_logPlugin;
QWidget *m_currentPage; QWidget *m_currentPage;
Ui::CLogSettingsPage m_ui; Ui::CLogSettingsPage m_ui;