diff options
Diffstat (limited to 'src/modules/addon/AddonManagementDialog.cpp')
| -rw-r--r-- | src/modules/addon/AddonManagementDialog.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp index 1e2316c7e..bc67931f6 100644 --- a/src/modules/addon/AddonManagementDialog.cpp +++ b/src/modules/addon/AddonManagementDialog.cpp @@ -56,9 +56,7 @@ #include <QAbstractTextDocumentLayout> #include <QShortcut> -#ifdef COMPILE_WEBENGINE_SUPPORT #include "WebAddonInterfaceDialog.h" -#endif //COMPILE_WEBENGINE_SUPPORT AddonManagementDialog * AddonManagementDialog::m_pInstance = nullptr; extern QRect g_rectManagementDialogGeometry; @@ -98,9 +96,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) setObjectName("Addon manager"); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons))); -#ifdef COMPILE_WEBENGINE_SUPPORT m_pWebInterfaceDialog = nullptr; -#endif //COMPILE_WEBENGINE_SUPPORT m_pInstance = this; QGridLayout * g = new QGridLayout(this); @@ -200,10 +196,8 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) AddonManagementDialog::~AddonManagementDialog() { -#ifdef COMPILE_WEBENGINE_SUPPORT if(m_pWebInterfaceDialog) delete m_pWebInterfaceDialog; -#endif //COMPILE_WEBENGINE_SUPPORT g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); m_pInstance = nullptr; } @@ -292,14 +286,22 @@ void AddonManagementDialog::uninstallScript() void AddonManagementDialog::getMoreScripts() { -#ifdef COMPILE_WEBENGINE_SUPPORT if(m_pWebInterfaceDialog) - return; - m_pWebInterfaceDialog = new WebAddonInterfaceDialog(); -#else //!COMPILE_WEBENGINE_SUPPORT - // If change this introducing not-fixed text, remember to escape this using KviQString::escapeKvs()! - KviKvsScript::run("openurl http://www.kvirc.net/?id=addons&version=" KVI_VERSION "." KVI_SOURCES_DATE, g_pActiveWindow); -#endif //!COMPILE_WEBENGINE_SUPPORT + { + m_pWebInterfaceDialog->show(); + } + else + { + m_pWebInterfaceDialog = new WebAddonInterfaceDialog(); + QObject::connect(m_pWebInterfaceDialog, SIGNAL(destroyed()), this, SLOT(webInterfaceDialogDestroyed())); + m_pWebInterfaceDialog->show(); + } +} + +void AddonManagementDialog::webInterfaceDialogDestroyed() +{ + m_pWebInterfaceDialog = nullptr; + fillListView(); } void AddonManagementDialog::installScript() |