diff options
Diffstat (limited to 'src/modules/addon')
| -rw-r--r-- | src/modules/addon/AddonFunctions.cpp (renamed from src/modules/addon/addonfunctions.cpp) | 6 | ||||
| -rw-r--r-- | src/modules/addon/AddonFunctions.h (renamed from src/modules/addon/addonfunctions.h) | 4 | ||||
| -rw-r--r-- | src/modules/addon/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/addon/PackAddonDialog.cpp (renamed from src/modules/addon/packaddondialog.cpp) | 58 | ||||
| -rw-r--r-- | src/modules/addon/PackAddonDialog.h (renamed from src/modules/addon/packaddondialog.h) | 80 | ||||
| -rw-r--r-- | src/modules/addon/libkviaddon.cpp | 10 | ||||
| -rw-r--r-- | src/modules/addon/managementdialog.cpp | 62 | ||||
| -rw-r--r-- | src/modules/addon/managementdialog.h | 16 |
8 files changed, 121 insertions, 121 deletions
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 590935319..83641d90e 100644 --- a/src/modules/addon/addonfunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : addonfunctions.cpp +// File : AddonFunctions.cpp // Creation date : Fri 02 May 2008 17:36:07 by Elvio Basello // // This file is part of the KVIrc IRC Client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "addonfunctions.h" +#include "AddonFunctions.h" #include "KviPackageReader.h" #include "KviLocale.h" @@ -40,7 +40,7 @@ #include <stdlib.h> -namespace KviAddonFunctions +namespace AddonFunctions { bool notAValidAddonPackage(QString &szError) { diff --git a/src/modules/addon/addonfunctions.h b/src/modules/addon/AddonFunctions.h index c8b39e9b0..adcc455c2 100644 --- a/src/modules/addon/addonfunctions.h +++ b/src/modules/addon/AddonFunctions.h @@ -2,7 +2,7 @@ #define _ADDONFUNCTIONS_H_ //============================================================================= // -// File : addonfunctions.h +// File : AddonFunctions.h // Creation date : Fri 02 May 2008 17:36:07 by Elvio Basello // // This file is part of the KVIrc IRC Client distribution @@ -32,7 +32,7 @@ #define KVI_CURRENT_ADDONS_ENGINE_VERSION "2.0.0" -namespace KviAddonFunctions +namespace AddonFunctions { bool notAValidAddonPackage(QString & szError); bool installAddonPackage(const QString & szAddonPackageFileName, QString & szError, QWidget * pDialogParent = 0); diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt index f52881251..53ee2e847 100644 --- a/src/modules/addon/CMakeLists.txt +++ b/src/modules/addon/CMakeLists.txt @@ -2,14 +2,14 @@ SET(kviaddon_MOC_HDRS managementdialog.h - packaddondialog.h + PackAddonDialog.h ) SET(kviaddon_SRCS libkviaddon.cpp managementdialog.cpp - packaddondialog.cpp - addonfunctions.cpp + PackAddonDialog.cpp + AddonFunctions.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/PackAddonDialog.cpp index ce2c52890..0e36a1654 100644 --- a/src/modules/addon/packaddondialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -1,6 +1,6 @@ //============================================================================ // -// File : packaddondialog.cpp +// File : PackAddonDialog.cpp // Creation date : Sat 03 May 2008 01:40:44 by Elvio Basello // // This file is part of the KVIrc IRC Client distribution @@ -22,8 +22,8 @@ // //============================================================================ -#include "packaddondialog.h" -#include "addonfunctions.h" +#include "PackAddonDialog.h" +#include "AddonFunctions.h" #include "KviLocale.h" #include "KviFileUtils.h" @@ -44,7 +44,7 @@ #include <QBuffer> -KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent) +PackAddonDialog::PackAddonDialog(QWidget * pParent) : QWizard(pParent) { setMinimumSize(400,350); @@ -105,35 +105,35 @@ KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent) addPage(pPage); // Packager information - m_pPackAddonInfoPackageWidget = new KviPackAddonInfoPackageWidget(this); + m_pPackAddonInfoPackageWidget = new PackAddonInfoPackageWidget(this); addPage(m_pPackAddonInfoPackageWidget); // File selection - m_pPackAddonFileSelectionWidget = new KviPackAddonFileSelectionWidget(this); + m_pPackAddonFileSelectionWidget = new PackAddonFileSelectionWidget(this); addPage(m_pPackAddonFileSelectionWidget); // Save selection - m_pPackAddonSaveSelectionWidget = new KviPackAddonSaveSelectionWidget(this); + m_pPackAddonSaveSelectionWidget = new PackAddonSaveSelectionWidget(this); addPage(m_pPackAddonSaveSelectionWidget); // Summary info - m_pPackAddonSummaryInfoWidget = new KviPackAddonSummaryInfoWidget(this); + m_pPackAddonSummaryInfoWidget = new PackAddonSummaryInfoWidget(this); addPage(m_pPackAddonSummaryInfoWidget); } -KviPackAddonDialog::~KviPackAddonDialog() +PackAddonDialog::~PackAddonDialog() { } -void KviPackAddonDialog::accept() +void PackAddonDialog::accept() { if(!packAddon()) return; QWizard::accept(); } -bool KviPackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning) +bool PackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning) { if(pszError) *pszError = ""; if(pszWarning) *pszWarning = ""; @@ -156,7 +156,7 @@ bool KviPackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning) } #if 0 -bool KviPackAddonDialog::createInstaller(QString * pszError) +bool PackAddonDialog::createInstaller(QString * pszError) { if(pszError) *pszError = ""; @@ -259,7 +259,7 @@ bool KviPackAddonDialog::createInstaller(QString * pszError) #endif -bool KviPackAddonDialog::packAddon() +bool PackAddonDialog::packAddon() { // Get data from registered fields m_szAuthor = field("packageAuthor").toString(); @@ -292,7 +292,7 @@ bool KviPackAddonDialog::packAddon() } // Raise the files summary dialog - m_pPackAddonSummaryFilesWidget = new KviPackAddonSummaryFilesWidget(this); + m_pPackAddonSummaryFilesWidget = new PackAddonSummaryFilesWidget(this); m_pPackAddonSummaryFilesWidget->setPath(m_szDirPath); if(m_pPackAddonSummaryFilesWidget->exec() == QDialog::Rejected) { @@ -395,7 +395,7 @@ bool KviPackAddonDialog::packAddon() } -KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog * pParent) +PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent) : QWizardPage(pParent) { setObjectName("addon_package_info_page"); @@ -457,12 +457,12 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog registerField("packageMinVersion",m_pPackageMinVersionEdit); } -KviPackAddonInfoPackageWidget::~KviPackAddonInfoPackageWidget() +PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget() { } -KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDialog * pParent) +PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent) : QWizardPage(pParent) { setObjectName("addon_package_file_page"); @@ -484,12 +484,12 @@ KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDia registerField("packageIcon*",m_pPackageIconEdit); } -KviPackAddonFileSelectionWidget::~KviPackAddonFileSelectionWidget() +PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget() { } -KviPackAddonSaveSelectionWidget::KviPackAddonSaveSelectionWidget(KviPackAddonDialog * pParent) +PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent) : QWizardPage(pParent) { setObjectName("addon_package_save_page"); @@ -513,11 +513,11 @@ KviPackAddonSaveSelectionWidget::KviPackAddonSaveSelectionWidget(KviPackAddonDia registerField("packageSavePath*",m_pSavePathSelector); } -KviPackAddonSaveSelectionWidget::~KviPackAddonSaveSelectionWidget() +PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget() { } -void KviPackAddonSaveSelectionWidget::initializePage() +void PackAddonSaveSelectionWidget::initializePage() { // Get data from registered fields QString szName = field("packageName").toString(); @@ -534,7 +534,7 @@ void KviPackAddonSaveSelectionWidget::initializePage() } -KviPackAddonSummaryInfoWidget::KviPackAddonSummaryInfoWidget(KviPackAddonDialog * pParent) +PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent) : QWizardPage(pParent) { setObjectName("addon_package_summary_info_page"); @@ -546,11 +546,11 @@ KviPackAddonSummaryInfoWidget::KviPackAddonSummaryInfoWidget(KviPackAddonDialog pLayout->addWidget(m_pLabelInfo); } -KviPackAddonSummaryInfoWidget::~KviPackAddonSummaryInfoWidget() +PackAddonSummaryInfoWidget::~PackAddonSummaryInfoWidget() { } -void KviPackAddonSummaryInfoWidget::initializePage() +void PackAddonSummaryInfoWidget::initializePage() { // Get data from registered fields QString szAuthor = field("packageAuthor").toString(); @@ -600,7 +600,7 @@ void KviPackAddonSummaryInfoWidget::initializePage() } -KviPackAddonSummaryFilesWidget::KviPackAddonSummaryFilesWidget(KviPackAddonDialog * pParent) +PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pParent) : QDialog(pParent) { setObjectName("addon_package_summary_file_dialog"); @@ -629,21 +629,21 @@ KviPackAddonSummaryFilesWidget::KviPackAddonSummaryFilesWidget(KviPackAddonDialo pLayout->addWidget(pBox); } -KviPackAddonSummaryFilesWidget::~KviPackAddonSummaryFilesWidget() +PackAddonSummaryFilesWidget::~PackAddonSummaryFilesWidget() { } -void KviPackAddonSummaryFilesWidget::accept() +void PackAddonSummaryFilesWidget::accept() { QDialog::accept(); } -void KviPackAddonSummaryFilesWidget::reject() +void PackAddonSummaryFilesWidget::reject() { QDialog::reject(); } -void KviPackAddonSummaryFilesWidget::showEvent(QShowEvent *) +void PackAddonSummaryFilesWidget::showEvent(QShowEvent *) { QStringList list; diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/PackAddonDialog.h index bf5dbf1ba..5819a8186 100644 --- a/src/modules/addon/packaddondialog.h +++ b/src/modules/addon/PackAddonDialog.h @@ -2,7 +2,7 @@ #define _PACKADDONDIALOG_H_ //============================================================================= // -// File : packaddondialog.h +// File : PackAddonDialog.h // Creation date : Sat 03 May 2008 01:40:44 by Elvio Basello // // This file is part of the KVIrc IRC Client distribution @@ -25,7 +25,7 @@ //============================================================================= /** -* \file packaddondialog.h +* \file PackAddonDialog.h * \author Elvio Basello * \brief Addon package creator * @@ -46,37 +46,37 @@ class QLabel; class KviPackageWriter; -class KviPackAddonInfoPackageWidget; -class KviPackAddonFileSelectionWidget; -class KviPackAddonSaveSelectionWidget; -class KviPackAddonSummaryInfoWidget; -class KviPackAddonSummaryFilesWidget; +class PackAddonInfoPackageWidget; +class PackAddonFileSelectionWidget; +class PackAddonSaveSelectionWidget; +class PackAddonSummaryInfoWidget; +class PackAddonSummaryFilesWidget; /** -* \class KviPackAddonDialog +* \class PackAddonDialog * \brief Wizard for addon creation */ -class KviPackAddonDialog : public QWizard +class PackAddonDialog : public QWizard { Q_OBJECT public: /** * \brief Creates the wizard object * \param pParent The parent widget - * \return KviPackAddonDialog + * \return PackAddonDialog */ - KviPackAddonDialog(QWidget * pParent); + PackAddonDialog(QWidget * pParent); /** * \brief Destroys the wizard object */ - ~KviPackAddonDialog(); + ~PackAddonDialog(); protected: - KviPackAddonInfoPackageWidget * m_pPackAddonInfoPackageWidget; - KviPackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget; - KviPackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget; - KviPackAddonSummaryInfoWidget * m_pPackAddonSummaryInfoWidget; - KviPackAddonSummaryFilesWidget * m_pPackAddonSummaryFilesWidget; + PackAddonInfoPackageWidget * m_pPackAddonInfoPackageWidget; + PackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget; + PackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget; + PackAddonSummaryInfoWidget * m_pPackAddonSummaryInfoWidget; + PackAddonSummaryFilesWidget * m_pPackAddonSummaryFilesWidget; QString m_szAuthor; QString m_szName; QString m_szVersion; @@ -115,24 +115,24 @@ protected: }; /** -* \class KviPackAddonInfoPackageWidget +* \class PackAddonInfoPackageWidget * \brief Wizard page for addon information */ -class KviPackAddonInfoPackageWidget : public QWizardPage +class PackAddonInfoPackageWidget : public QWizardPage { Q_OBJECT public: /** * \brief Create the wizard package info page object * \param pParent The parent widget - * \return KviPackAddonInfoPackageWidget + * \return PackAddonInfoPackageWidget */ - KviPackAddonInfoPackageWidget(KviPackAddonDialog * pParent); + PackAddonInfoPackageWidget(PackAddonDialog * pParent); /** * \brief Destroys the wizard package info page object */ - ~KviPackAddonInfoPackageWidget(); + ~PackAddonInfoPackageWidget(); protected: QLineEdit * m_pPackageAuthorEdit; QLineEdit * m_pPackageNameEdit; @@ -142,24 +142,24 @@ protected: }; /** -* \class KviPackAddonFileSelectionWidget +* \class PackAddonFileSelectionWidget * \brief Wizard page for directory source selection */ -class KviPackAddonFileSelectionWidget : public QWizardPage +class PackAddonFileSelectionWidget : public QWizardPage { Q_OBJECT public: /** * \brief Create the wizard package source dir object * \param pParent The parent widget - * \return KviPackAddonFileSelectionWidget + * \return PackAddonFileSelectionWidget */ - KviPackAddonFileSelectionWidget(KviPackAddonDialog * pParent); + PackAddonFileSelectionWidget(PackAddonDialog * pParent); /** * \brief Destroys the wizard package source dir object */ - ~KviPackAddonFileSelectionWidget(); + ~PackAddonFileSelectionWidget(); protected: KviDirectorySelector * m_pDirPathSelector; KviFileSelector * m_pPackageIconEdit; @@ -168,24 +168,24 @@ protected: }; /** -* \class KviPackAddonSaveSelectionWidget +* \class PackAddonSaveSelectionWidget * \brief Wizard page for saving package */ -class KviPackAddonSaveSelectionWidget : public QWizardPage +class PackAddonSaveSelectionWidget : public QWizardPage { Q_OBJECT public: /** * \brief Create the wizard save page object * \param pParent The parent widget - * \return KviPackAddonSaveSelectionWidget + * \return PackAddonSaveSelectionWidget */ - KviPackAddonSaveSelectionWidget(KviPackAddonDialog * pParent); + PackAddonSaveSelectionWidget(PackAddonDialog * pParent); /** * \brief Destroys the wizard save page object */ - ~KviPackAddonSaveSelectionWidget(); + ~PackAddonSaveSelectionWidget(); protected: KviFileSelector * m_pSavePathSelector; QString m_szFilePath; @@ -198,24 +198,24 @@ protected: }; /** -* \class KviPackAddonSummaryInfoWidget +* \class PackAddonSummaryInfoWidget * \brief Wizard page for showing information inserted */ -class KviPackAddonSummaryInfoWidget : public QWizardPage +class PackAddonSummaryInfoWidget : public QWizardPage { Q_OBJECT public: /** * \brief Create the wizard summary info page object * \param pParent The parent widget - * \return KviPackAddonSummaryInfoWidget + * \return PackAddonSummaryInfoWidget */ - KviPackAddonSummaryInfoWidget(KviPackAddonDialog * pParent); + PackAddonSummaryInfoWidget(PackAddonDialog * pParent); /** * \brief Destroys the wizard summary info page object */ - ~KviPackAddonSummaryInfoWidget(); + ~PackAddonSummaryInfoWidget(); protected: QLabel * m_pLabelInfo; QLabel * m_pLabelAuthor; @@ -231,12 +231,12 @@ protected: }; -class KviPackAddonSummaryFilesWidget : public QDialog +class PackAddonSummaryFilesWidget : public QDialog { Q_OBJECT public: - KviPackAddonSummaryFilesWidget(KviPackAddonDialog * pParent); - ~KviPackAddonSummaryFilesWidget(); + PackAddonSummaryFilesWidget(PackAddonDialog * pParent); + ~PackAddonSummaryFilesWidget(); protected: QTextEdit * m_pFiles; QString m_szPath; diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 79f39a851..c852c5b13 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "managementdialog.h" -#include "addonfunctions.h" +#include "AddonFunctions.h" #include "KviModule.h" #include "KviKvsScriptAddonManager.h" @@ -776,7 +776,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall *c) { - KviScriptManagementDialog::display(c->hasSwitch('t',"toplevel")); + AddonManagementDialog::display(c->hasSwitch('t',"toplevel")); return true; } @@ -803,7 +803,7 @@ static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) QString szError; - if(!KviAddonFunctions::installAddonPackage(szAddonPackFile,szError)) + if(!AddonFunctions::installAddonPackage(szAddonPackFile,szError)) { c->error(__tr2qs_ctx("Error installing addon package: %Q","addon"),&szError); return false; @@ -839,7 +839,7 @@ static bool addon_module_init(KviModule *m) static bool addon_module_cleanup(KviModule *m) { - KviScriptManagementDialog::cleanup(); + AddonManagementDialog::cleanup(); QString szBuf; m->getDefaultConfigFileName(szBuf); @@ -851,7 +851,7 @@ static bool addon_module_cleanup(KviModule *m) static bool addon_module_can_unload(KviModule *) { - return (!KviScriptManagementDialog::instance()); + return (!AddonManagementDialog::instance()); } diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 846c5e112..d2f4d2ef9 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -23,8 +23,8 @@ //============================================================================= #include "managementdialog.h" -#include "packaddondialog.h" -#include "addonfunctions.h" +#include "PackAddonDialog.h" +#include "AddonFunctions.h" #include "KviApplication.h" #include "KviLocale.h" @@ -56,10 +56,10 @@ #include <QAbstractTextDocumentLayout> -KviScriptManagementDialog * KviScriptManagementDialog::m_pInstance = 0; +AddonManagementDialog * AddonManagementDialog::m_pInstance = 0; extern QRect g_rectManagementDialogGeometry; -KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a) +AddonListViewItem::AddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a) : KviTalListWidgetItem(v) { m_pAddon = new KviKvsScriptAddon(*a); @@ -81,12 +81,12 @@ KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListWidget *v,KviKv if (p) setIcon(*p); } -KviScriptAddonListViewItem::~KviScriptAddonListViewItem() +AddonListViewItem::~AddonListViewItem() { delete m_pAddon; } -KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p) +AddonManagementDialog::AddonManagementDialog(QWidget * p) : QWidget(p) { setWindowTitle(__tr2qs_ctx("Manage Script-Based Addons","addon")); @@ -186,13 +186,13 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p) g_rectManagementDialogGeometry.y()); } -KviScriptManagementDialog::~KviScriptManagementDialog() +AddonManagementDialog::~AddonManagementDialog() { g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height()); m_pInstance = 0; } -void KviScriptManagementDialog::fillListView() +void AddonManagementDialog::fillListView() { m_pListWidget->clear(); KviPointerHashTable<QString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict(); @@ -201,14 +201,14 @@ void KviScriptManagementDialog::fillListView() while(KviKvsScriptAddon * a = it.current()) { - new KviScriptAddonListViewItem(m_pListWidget,a); + new AddonListViewItem(m_pListWidget,a); ++it; } } -void KviScriptManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem *) +void AddonManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem *) { - KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)item; + AddonListViewItem * it = (AddonListViewItem *)item; if(!it) { m_pConfigureButton->setEnabled(false); @@ -221,32 +221,32 @@ void KviScriptManagementDialog::currentChanged(QListWidgetItem *item,QListWidget } } -void KviScriptManagementDialog::showScriptHelp() +void AddonManagementDialog::showScriptHelp() { - KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem(); + AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); if(!it)return; if(it->addon()->helpCallbackCode().isEmpty())return; it->addon()->executeHelpCallback(g_pActiveWindow); } -void KviScriptManagementDialog::configureScript() +void AddonManagementDialog::configureScript() { - KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem(); + AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); if(!it)return; if(it->addon()->configureCallbackCode().isEmpty())return; it->addon()->executeConfigureCallback(g_pActiveWindow); } -void KviScriptManagementDialog::packScript() +void AddonManagementDialog::packScript() { - KviPackAddonDialog * pDialog = new KviPackAddonDialog(this); + PackAddonDialog * pDialog = new PackAddonDialog(this); pDialog->exec(); delete pDialog; } -void KviScriptManagementDialog::uninstallScript() +void AddonManagementDialog::uninstallScript() { - KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem(); + AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); if(!it)return; QString txt = "<p>"; @@ -265,13 +265,13 @@ void KviScriptManagementDialog::uninstallScript() currentChanged(0,0); } -void KviScriptManagementDialog::getMoreScripts() +void AddonManagementDialog::getMoreScripts() { // 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); } -void KviScriptManagementDialog::installScript() +void AddonManagementDialog::installScript() { QString szFileName, szError; @@ -286,7 +286,7 @@ void KviScriptManagementDialog::installScript() // Sanity check if(szFileName.endsWith(".kva")) { - if(!KviAddonFunctions::installAddonPackage(szFileName,szError,this)) + if(!AddonFunctions::installAddonPackage(szFileName,szError,this)) { QMessageBox::critical( this, @@ -301,7 +301,7 @@ void KviScriptManagementDialog::installScript() } else { // Just for sanity check. We should NEVER enter here qDebug("Entered sanity check"); - KviAddonFunctions::notAValidAddonPackage(szError); + AddonFunctions::notAValidAddonPackage(szError); QMessageBox::critical( this, __tr2qs_ctx("Install Addon - KVIrc","addon"), @@ -319,7 +319,7 @@ void KviScriptManagementDialog::installScript() //m_pListWidget->triggerUpdate(); } -void KviScriptManagementDialog::showEvent(QShowEvent * e) +void AddonManagementDialog::showEvent(QShowEvent * e) { QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); move((rect.width() - width())/2,(rect.height() - height())/2); @@ -327,19 +327,19 @@ void KviScriptManagementDialog::showEvent(QShowEvent * e) QWidget::showEvent(e); } -void KviScriptManagementDialog::closeClicked() +void AddonManagementDialog::closeClicked() { delete this; } -void KviScriptManagementDialog::cleanup() +void AddonManagementDialog::cleanup() { if(!m_pInstance)return; delete m_pInstance; m_pInstance = 0; } -void KviScriptManagementDialog::display(bool bTopLevel) +void AddonManagementDialog::display(bool bTopLevel) { if(m_pInstance) { @@ -358,9 +358,9 @@ void KviScriptManagementDialog::display(bool bTopLevel) } else { if(bTopLevel) { - m_pInstance = new KviScriptManagementDialog(0); + m_pInstance = new AddonManagementDialog(0); } else { - m_pInstance = new KviScriptManagementDialog(g_pFrame->splitter()); + m_pInstance = new AddonManagementDialog(g_pFrame->splitter()); } } m_pInstance->show(); @@ -368,13 +368,13 @@ void KviScriptManagementDialog::display(bool bTopLevel) m_pInstance->setFocus(); } -void KviScriptManagementDialog::closeEvent(QCloseEvent * e) +void AddonManagementDialog::closeEvent(QCloseEvent * e) { e->ignore(); delete this; } -void KviScriptManagementDialog::reject() +void AddonManagementDialog::reject() { cleanup(); } diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h index 45a6b8656..dd9fe1780 100644 --- a/src/modules/addon/managementdialog.h +++ b/src/modules/addon/managementdialog.h @@ -38,11 +38,11 @@ class QPixmap; class KviKvsScriptAddon; -class KviScriptAddonListViewItem : public KviTalListWidgetItem +class AddonListViewItem : public KviTalListWidgetItem { public: - KviScriptAddonListViewItem(KviTalListWidget * v,KviKvsScriptAddon * a); - ~KviScriptAddonListViewItem(); + AddonListViewItem(KviTalListWidget * v,KviKvsScriptAddon * a); + ~AddonListViewItem(); protected: KviKvsScriptAddon * m_pAddon; QTextDocument * m_pText; @@ -54,22 +54,22 @@ public: }; -class KviScriptManagementDialog : public QWidget +class AddonManagementDialog : public QWidget { Q_OBJECT protected: - KviScriptManagementDialog(QWidget * p); + AddonManagementDialog(QWidget * p); public: - ~KviScriptManagementDialog(); + ~AddonManagementDialog(); protected: KviTalListWidget * m_pListWidget; - static KviScriptManagementDialog * m_pInstance; + static AddonManagementDialog * m_pInstance; QToolButton * m_pConfigureButton; QToolButton * m_pHelpButton; QToolButton * m_pPackButton; QToolButton * m_pUninstallButton; public: - static KviScriptManagementDialog * instance(){ return m_pInstance; }; + static AddonManagementDialog * instance(){ return m_pInstance; }; static void display(bool bTopLevel); static void cleanup(); protected: |
