ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Button for core plugin is not generated to navigation bar. Added macro

Browse Source 
for plugin path.
This commit is contained in:
Rokos Josef
2016-06-23 16:05:36 +02:00
parent b927921fb3
commit b33ff1b169
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/mainwindow.cpp
+12 -9
View File
@@ -42,16 +42,19 @@ MainWindow::MainWindow(QWidget *parent) :
int i = 0; int i = 0;
foreach (IPlugin *plugin, Context::instance().plugins()) { foreach (IPlugin *plugin, Context::instance().plugins()) {
QToolButton *plugButton = new QToolButton(this); if (plugin->pluginId() != "CORE")
plugButton->setText(plugin->pluginName()); {
plugButton->setIcon(plugin->pluginIcon()); QToolButton *plugButton = new QToolButton(this);
plugButton->setIconSize(QSize(32, 32)); plugButton->setText(plugin->pluginName());
plugButton->setAutoRaise(true); plugButton->setIcon(plugin->pluginIcon());
plugButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); plugButton->setIconSize(QSize(32, 32));
ui->navigation->layout()->addWidget(plugButton); plugButton->setAutoRaise(true);
plugButton->setProperty(PLUGIN_INDEX, i); plugButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui->navigation->layout()->addWidget(plugButton);
plugButton->setProperty(PLUGIN_INDEX, i);
connect(plugButton, SIGNAL(clicked()), this, SLOT(openPlugin()) );
}
i++; i++;
connect(plugButton, SIGNAL(clicked()), this, SLOT(openPlugin()) );
} }
((QVBoxLayout*)ui->navigation->layout())->addStretch(1); ((QVBoxLayout*)ui->navigation->layout())->addStretch(1);
core/context.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ void Context::loadPlugins()
m_plugins.append(new Users); m_plugins.append(new Users);
m_plugins.append(new Roles); m_plugins.append(new Roles);
QDir pluginsDir(qApp->applicationDirPath() + "/../../plugins"); QDir pluginsDir(qApp->applicationDirPath() + PLUGIN_ROOT);
foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) { foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) {
QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName)); QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
core/define.h
+8
View File
@@ -13,5 +13,13 @@
#define TO_DEC(num) QDecDouble((double)num / DEC_MULTIPLE) #define TO_DEC(num) QDecDouble((double)num / DEC_MULTIPLE)
#define FROM_DEC(num) num.toDouble() * DEC_MULTIPLE #define FROM_DEC(num) num.toDouble() * DEC_MULTIPLE
#ifndef PLUGIN_ROOT
#ifdef _WIN32
#define PLUGIN_ROOT "/../../plugins"
#else
#define PLUGIN_ROOT "/../plugins"
#endif
#endif
#endif // DEFINE_H #endif // DEFINE_H