From 690dd7a33ddc90678367d73adf313533536e10f2 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 29 Apr 2016 23:57:30 +0100 Subject: Apply clang-format --- src/modules/addon/AddonFunctions.cpp | 138 ++++++------ src/modules/addon/AddonFunctions.h | 4 +- src/modules/addon/AddonManagementDialog.cpp | 192 ++++++++-------- src/modules/addon/AddonManagementDialog.h | 32 +-- src/modules/addon/PackAddonDialog.cpp | 198 ++++++++--------- src/modules/addon/PackAddonDialog.h | 43 ++-- src/modules/addon/WebAddonInterfaceDialog.cpp | 20 +- src/modules/addon/WebAddonInterfaceDialog.h | 7 +- src/modules/addon/libkviaddon.cpp | 308 ++++++++++++++------------ 9 files changed, 482 insertions(+), 460 deletions(-) (limited to 'src/modules/addon') diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 192e0d8ac..487681942 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -44,20 +44,19 @@ #include #include - #include namespace AddonFunctions { - bool notAValidAddonPackage(QString &szError) + bool notAValidAddonPackage(QString & szError) { - szError = __tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc addon package","addon"); + szError = __tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc addon package", "addon"); return false; } - bool installAddonPackage(const QString &szAddonPackageFileName,QString &szError,QWidget * pDialogParent) + bool installAddonPackage(const QString & szAddonPackageFileName, QString & szError, QWidget * pDialogParent) { - KviPointerHashTable * pInfoFields; + KviPointerHashTable * pInfoFields; QString * pValue; QString szErr; QPixmap pix; @@ -72,7 +71,7 @@ namespace AddonFunctions if(!r.readHeader(szAddonPackageFileName)) { szErr = r.lastError(); - szError = QString(__tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc package: %1","addon")).arg(szErr); + szError = QString(__tr2qs_ctx("The selected file doesn't seem to be a valid KVIrc package: %1", "addon")).arg(szErr); return false; } @@ -83,7 +82,7 @@ namespace AddonFunctions if(!pValue) return notAValidAddonPackage(szError); - if(!KviQString::equalCI(*pValue,"AddonPack")) + if(!KviQString::equalCI(*pValue, "AddonPack")) return notAValidAddonPackage(szError); pValue = pInfoFields->find("AddonPackVersion"); @@ -92,7 +91,7 @@ namespace AddonFunctions return notAValidAddonPackage(szError); // make sure the default fields exist - for(int i=0;i<6;i++) + for(int i = 0; i < 6; i++) { pValue = pInfoFields->find(check_fields[i]); if(!pValue) @@ -103,7 +102,7 @@ namespace AddonFunctions // load its picture pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) - pix.loadFromData(*pByteArray,0,0); + pix.loadFromData(*pByteArray, 0, 0); if(pix.isNull()) { @@ -120,18 +119,18 @@ namespace AddonFunctions QString szPackageApplication; QString szMinKVIrcVersion; - QString szAuthor = __tr2qs_ctx("Author","addon"); - QString szCreatedAt = __tr2qs_ctx("Created at","addon"); - QString szCreatedWith = __tr2qs_ctx("Created with","addon"); + QString szAuthor = __tr2qs_ctx("Author", "addon"); + QString szCreatedAt = __tr2qs_ctx("Created at", "addon"); + QString szCreatedWith = __tr2qs_ctx("Created with", "addon"); - r.getStringInfoField("Name",szPackageName); - r.getStringInfoField("Version",szPackageVersion); - r.getStringInfoField("Author",szPackageAuthor); - r.getStringInfoField("Description",szPackageDescription); - r.getStringInfoField("Application",szPackageApplication); - r.getStringInfoField("Date",szPackageDate); - r.getStringInfoField("AddonPackVersion",szAddonPackVersion); - r.getStringInfoField("MinimumKVIrcVersion",szMinKVIrcVersion); + r.getStringInfoField("Name", szPackageName); + r.getStringInfoField("Version", szPackageVersion); + r.getStringInfoField("Author", szPackageAuthor); + r.getStringInfoField("Description", szPackageDescription); + r.getStringInfoField("Application", szPackageApplication); + r.getStringInfoField("Date", szPackageDate); + r.getStringInfoField("AddonPackVersion", szAddonPackVersion); + r.getStringInfoField("MinimumKVIrcVersion", szMinKVIrcVersion); QString szWarnings; QString szTmp; @@ -141,23 +140,22 @@ namespace AddonFunctions if(szPackageName.isEmpty() || szPackageVersion.isEmpty() || szAddonPackVersion.isEmpty()) bValid = false; - if(KviMiscUtils::compareVersions(szAddonPackVersion,KVI_CURRENT_ADDONS_ENGINE_VERSION) < 0) + if(KviMiscUtils::compareVersions(szAddonPackVersion, KVI_CURRENT_ADDONS_ENGINE_VERSION) < 0) bValid = false; if(!szMinKVIrcVersion.isEmpty()) { - if(KviMiscUtils::compareVersions(szMinKVIrcVersion,KVI_VERSION) < 0) + if(KviMiscUtils::compareVersions(szMinKVIrcVersion, KVI_VERSION) < 0) bValid = false; } if(!bValid) { szWarnings += "

"; - szWarnings += __tr2qs_ctx("Warning: The addon might be incompatible with this version of KVIrc","addon"); + szWarnings += __tr2qs_ctx("Warning: The addon might be incompatible with this version of KVIrc", "addon"); szWarnings += "

"; } - // clang-format off hd.szHtmlText = QString( "" \ @@ -186,17 +184,17 @@ namespace AddonFunctions "").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedWith,szPackageApplication).arg(szWarnings); // clang-format on - hd.addImageResource("addon_dialog_pack_image",pix); - hd.addHtmlResource("addon_dialog_main",hd.szHtmlText); + hd.addImageResource("addon_dialog_pack_image", pix); + hd.addHtmlResource("addon_dialog_main", hd.szHtmlText); QString beginCenter = "
"; QString endCenter = "
"; - hd.szCaption = __tr2qs_ctx("Install Addon Pack - KVIrc","addon"); - hd.szUpperLabelText = beginCenter + __tr2qs_ctx("You're about to install the following addon package","addon") + endCenter; - hd.szLowerLabelText = beginCenter + __tr2qs_ctx("Do you want to proceed with the installation?","addon") + endCenter; - hd.szButton1Text = __tr2qs_ctx("Do Not Install","addon"); - hd.szButton2Text = __tr2qs_ctx("Yes, Proceed","addon"); + hd.szCaption = __tr2qs_ctx("Install Addon Pack - KVIrc", "addon"); + hd.szUpperLabelText = beginCenter + __tr2qs_ctx("You're about to install the following addon package", "addon") + endCenter; + hd.szLowerLabelText = beginCenter + __tr2qs_ctx("Do you want to proceed with the installation?", "addon") + endCenter; + hd.szButton1Text = __tr2qs_ctx("Do Not Install", "addon"); + hd.szButton2Text = __tr2qs_ctx("Yes, Proceed", "addon"); hd.iDefaultButton = 2; hd.iCancelButton = 1; hd.pixIcon = *(g_pIconManager->getSmallIcon(KviIconManager::Addons)); @@ -204,7 +202,7 @@ namespace AddonFunctions hd.iMinimumHeight = 420; hd.iFlags = KviHtmlDialogData::ForceMinimumSize; - bInstall = KviHtmlDialog::display(pDialogParent,&hd) == 2; + bInstall = KviHtmlDialog::display(pDialogParent, &hd) == 2; if(!bInstall) return true; @@ -213,8 +211,8 @@ namespace AddonFunctions QString szTmpPath, szUnpackPath; QString szRandomDir = createRandomDir(); - g_pApp->getLocalKvircDirectory(szTmpPath,KviApplication::Tmp); - KviQString::ensureLastCharIs(szTmpPath,QChar(KVI_PATH_SEPARATOR_CHAR)); + g_pApp->getLocalKvircDirectory(szTmpPath, KviApplication::Tmp); + KviQString::ensureLastCharIs(szTmpPath, QChar(KVI_PATH_SEPARATOR_CHAR)); szUnpackPath = szTmpPath + szRandomDir; QDir szTmpDir(szUnpackPath); @@ -227,10 +225,10 @@ namespace AddonFunctions } // Unpack addon package into the random tmp dir - if(!r.unpack(szAddonPackageFileName,szUnpackPath)) + if(!r.unpack(szAddonPackageFileName, szUnpackPath)) { szErr = r.lastError(); - szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","addon")).arg(szErr); + szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1", "addon")).arg(szErr); return false; } @@ -243,7 +241,7 @@ namespace AddonFunctions } if(!KviFileUtils::deleteDir(szUnpackPath)) - QMessageBox::warning(NULL,__tr2qs_ctx("Warning While Unpacking Addon - KVIrc","addon"),__tr2qs_ctx("Failed to delete the directory '%1'","addon").arg(szUnpackPath)); + QMessageBox::warning(NULL, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath)); return true; } @@ -252,17 +250,17 @@ namespace AddonFunctions { QString szDirName; char chars[] = { - 'A','B','C','D','E','F','G','H', - 'I','J','K','L','M','N','O','P', - 'Q','R','S','T','U','V','W','X', - 'Y','Z','a','b','c','d','e','f', - 'g','h','i','j','k','l','m','n', - 'o','p','q','r','s','t','u','v', - 'w','x','y','z','-','_','.' + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '-', '_', '.' }; // Generate dir name - for(int i=0;i<10;i++) + for(int i = 0; i < 10; i++) { int n = rand() % sizeof(chars); szDirName.append(chars[n]); @@ -271,7 +269,7 @@ namespace AddonFunctions return szDirName; } - bool checkDirTree(const QString &szDirPath,QString * pszError) + bool checkDirTree(const QString & szDirPath, QString * pszError) { if(pszError) *pszError = ""; @@ -279,23 +277,23 @@ namespace AddonFunctions QDir addon(szDirPath); if(!addon.exists()) { - *pszError = __tr2qs_ctx("The selected directory doesn't exist.","addon"); + *pszError = __tr2qs_ctx("The selected directory doesn't exist.", "addon"); return false; } QFileInfo init(szDirPath + "/install.kvs"); if(!init.exists()) { - *pszError = __tr2qs_ctx("The initialization script (install.kvs) doesn't exist.","addon"); + *pszError = __tr2qs_ctx("The initialization script (install.kvs) doesn't exist.", "addon"); return false; } return true; } - bool pack(AddonInfo &info,QString &szError) + bool pack(AddonInfo & info, QString & szError) { - if(!checkDirTree(info.szDirPath,&szError)) + if(!checkDirTree(info.szDirPath, &szError)) return false; if(info.szMinVersion.isEmpty()) @@ -305,32 +303,32 @@ namespace AddonFunctions szTmp = QDateTime::currentDateTime().toString(Qt::ISODate); KviPackageWriter pw; - pw.addInfoField("PackageType","AddonPack"); - pw.addInfoField("AddonPackVersion",KVI_CURRENT_ADDONS_ENGINE_VERSION); - pw.addInfoField("Name",info.szName); - pw.addInfoField("Version",info.szVersion); - pw.addInfoField("Author",info.szAuthor); - pw.addInfoField("Description",info.szDescription); - pw.addInfoField("Date",szTmp); - pw.addInfoField("MinimumKVIrcVersion",info.szMinVersion); - pw.addInfoField("Application","KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); + pw.addInfoField("PackageType", "AddonPack"); + pw.addInfoField("AddonPackVersion", KVI_CURRENT_ADDONS_ENGINE_VERSION); + pw.addInfoField("Name", info.szName); + pw.addInfoField("Version", info.szVersion); + pw.addInfoField("Author", info.szAuthor); + pw.addInfoField("Description", info.szDescription); + pw.addInfoField("Date", szTmp); + pw.addInfoField("MinimumKVIrcVersion", info.szMinVersion); + pw.addInfoField("Application", "KVIrc " KVI_VERSION "." KVI_SOURCES_DATE); if(!info.szImage.isEmpty()) { QPixmap pix(info.szImage); if(pix.isNull()) { - szError = __tr2qs_ctx("Failed to load the image at %1","addon").arg(info.szImage); + szError = __tr2qs_ctx("Failed to load the image at %1", "addon").arg(info.szImage); return false; } QByteArray * pba = new QByteArray(); - QBuffer bufferz(pba,0); + QBuffer bufferz(pba, 0); bufferz.open(QIODevice::WriteOnly); - pix.save(&bufferz,"PNG"); + pix.save(&bufferz, "PNG"); bufferz.close(); - pw.addInfoField("Image",pba); + pw.addInfoField("Image", pba); } QDir dir(info.szDirPath); @@ -338,17 +336,17 @@ namespace AddonFunctions if(ls.isEmpty()) { - szError = __tr2qs_ctx("The package file list is empty","addon"); + szError = __tr2qs_ctx("The package file list is empty", "addon"); return false; } - for(QFileInfoList::Iterator it = ls.begin();it != ls.end();++it) + for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it) { - const QFileInfo &inf = *it; + const QFileInfo & inf = *it; if(inf.isDir()) { - if(!pw.addDirectory(inf.absoluteFilePath(),QString("%1/").arg(inf.fileName()))) + if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName()))) { szError = pw.lastError(); return false; @@ -358,18 +356,17 @@ namespace AddonFunctions } // must be a file - if(!pw.addFile(inf.absoluteFilePath(),inf.fileName())) + if(!pw.addFile(inf.absoluteFilePath(), inf.fileName())) { szError = pw.lastError(); return false; } } - // Create the addon package if(info.szSavePath.isEmpty()) { - szError = __tr2qs_ctx("Save path is empty","addon"); + szError = __tr2qs_ctx("Save path is empty", "addon"); return false; } @@ -381,5 +378,4 @@ namespace AddonFunctions return true; } - } diff --git a/src/modules/addon/AddonFunctions.h b/src/modules/addon/AddonFunctions.h index 27b27673f..6d4d9cae2 100644 --- a/src/modules/addon/AddonFunctions.h +++ b/src/modules/addon/AddonFunctions.h @@ -47,8 +47,8 @@ public: namespace AddonFunctions { - bool checkDirTree(const QString &szDirPath,QString * pszError); - bool pack(AddonInfo &info,QString &szError); + bool checkDirTree(const QString & szDirPath, QString * pszError); + bool pack(AddonInfo & info, QString & szError); bool notAValidAddonPackage(QString & szError); bool installAddonPackage(const QString & szAddonPackageFileName, QString & szError, QWidget * pDialogParent = 0); QString createRandomDir(); diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp index 955fa01a5..3b96e47c4 100644 --- a/src/modules/addon/AddonManagementDialog.cpp +++ b/src/modules/addon/AddonManagementDialog.cpp @@ -57,15 +57,14 @@ #include #ifdef COMPILE_WEBKIT_SUPPORT - #include "WebAddonInterfaceDialog.h" +#include "WebAddonInterfaceDialog.h" #endif //COMPILE_WEBKIT_SUPPORT - AddonManagementDialog * AddonManagementDialog::m_pInstance = 0; extern QRect g_rectManagementDialogGeometry; -AddonListViewItem::AddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a) -: KviTalListWidgetItem(v) +AddonListViewItem::AddonListViewItem(KviTalListWidget * v, KviKvsScriptAddon * a) + : KviTalListWidgetItem(v) { m_pAddon = new KviKvsScriptAddon(*a); m_pListWidget = v; @@ -83,11 +82,8 @@ AddonListViewItem::AddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a) setText(t); QPixmap * p = a->icon(); - if (p) + if(p) setIcon(*p); - - - } AddonListViewItem::~AddonListViewItem() @@ -96,9 +92,9 @@ AddonListViewItem::~AddonListViewItem() } AddonManagementDialog::AddonManagementDialog(QWidget * p) -: QWidget(p) + : QWidget(p) { - setWindowTitle(__tr2qs_ctx("Manage Addons - KVIrc","addon")); + setWindowTitle(__tr2qs_ctx("Manage Addons - KVIrc", "addon")); setObjectName("Addon manager"); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons))); @@ -109,31 +105,31 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) m_pInstance = this; QGridLayout * g = new QGridLayout(this); - KviTalHBox *hb = new KviTalHBox(this); + KviTalHBox * hb = new KviTalHBox(this); hb->setMargin(1); hb->setSpacing(1); - g->addWidget(hb,0,0); + g->addWidget(hb, 0, 0); QToolButton * tb; QFrame * sep; m_pConfigureButton = new QToolButton(hb); m_pConfigureButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_ADDONS))); - m_pConfigureButton->setIconSize(QSize(32,32)); - KviTalToolTip::add(m_pConfigureButton,__tr2qs_ctx("Configure addon...","addon")); - connect(m_pConfigureButton,SIGNAL(clicked()),this,SLOT(configureScript())); + m_pConfigureButton->setIconSize(QSize(32, 32)); + KviTalToolTip::add(m_pConfigureButton, __tr2qs_ctx("Configure addon...", "addon")); + connect(m_pConfigureButton, SIGNAL(clicked()), this, SLOT(configureScript())); m_pHelpButton = new QToolButton(hb); m_pHelpButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_HELP))); - m_pHelpButton->setIconSize(QSize(32,32)); - KviTalToolTip::add(m_pHelpButton,__tr2qs_ctx("Show help","addon")); - connect(m_pHelpButton,SIGNAL(clicked()),this,SLOT(showScriptHelp())); + m_pHelpButton->setIconSize(QSize(32, 32)); + KviTalToolTip::add(m_pHelpButton, __tr2qs_ctx("Show help", "addon")); + connect(m_pHelpButton, SIGNAL(clicked()), this, SLOT(showScriptHelp())); m_pUninstallButton = new QToolButton(hb); m_pUninstallButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE))); - m_pUninstallButton->setIconSize(QSize(32,32)); - KviTalToolTip::add(m_pUninstallButton,__tr2qs_ctx("Delete selected addon","addon")); - connect(m_pUninstallButton,SIGNAL(clicked()),this,SLOT(uninstallScript())); + m_pUninstallButton->setIconSize(QSize(32, 32)); + KviTalToolTip::add(m_pUninstallButton, __tr2qs_ctx("Delete selected addon", "addon")); + connect(m_pUninstallButton, SIGNAL(clicked()), this, SLOT(uninstallScript())); sep = new QFrame(hb); sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); @@ -141,9 +137,9 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) m_pPackButton = new QToolButton(hb); m_pPackButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK))); - m_pPackButton->setIconSize(QSize(32,32)); - KviTalToolTip::add(m_pPackButton,__tr2qs_ctx("Create an addon as a distributable package","addon")); - connect(m_pPackButton,SIGNAL(clicked()),this,SLOT(packScript())); + m_pPackButton->setIconSize(QSize(32, 32)); + KviTalToolTip::add(m_pPackButton, __tr2qs_ctx("Create an addon as a distributable package", "addon")); + connect(m_pPackButton, SIGNAL(clicked()), this, SLOT(packScript())); sep = new QFrame(hb); sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); @@ -151,53 +147,53 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) tb = new QToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); - tb->setIconSize(QSize(32,32)); - KviTalToolTip::add(tb,__tr2qs_ctx("Install addon package from disk","addon")); - connect(tb,SIGNAL(clicked()),this,SLOT(installScript())); + tb->setIconSize(QSize(32, 32)); + KviTalToolTip::add(tb, __tr2qs_ctx("Install addon package from disk", "addon")); + connect(tb, SIGNAL(clicked()), this, SLOT(installScript())); tb = new QToolButton(hb); tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW))); - tb->setIconSize(QSize(32,32)); - KviTalToolTip::add(tb,__tr2qs_ctx("Get more addons...","addon")); - connect(tb,SIGNAL(clicked()),this,SLOT(getMoreScripts())); + tb->setIconSize(QSize(32, 32)); + KviTalToolTip::add(tb, __tr2qs_ctx("Get more addons...", "addon")); + connect(tb, SIGNAL(clicked()), this, SLOT(getMoreScripts())); - QWidget *w= new QWidget(hb); - w->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum); + QWidget * w = new QWidget(hb); + w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); m_pListWidget = new KviTalListWidget(this); - KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pListWidget); + KviTalIconAndRichTextItemDelegate * itemDelegate = new KviTalIconAndRichTextItemDelegate(m_pListWidget); m_pListWidget->setItemDelegate(itemDelegate); m_pListWidget->setSelectionMode(QAbstractItemView::SingleSelection); m_pListWidget->setSortingEnabled(true); m_pListWidget->setMinimumHeight(400); m_pListWidget->setMinimumWidth(380); - g->addWidget(m_pListWidget,1,0); + g->addWidget(m_pListWidget, 1, 0); fillListView(); - currentChanged(0,0); - connect(m_pListWidget,SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem *)),this,SLOT(currentChanged(QListWidgetItem *,QListWidgetItem *))); + currentChanged(0, 0); + connect(m_pListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(currentChanged(QListWidgetItem *, QListWidgetItem *))); m_pListWidget->setCurrentItem(m_pListWidget->item(0)); - QPushButton * pCloseBtn = new QPushButton(__tr2qs_ctx("Close","addon"),this); - pCloseBtn->setMaximumSize(pCloseBtn->sizeHint().width(),pCloseBtn->sizeHint().height()); - connect(pCloseBtn,SIGNAL(clicked()),this,SLOT(closeClicked())); - g->addWidget(pCloseBtn,2,0); + QPushButton * pCloseBtn = new QPushButton(__tr2qs_ctx("Close", "addon"), this); + pCloseBtn->setMaximumSize(pCloseBtn->sizeHint().width(), pCloseBtn->sizeHint().height()); + connect(pCloseBtn, SIGNAL(clicked()), this, SLOT(closeClicked())); + g->addWidget(pCloseBtn, 2, 0); g->setMargin(5); g->setSpacing(5); - g->setAlignment(pCloseBtn,Qt::AlignRight); + g->setAlignment(pCloseBtn, Qt::AlignRight); if(g_rectManagementDialogGeometry.y() < 5) { g_rectManagementDialogGeometry.setY(5); } resize(g_rectManagementDialogGeometry.width(), - g_rectManagementDialogGeometry.height()); + g_rectManagementDialogGeometry.height()); QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow); - move(rect.x() + ((rect.width() - g_rectManagementDialogGeometry.width())/2),rect.y() + ((rect.height() - g_rectManagementDialogGeometry.height())/2)); + move(rect.x() + ((rect.width() - g_rectManagementDialogGeometry.width()) / 2), rect.y() + ((rect.height() - g_rectManagementDialogGeometry.height()) / 2)); new QShortcut(Qt::Key_Escape, this, SLOT(closeClicked())); } @@ -208,25 +204,26 @@ AddonManagementDialog::~AddonManagementDialog() if(m_pWebInterfaceDialog) delete m_pWebInterfaceDialog; #endif //COMPILE_WEBKIT_SUPPORT - g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height()); + g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); m_pInstance = NULL; } void AddonManagementDialog::fillListView() { m_pListWidget->clear(); - KviPointerHashTable * d = KviKvsScriptAddonManager::instance()->addonDict(); - if(!d)return; - KviPointerHashTableIterator it(*d); + KviPointerHashTable * d = KviKvsScriptAddonManager::instance()->addonDict(); + if(!d) + return; + KviPointerHashTableIterator it(*d); while(KviKvsScriptAddon * a = it.current()) { - new AddonListViewItem(m_pListWidget,a); + new AddonListViewItem(m_pListWidget, a); ++it; } } -void AddonManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem *) +void AddonManagementDialog::currentChanged(QListWidgetItem * item, QListWidgetItem *) { AddonListViewItem * it = (AddonListViewItem *)item; if(!it) @@ -234,7 +231,9 @@ void AddonManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem m_pConfigureButton->setEnabled(false); m_pUninstallButton->setEnabled(false); m_pHelpButton->setEnabled(false); - } else { + } + else + { m_pConfigureButton->setEnabled(!(it->addon()->configureCallbackCode().isEmpty())); m_pHelpButton->setEnabled(!(it->addon()->helpCallbackCode().isEmpty())); m_pUninstallButton->setEnabled(true); @@ -244,16 +243,20 @@ void AddonManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem void AddonManagementDialog::showScriptHelp() { AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); - if(!it)return; - if(it->addon()->helpCallbackCode().isEmpty())return; + if(!it) + return; + if(it->addon()->helpCallbackCode().isEmpty()) + return; it->addon()->executeHelpCallback(g_pActiveWindow); } void AddonManagementDialog::configureScript() { AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); - if(!it)return; - if(it->addon()->configureCallbackCode().isEmpty())return; + if(!it) + return; + if(it->addon()->configureCallbackCode().isEmpty()) + return; it->addon()->executeConfigureCallback(g_pActiveWindow); } @@ -267,22 +270,24 @@ void AddonManagementDialog::packScript() void AddonManagementDialog::uninstallScript() { AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem(); - if(!it)return; + if(!it) + return; QString txt = "

"; - txt += __tr2qs_ctx("Do you really want to uninstall the addon \"%1\"?","addon").arg(it->addon()->visibleName()); + txt += __tr2qs_ctx("Do you really want to uninstall the addon \"%1\"?", "addon").arg(it->addon()->visibleName()); txt += "

"; if(QMessageBox::question( - this, - __tr2qs_ctx("Confirm Addon Uninstallation - KVIrc","addon"), - txt, __tr2qs_ctx("Yes","addon"), __tr2qs_ctx("No","addon"),0,1 - ) != 0) return; + this, + __tr2qs_ctx("Confirm Addon Uninstallation - KVIrc", "addon"), + txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), 0, 1) + != 0) + return; - KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(),g_pActiveWindow); + KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(), g_pActiveWindow); fillListView(); - currentChanged(0,0); + currentChanged(0, 0); } void AddonManagementDialog::getMoreScripts() @@ -291,9 +296,9 @@ void AddonManagementDialog::getMoreScripts() if(m_pWebInterfaceDialog) return; m_pWebInterfaceDialog = new WebAddonInterfaceDialog(); -#else //!COMPILE_WEBKIT_SUPPORT +#else //!COMPILE_WEBKIT_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); + KviKvsScript::run("openurl http://www.kvirc.net/?id=addons&version=" KVI_VERSION "." KVI_SOURCES_DATE, g_pActiveWindow); #endif //!COMPILE_WEBKIT_SUPPORT } @@ -302,44 +307,44 @@ void AddonManagementDialog::installScript() QString szFileName, szError; if(!KviFileDialog::askForOpenFileName( - szFileName, - __tr2qs_ctx("Select a Installation File - KVIrc","addon"), - QString(),KVI_FILTER_ADDON,false,true,this - )) return; + szFileName, + __tr2qs_ctx("Select a Installation File - KVIrc", "addon"), + QString(), KVI_FILTER_ADDON, false, true, this)) + return; - szFileName.replace("\\","\\\\"); + szFileName.replace("\\", "\\\\"); // Sanity check if(szFileName.endsWith(".kva")) { - if(!AddonFunctions::installAddonPackage(szFileName,szError,this)) + if(!AddonFunctions::installAddonPackage(szFileName, szError, this)) { QMessageBox::critical( - this, - __tr2qs_ctx("Install Addon - KVIrc","addon"), - szError, - QMessageBox::Ok, - QMessageBox::NoButton, - QMessageBox::NoButton - ); + this, + __tr2qs_ctx("Install Addon - KVIrc", "addon"), + szError, + QMessageBox::Ok, + QMessageBox::NoButton, + QMessageBox::NoButton); return; } - } else { + } + else + { // Just for sanity check. We should NEVER enter here qDebug("Entered sanity check"); AddonFunctions::notAValidAddonPackage(szError); QMessageBox::critical( - this, - __tr2qs_ctx("Install Addon - KVIrc","addon"), - szError, - QMessageBox::Ok, - QMessageBox::NoButton, - QMessageBox::NoButton - ); + this, + __tr2qs_ctx("Install Addon - KVIrc", "addon"), + szError, + QMessageBox::Ok, + QMessageBox::NoButton, + QMessageBox::NoButton); } fillListView(); - currentChanged(0,0); + currentChanged(0, 0); //m_pListWidget->publicUpdateContents(); //m_pListWidget->triggerUpdate(); @@ -352,7 +357,8 @@ void AddonManagementDialog::closeClicked() void AddonManagementDialog::cleanup() { - if(!m_pInstance)return; + if(!m_pInstance) + return; delete m_pInstance; m_pInstance = 0; } @@ -367,17 +373,23 @@ void AddonManagementDialog::display(bool bTopLevel) { m_pInstance->setParent(0); } - } else { + } + else + { if(m_pInstance->parent() != g_pMainWindow->splitter()) { m_pInstance->setParent(g_pMainWindow->splitter()); } } - } else { + } + else + { if(bTopLevel) { m_pInstance = new AddonManagementDialog(0); - } else { + } + else + { m_pInstance = new AddonManagementDialog(g_pMainWindow->splitter()); } } diff --git a/src/modules/addon/AddonManagementDialog.h b/src/modules/addon/AddonManagementDialog.h index d39cf845a..2a1a50d74 100644 --- a/src/modules/addon/AddonManagementDialog.h +++ b/src/modules/addon/AddonManagementDialog.h @@ -42,44 +42,48 @@ class KviKvsScriptAddon; class AddonListViewItem : public KviTalListWidgetItem { public: - AddonListViewItem(KviTalListWidget * v,KviKvsScriptAddon * a); + AddonListViewItem(KviTalListWidget * v, KviKvsScriptAddon * a); ~AddonListViewItem(); + protected: KviKvsScriptAddon * m_pAddon; - QTextDocument * m_pText; - QPixmap * m_pIcon; - QListWidget * m_pListWidget; - QString m_szKey; + QTextDocument * m_pText; + QPixmap * m_pIcon; + QListWidget * m_pListWidget; + QString m_szKey; + public: - KviKvsScriptAddon * addon(){ return m_pAddon; }; + KviKvsScriptAddon * addon() { return m_pAddon; }; }; #ifdef COMPILE_WEBKIT_SUPPORT - class WebAddonInterfaceDialog; +class WebAddonInterfaceDialog; #endif //COMPILE_WEBKIT_SUPPORT - class AddonManagementDialog : public QWidget { Q_OBJECT protected: AddonManagementDialog(QWidget * p); + public: ~AddonManagementDialog(); + protected: - KviTalListWidget * m_pListWidget; + KviTalListWidget * m_pListWidget; static AddonManagementDialog * m_pInstance; - QToolButton * m_pConfigureButton; - QToolButton * m_pHelpButton; - QToolButton * m_pPackButton; - QToolButton * m_pUninstallButton; + QToolButton * m_pConfigureButton; + QToolButton * m_pHelpButton; + QToolButton * m_pPackButton; + QToolButton * m_pUninstallButton; #ifdef COMPILE_WEBKIT_SUPPORT QPointer m_pWebInterfaceDialog; #endif //COMPILE_WEBKIT_SUPPORT public: - static AddonManagementDialog * instance(){ return m_pInstance; }; + static AddonManagementDialog * instance() { return m_pInstance; }; static void display(bool bTopLevel); static void cleanup(); + protected: void fillListView(); virtual void closeEvent(QCloseEvent * e); diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp index 4f0ccd5f6..b56fa3d12 100644 --- a/src/modules/addon/PackAddonDialog.cpp +++ b/src/modules/addon/PackAddonDialog.cpp @@ -42,58 +42,58 @@ #include PackAddonDialog::PackAddonDialog(QWidget * pParent) -: QWizard(pParent) + : QWizard(pParent) { - setMinimumSize(400,350); + setMinimumSize(400, 350); setObjectName("addon_package_wizard"); - setOption(QWizard::IndependentPages,true); - setWindowTitle(__tr2qs_ctx("Create Addon Package - KVIrc","addon")); + setOption(QWizard::IndependentPages, true); + setWindowTitle(__tr2qs_ctx("Create Addon Package - KVIrc", "addon")); QPixmap * pSide = g_pIconManager->getBigIcon("kvi_setup_label.png"); QPixmap * pLogo = g_pIconManager->getBigIcon("kvi_bigicon_addons.png"); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - #if (_WIN32_WINNT >= 0x0600) - // We are on a Windows Vista / Seven - // It will fallback to XP if alpha compositing is disabled - setWizardStyle(QWizard::AeroStyle); - #else - // Windows XP - setWizardStyle(QWizard::ModernStyle); - setPixmap(QWizard::WatermarkPixmap,*pSide); - setPixmap(QWizard::LogoPixmap,*pLogo); - #endif +#if(_WIN32_WINNT >= 0x0600) + // We are on a Windows Vista / Seven + // It will fallback to XP if alpha compositing is disabled + setWizardStyle(QWizard::AeroStyle); +#else + // Windows XP + setWizardStyle(QWizard::ModernStyle); + setPixmap(QWizard::WatermarkPixmap, *pSide); + setPixmap(QWizard::LogoPixmap, *pLogo); +#endif #elif defined(COMPILE_ON_MAC) setWizardStyle(QWizard::MacStyle); - setPixmap(QWizard::BackgroundPixmap,*pSide); + setPixmap(QWizard::BackgroundPixmap, *pSide); #else // All other systems setWizardStyle(QWizard::ClassicStyle); - setPixmap(QWizard::WatermarkPixmap,*pSide); - setPixmap(QWizard::LogoPixmap,*pLogo); + setPixmap(QWizard::WatermarkPixmap, *pSide); + setPixmap(QWizard::LogoPixmap, *pLogo); #endif // Add a default property for file selectors - setDefaultProperty("KviFileSelector","tmpFile",SIGNAL(selectionChanged(const QString &))); + setDefaultProperty("KviFileSelector", "tmpFile", SIGNAL(selectionChanged(const QString &))); // Welcome page QWizardPage * pPage = new QWizardPage(this); QVBoxLayout * pLayout = new QVBoxLayout(pPage); pPage->setLayout(pLayout); - pPage->setTitle(__tr2qs_ctx("Welcome","addon")); + pPage->setTitle(__tr2qs_ctx("Welcome", "addon")); QLabel * pLabel = new QLabel(pPage); pLabel->setWordWrap(true); - pLabel->setText(__tr2qs_ctx("This procedure allows you to export the selected addon to a single package.
It is useful when you want to distribute your addon to the public.","addon")); + pLabel->setText(__tr2qs_ctx("This procedure allows you to export the selected addon to a single package.
It is useful when you want to distribute your addon to the public.", "addon")); pLayout->addWidget(pLabel); pLabel = new QLabel(pPage); pLabel->setWordWrap(true); QString szText; - szText += __tr2qs_ctx("You will be asked to provide some information like the package name, the version, a description and so on.","addon"); + szText += __tr2qs_ctx("You will be asked to provide some information like the package name, the version, a description and so on.", "addon"); szText += "

"; - szText += __tr2qs_ctx("Hit the \"Next\" button to begin.","addon"); + szText += __tr2qs_ctx("Hit the \"Next\" button to begin.", "addon"); pLabel->setText(szText); pLayout->addWidget(pLabel); @@ -116,7 +116,6 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent) // Summary info m_pPackAddonSummaryInfoWidget = new PackAddonSummaryInfoWidget(this); addPage(m_pPackAddonSummaryInfoWidget); - } PackAddonDialog::~PackAddonDialog() @@ -146,7 +145,7 @@ bool PackAddonDialog::packAddon() if(info.szSavePath.isEmpty()) { info.szSavePath = QDir::homePath(); - KviQString::ensureLastCharIs(info.szSavePath,QChar(KVI_PATH_SEPARATOR_CHAR)); + KviQString::ensureLastCharIs(info.szSavePath, QChar(KVI_PATH_SEPARATOR_CHAR)); info.szSavePath += m_szName; info.szSavePath += "-"; info.szSavePath += m_szVersion; @@ -156,12 +155,12 @@ bool PackAddonDialog::packAddon() if(QFile::exists(info.szSavePath)) { if(QMessageBox::question( - this, - __tr2qs_ctx("Exporting Addon Confirmation - KVIrc","addon"), - __tr2qs_ctx("File %1 already exists. Do you want to overwrite it?","addon").arg(info.szSavePath), - QMessageBox::Yes, - QMessageBox::No - ) == QMessageBox::No) + this, + __tr2qs_ctx("Exporting Addon Confirmation - KVIrc", "addon"), + __tr2qs_ctx("File %1 already exists. Do you want to overwrite it?", "addon").arg(info.szSavePath), + QMessageBox::Yes, + QMessageBox::No) + == QMessageBox::No) return false; } @@ -176,136 +175,131 @@ bool PackAddonDialog::packAddon() QString szError; - if(!AddonFunctions::pack(info,szError)) + if(!AddonFunctions::pack(info, szError)) { QMessageBox::critical(this, - __tr2qs_ctx("Addon Packaging - KVIrc","addon"), - szError,QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton - ); + __tr2qs_ctx("Addon Packaging - KVIrc", "addon"), + szError, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); return false; } - QMessageBox::information(this,__tr2qs_ctx("Exporting Addon Completed - KVIrc","addon"),__tr2qs_ctx("The Package was saved successfully in %1","addon").arg(m_szSavePath),QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton); + QMessageBox::information(this, __tr2qs_ctx("Exporting Addon Completed - KVIrc", "addon"), __tr2qs_ctx("The Package was saved successfully in %1", "addon").arg(m_szSavePath), QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); return true; } - PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent) -: QWizardPage(pParent) + : QWizardPage(pParent) { setObjectName("addon_package_info_page"); - setTitle(__tr2qs_ctx("Package Information","addon")); - setSubTitle(__tr2qs_ctx("Here you need to provide information about you (the packager) and a short description of the package you're creating.","addon")); + setTitle(__tr2qs_ctx("Package Information", "addon")); + setSubTitle(__tr2qs_ctx("Here you need to provide information about you (the packager) and a short description of the package you're creating.", "addon")); QGridLayout * pLayout = new QGridLayout(this); QLabel * pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Package &author:","addon")); - pLayout->addWidget(pLabel,0,0); + pLabel->setText(__tr2qs_ctx("Package &author:", "addon")); + pLayout->addWidget(pLabel, 0, 0); m_pPackageAuthorEdit = new QLineEdit(this); pLabel->setBuddy(m_pPackageAuthorEdit); - pLayout->addWidget(m_pPackageAuthorEdit,0,1); + pLayout->addWidget(m_pPackageAuthorEdit, 0, 1); pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Package &name:","addon")); - pLayout->addWidget(pLabel,1,0); + pLabel->setText(__tr2qs_ctx("Package &name:", "addon")); + pLayout->addWidget(pLabel, 1, 0); m_pPackageNameEdit = new QLineEdit(this); - m_pPackageNameEdit->setPlaceholderText(__tr2qs_ctx("No spaces allowed","addon")); + m_pPackageNameEdit->setPlaceholderText(__tr2qs_ctx("No spaces allowed", "addon")); pLabel->setBuddy(m_pPackageNameEdit); - pLayout->addWidget(m_pPackageNameEdit,1,1); + pLayout->addWidget(m_pPackageNameEdit, 1, 1); pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Package &version:","addon")); - pLayout->addWidget(pLabel,2,0); + pLabel->setText(__tr2qs_ctx("Package &version:", "addon")); + pLayout->addWidget(pLabel, 2, 0); m_pPackageVersionEdit = new QLineEdit(this); m_pPackageVersionEdit->setPlaceholderText("1.0"); pLabel->setBuddy(m_pPackageVersionEdit); - pLayout->addWidget(m_pPackageVersionEdit,2,1); + pLayout->addWidget(m_pPackageVersionEdit, 2, 1); pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Package &description:","addon")); - pLayout->addWidget(pLabel,3,0); + pLabel->setText(__tr2qs_ctx("Package &description:", "addon")); + pLayout->addWidget(pLabel, 3, 0); m_pPackageDescriptionEdit = new QLineEdit(this); m_pPackageDescriptionEdit->setText(QString()); pLabel->setBuddy(m_pPackageDescriptionEdit); - pLayout->addWidget(m_pPackageDescriptionEdit,3,1); + pLayout->addWidget(m_pPackageDescriptionEdit, 3, 1); pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Minimum &KVIrc version:","addon")); - pLayout->addWidget(pLabel,4,0); + pLabel->setText(__tr2qs_ctx("Minimum &KVIrc version:", "addon")); + pLayout->addWidget(pLabel, 4, 0); m_pPackageMinVersionEdit = new QLineEdit(this); m_pPackageMinVersionEdit->setText(KVI_VERSION); pLabel->setBuddy(m_pPackageMinVersionEdit); - pLayout->addWidget(m_pPackageMinVersionEdit,4,1); + pLayout->addWidget(m_pPackageMinVersionEdit, 4, 1); // Store data in the fields - registerField("packageAuthor*",m_pPackageAuthorEdit); - registerField("packageName*",m_pPackageNameEdit); - registerField("packageVersion*",m_pPackageVersionEdit); - registerField("packageDescription*",m_pPackageDescriptionEdit); - registerField("packageMinVersion",m_pPackageMinVersionEdit); + registerField("packageAuthor*", m_pPackageAuthorEdit); + registerField("packageName*", m_pPackageNameEdit); + registerField("packageVersion*", m_pPackageVersionEdit); + registerField("packageDescription*", m_pPackageDescriptionEdit); + registerField("packageMinVersion", m_pPackageMinVersionEdit); } PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget() { } - PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent) -: QWizardPage(pParent) + : QWizardPage(pParent) { setObjectName("addon_package_file_page"); - setTitle(__tr2qs_ctx("Package Files","addon")); - setSubTitle(__tr2qs_ctx("Here you need to select the directory where the addon files to be packed are located.","addon")); + setTitle(__tr2qs_ctx("Package Files", "addon")); + setSubTitle(__tr2qs_ctx("Here you need to select the directory where the addon files to be packed are located.", "addon")); QVBoxLayout * pLayout = new QVBoxLayout(this); // Select source directory - m_pDirPathSelector = new KviDirectorySelector(this,__tr2qs_ctx("Select the source directory:","addon"),&m_szDirPath,true,KviFileSelector::VerticalLayout); + m_pDirPathSelector = new KviDirectorySelector(this, __tr2qs_ctx("Select the source directory:", "addon"), &m_szDirPath, true, KviFileSelector::VerticalLayout); pLayout->addWidget(m_pDirPathSelector); // Select addon icon - m_pPackageImageEdit = new KviFileSelector(this,__tr2qs_ctx("Select the image file:","addon"),&m_szPackageImage,true,KviFileSelector::VerticalLayout,KVI_FILTER_IMAGE); + m_pPackageImageEdit = new KviFileSelector(this, __tr2qs_ctx("Select the image file:", "addon"), &m_szPackageImage, true, KviFileSelector::VerticalLayout, KVI_FILTER_IMAGE); pLayout->addWidget(m_pPackageImageEdit); // Store data in the fields - registerField("packageDirPath*",m_pDirPathSelector); - registerField("packageImage*",m_pPackageImageEdit); + registerField("packageDirPath*", m_pDirPathSelector); + registerField("packageImage*", m_pPackageImageEdit); } PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget() { } - PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent) -: QWizardPage(pParent) + : QWizardPage(pParent) { setObjectName("addon_package_save_page"); - setTitle(__tr2qs_ctx("Save Package","addon")); - setSubTitle(__tr2qs_ctx("Here you need to provide the path where to save the created addon package","addon")); + setTitle(__tr2qs_ctx("Save Package", "addon")); + setSubTitle(__tr2qs_ctx("Here you need to provide the path where to save the created addon package", "addon")); QVBoxLayout * pLayout = new QVBoxLayout(this); // Select save path m_pSavePathSelector = new KviFileSelector( - this, - __tr2qs_ctx("Select save path:","addon"), - &m_szFilePath, - true, - KviFileSelector::ChooseSaveFileName | KviFileSelector::VerticalLayout, - KVI_FILTER_ADDON - ); + this, + __tr2qs_ctx("Select save path:", "addon"), + &m_szFilePath, + true, + KviFileSelector::ChooseSaveFileName | KviFileSelector::VerticalLayout, + KVI_FILTER_ADDON); pLayout->addWidget(m_pSavePathSelector); // Store data in the fields - registerField("packageSavePath*",m_pSavePathSelector); + registerField("packageSavePath*", m_pSavePathSelector); } PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget() @@ -320,7 +314,7 @@ void PackAddonSaveSelectionWidget::initializePage() // Create addon name QString szSavePath = QDir::homePath(); - KviQString::ensureLastCharIs(szSavePath,QChar(KVI_PATH_SEPARATOR_CHAR)); + KviQString::ensureLastCharIs(szSavePath, QChar(KVI_PATH_SEPARATOR_CHAR)); szSavePath += szName; szSavePath += "-"; szSavePath += szVersion; @@ -328,13 +322,12 @@ void PackAddonSaveSelectionWidget::initializePage() m_pSavePathSelector->setTmpFile(szSavePath); } - PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent) -: QWizardPage(pParent) + : QWizardPage(pParent) { setObjectName("addon_package_summary_info_page"); - setTitle(__tr2qs_ctx("Final Information","addon")); - setSubTitle(__tr2qs_ctx("Here are the details you provided. If this information is correct, hit the \"Finish\" button to complete the packaging operations.","addon")); + setTitle(__tr2qs_ctx("Final Information", "addon")); + setSubTitle(__tr2qs_ctx("Here are the details you provided. If this information is correct, hit the \"Finish\" button to complete the packaging operations.", "addon")); QVBoxLayout * pLayout = new QVBoxLayout(this); m_pLabelInfo = new QLabel(this); @@ -357,56 +350,55 @@ void PackAddonSummaryInfoWidget::initializePage() QString szDirPath = field("packageDirPath").toString(); QString szSavePath = field("packageSavePath").toString(); - QString szText = __tr2qs_ctx("This is what I will check for:","addon"); + QString szText = __tr2qs_ctx("This is what I will check for:", "addon"); szText += "

"; - szText += __tr2qs_ctx("Package author","addon"); + szText += __tr2qs_ctx("Package author", "addon"); szText += ": "; szText += szAuthor; szText += "
"; - szText += __tr2qs_ctx("Package name","addon"); + szText += __tr2qs_ctx("Package name", "addon"); szText += ": "; szText += szName; szText += "
"; - szText += __tr2qs_ctx("Package version","addon"); + szText += __tr2qs_ctx("Package version", "addon"); szText += ": "; szText += szVersion; szText += "
"; - szText += __tr2qs_ctx("Package description","addon"); + szText += __tr2qs_ctx("Package description", "addon"); szText += ": "; szText += szDescription; szText += "
"; - szText += __tr2qs_ctx("Minimum KVIrc version","addon"); + szText += __tr2qs_ctx("Minimum KVIrc version", "addon"); szText += ": "; szText += szMinVersion; szText += "
"; - szText += __tr2qs_ctx("Image file","addon"); + szText += __tr2qs_ctx("Image file", "addon"); szText += ": "; szText += szImage; szText += "
"; - szText += __tr2qs_ctx("Source directory","addon"); + szText += __tr2qs_ctx("Source directory", "addon"); szText += ": "; szText += szDirPath; szText += "
"; - szText += __tr2qs_ctx("Save path","addon"); + szText += __tr2qs_ctx("Save path", "addon"); szText += ": "; szText += szSavePath; m_pLabelInfo->setText(szText); } - PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pParent) -: QDialog(pParent) + : QDialog(pParent) { setObjectName("addon_package_summary_file_dialog"); - setWindowTitle(__tr2qs_ctx("File Summary Review - KVIrc","addon")); + setWindowTitle(__tr2qs_ctx("File Summary Review - KVIrc", "addon")); setWindowModality(Qt::WindowModal); setModal(true); QVBoxLayout * pLayout = new QVBoxLayout(this); QLabel * pLabel = new QLabel(this); - pLabel->setText(__tr2qs_ctx("Here are the files found in the directories you provided.\nIf the files listed below are correct, hit the \"Finish\" button to complete the packaging operation.","addon")); + pLabel->setText(__tr2qs_ctx("Here are the files found in the directories you provided.\nIf the files listed below are correct, hit the \"Finish\" button to complete the packaging operation.", "addon")); pLayout->addWidget(pLabel); m_pFiles = new QTextEdit(this); @@ -415,12 +407,12 @@ PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pPare KviTalHBox * pBox = new KviTalHBox(this); QPushButton * pCancel = new QPushButton(pBox); - pCancel->setText(__tr2qs_ctx("Cancel","addon")); - connect(pCancel,SIGNAL(clicked()),this,SLOT(reject())); + pCancel->setText(__tr2qs_ctx("Cancel", "addon")); + connect(pCancel, SIGNAL(clicked()), this, SLOT(reject())); QPushButton * pAccept = new QPushButton(pBox); - pAccept->setText(__tr2qs_ctx("Finish","addon")); - connect(pAccept,SIGNAL(clicked()),this,SLOT(accept())); + pAccept->setText(__tr2qs_ctx("Finish", "addon")); + connect(pAccept, SIGNAL(clicked()), this, SLOT(accept())); pLayout->addWidget(pBox); } @@ -442,7 +434,7 @@ void PackAddonSummaryFilesWidget::showEvent(QShowEvent *) { QStringList list; - QDirIterator it(m_szPath,QDir::AllEntries | QDir::NoDotAndDotDot,QDirIterator::Subdirectories); + QDirIterator it(m_szPath, QDir::AllEntries | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); // Iterate through the addon dir and its subdirs while(it.hasNext()) diff --git a/src/modules/addon/PackAddonDialog.h b/src/modules/addon/PackAddonDialog.h index e3d254aee..e9b88bc33 100644 --- a/src/modules/addon/PackAddonDialog.h +++ b/src/modules/addon/PackAddonDialog.h @@ -71,20 +71,22 @@ public: * \brief Destroys the wizard object */ ~PackAddonDialog(); + protected: - PackAddonInfoPackageWidget * m_pPackAddonInfoPackageWidget; + PackAddonInfoPackageWidget * m_pPackAddonInfoPackageWidget; PackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget; PackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget; - PackAddonSummaryInfoWidget * m_pPackAddonSummaryInfoWidget; - PackAddonSummaryFilesWidget * m_pPackAddonSummaryFilesWidget; - QString m_szAuthor; - QString m_szName; - QString m_szVersion; - QString m_szDescription; - QString m_szMinVersion; - QString m_szIcon; - QString m_szDirPath; - QString m_szSavePath; + PackAddonSummaryInfoWidget * m_pPackAddonSummaryInfoWidget; + PackAddonSummaryFilesWidget * m_pPackAddonSummaryFilesWidget; + QString m_szAuthor; + QString m_szName; + QString m_szVersion; + QString m_szDescription; + QString m_szMinVersion; + QString m_szIcon; + QString m_szDirPath; + QString m_szSavePath; + protected: /** * \brief Runs the packAddon() function and closes the wizard @@ -134,6 +136,7 @@ public: * \brief Destroys the wizard package info page object */ ~PackAddonInfoPackageWidget(); + protected: QLineEdit * m_pPackageAuthorEdit; QLineEdit * m_pPackageNameEdit; @@ -161,11 +164,12 @@ public: * \brief Destroys the wizard package source dir object */ ~PackAddonFileSelectionWidget(); + protected: KviDirectorySelector * m_pDirPathSelector; - KviFileSelector * m_pPackageImageEdit; - QString m_szDirPath; - QString m_szPackageImage; + KviFileSelector * m_pPackageImageEdit; + QString m_szDirPath; + QString m_szPackageImage; }; /** @@ -187,9 +191,11 @@ public: * \brief Destroys the wizard save page object */ ~PackAddonSaveSelectionWidget(); + protected: KviFileSelector * m_pSavePathSelector; QString m_szFilePath; + protected: /** * \brief Perform initial tasks before showing the widget @@ -217,12 +223,14 @@ public: * \brief Destroys the wizard summary info page object */ ~PackAddonSummaryInfoWidget(); + protected: QLabel * m_pLabelInfo; QLabel * m_pLabelAuthor; QLabel * m_pPackageName; QLabel * m_pPackageVersion; QLabel * m_pPackageDescription; + protected: /** * \brief Perform initial tasks before showing the widget @@ -231,18 +239,19 @@ protected: virtual void initializePage(); }; - class PackAddonSummaryFilesWidget : public QDialog { Q_OBJECT public: PackAddonSummaryFilesWidget(PackAddonDialog * pParent); ~PackAddonSummaryFilesWidget(); + protected: QTextEdit * m_pFiles; - QString m_szPath; + QString m_szPath; + public: - void setPath(QString & szPath){ m_szPath = szPath; }; + void setPath(QString & szPath) { m_szPath = szPath; }; protected: virtual void showEvent(QShowEvent *); protected slots: diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp index ba8b8e33c..b0f990571 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.cpp +++ b/src/modules/addon/WebAddonInterfaceDialog.cpp @@ -24,7 +24,6 @@ #include "kvi_settings.h" - #ifdef COMPILE_WEBKIT_SUPPORT #include "WebAddonInterfaceDialog.h" @@ -38,25 +37,24 @@ #include "KviMiscUtils.h" WebAddonInterfaceDialog::WebAddonInterfaceDialog(QWidget * par) -: KviWebPackageManagementDialog(par) + : KviWebPackageManagementDialog(par) { - setWindowTitle(__tr2qs_ctx("Download Addons - KVIrc","theme")); + setWindowTitle(__tr2qs_ctx("Download Addons - KVIrc", "theme")); setPackagePageUrl( - QString::fromLatin1("http://www.kvirc.de/app/addons.php?version=" KVI_VERSION "&lang=%1") - .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr())) - ); + QString::fromLatin1("http://www.kvirc.de/app/addons.php?version=" KVI_VERSION "&lang=%1") + .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr()))); } WebAddonInterfaceDialog::~WebAddonInterfaceDialog() { } -bool WebAddonInterfaceDialog::installPackage(const QString &szPath,QString &szError) +bool WebAddonInterfaceDialog::installPackage(const QString & szPath, QString & szError) { - return AddonFunctions::installAddonPackage(szPath,szError,this); + return AddonFunctions::installAddonPackage(szPath, szError, this); } -bool WebAddonInterfaceDialog::packageIsInstalled(const QString &szId,const QString &szVersion) +bool WebAddonInterfaceDialog::packageIsInstalled(const QString & szId, const QString & szVersion) { KviKvsScriptAddon * pAddon = KviKvsScriptAddonManager::instance()->findAddon(szId); if(!pAddon) @@ -66,9 +64,7 @@ bool WebAddonInterfaceDialog::packageIsInstalled(const QString &szId,const QStri return true; // hum.... shouldn't happen ? // FIXME: If the version of the installed addon is lower then allow upgrading! - return KviMiscUtils::compareVersions(pAddon->version(),szVersion) < 0; + return KviMiscUtils::compareVersions(pAddon->version(), szVersion) < 0; } - - #endif //COMPILE_WEBKIT_SUPPORT diff --git a/src/modules/addon/WebAddonInterfaceDialog.h b/src/modules/addon/WebAddonInterfaceDialog.h index 0a5a5cf40..14872d1af 100644 --- a/src/modules/addon/WebAddonInterfaceDialog.h +++ b/src/modules/addon/WebAddonInterfaceDialog.h @@ -28,7 +28,6 @@ #ifdef COMPILE_WEBKIT_SUPPORT - #include "KviWebPackageManagementDialog.h" /// @@ -42,7 +41,6 @@ class WebAddonInterfaceDialog : public KviWebPackageManagementDialog Q_OBJECT public: - /// /// Creates an instance of WebAddonInterfaceDialog /// @@ -55,12 +53,11 @@ public: virtual ~WebAddonInterfaceDialog(); protected: - virtual bool packageIsInstalled(const QString &szId,const QString &szVersion); - virtual bool installPackage(const QString &szPath,QString &szError); + virtual bool packageIsInstalled(const QString & szId, const QString & szVersion); + virtual bool installPackage(const QString & szPath, QString & szError); }; // class WebAddonInterfaceDialog - #endif //COMPILE_WEBKIT_SUPPORT #endif //!_WebAddonInterfaceDialog_h_ diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 33e0c6935..6b96a0cf0 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -43,7 +43,7 @@ #include #include -QRect g_rectManagementDialogGeometry(0,0,0,0); +QRect g_rectManagementDialogGeometry(0, 0, 0, 0); /* @doc: addon.exists @@ -67,8 +67,8 @@ static bool addon_kvs_fnc_exists(KviKvsModuleFunctionCall * c) QString szId; QString szVersion; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId) - KVSM_PARAMETER("version",KVS_PT_STRING,KVS_PF_OPTIONAL,szVersion) + KVSM_PARAMETER("id", KVS_PT_NONEMPTYSTRING, 0, szId) + KVSM_PARAMETER("version", KVS_PT_STRING, KVS_PF_OPTIONAL, szVersion) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szId); @@ -77,10 +77,14 @@ static bool addon_kvs_fnc_exists(KviKvsModuleFunctionCall * c) if(szVersion.isEmpty()) { c->returnValue()->setBoolean(true); - } else { - c->returnValue()->setBoolean(KviMiscUtils::compareVersions(a->version(),szVersion) < 0); } - } else { + else + { + c->returnValue()->setBoolean(KviMiscUtils::compareVersions(a->version(), szVersion) < 0); + } + } + else + { c->returnValue()->setBoolean(false); } return true; @@ -106,14 +110,16 @@ static bool addon_kvs_fnc_version(KviKvsModuleFunctionCall * c) { QString szId; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId) + KVSM_PARAMETER("id", KVS_PT_NONEMPTYSTRING, 0, szId) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szId); if(a) { c->returnValue()->setString(a->version()); - } else { + } + else + { c->returnValue()->setNothing(); } return true; @@ -137,21 +143,21 @@ static bool addon_kvs_fnc_version(KviKvsModuleFunctionCall * c) static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c) { - KviPointerHashTable * da = KviKvsScriptAddonManager::instance()->addonDict(); + KviPointerHashTable * da = KviKvsScriptAddonManager::instance()->addonDict(); int cnt = 0; - KviPointerHashTableIterator it(*da); + KviPointerHashTableIterator it(*da); while(KviKvsScriptAddon * a = it.current()) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon ID %Q, version %Q%c","addon"),KviControlCodes::Bold,&(a->name()),&(a->version()),KviControlCodes::Bold); - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Name: %Q","addon"),&(a->visibleName())); - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("%cAddon ID %Q, version %Q%c", "addon"), KviControlCodes::Bold, &(a->name()), &(a->version()), KviControlCodes::Bold); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Name: %Q", "addon"), &(a->visibleName())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Description: %Q", "addon"), &(a->description())); ++it; cnt++; } - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Total: %d addons installed","addon"),cnt); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Total: %d addons installed", "addon"), cnt); return true; } @@ -184,20 +190,22 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); if(a) { - if(!c->switches()->find('q',"quiet")) - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Uninstalling existing addon version %Q","addon"),&(a->version())); + if(!c->switches()->find('q', "quiet")) + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Uninstalling existing addon version %Q", "addon"), &(a->version())); // uninstall the existing version - KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback")); - } else { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + KviKvsScriptAddonManager::instance()->unregisterAddon(szName, c->window(), !c->switches()->find('n', "no-callback")); + } + else + { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); } return true; @@ -227,7 +235,7 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); @@ -236,14 +244,18 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c) QString ss = a->configureCallbackCode(); if(ss.isEmpty()) { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" has no configure callback set","addon").arg(szName)); - } else { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" has no configure callback set", "addon").arg(szName)); + } + else + { a->executeConfigureCallback(c->window()); } - } else { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + } + else + { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); } return true; @@ -274,7 +286,7 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); @@ -283,14 +295,18 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c) QString ss = a->helpCallbackCode(); if(ss.isEmpty()) { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" has no help callback set","addon").arg(szName)); - } else { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" has no help callback set", "addon").arg(szName)); + } + else + { a->executeHelpCallback(c->window()); } - } else { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + } + else + { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); } return true; @@ -327,16 +343,18 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall * QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); if(a) { a->setConfigureCallback(c->callback()->code()); - } else { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + } + else + { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); } return true; @@ -374,16 +392,18 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c) QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) KVSM_PARAMETERS_END(c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); if(a) { a->setHelpCallback(c->callback()->code()); - } else { - if(!c->switches()->find('q',"quiet")) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + } + else + { + if(!c->switches()->find('q', "quiet")) + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); } return true; @@ -490,18 +510,17 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c) QString szMinKVIrcVersion; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,(rd.szName)) - KVSM_PARAMETER("version",KVS_PT_NONEMPTYSTRING,0,(rd.szVersion)) - KVSM_PARAMETER_IGNORED("visible_text") - KVSM_PARAMETER_IGNORED("description") - KVSM_PARAMETER("min_kvirc_version",KVS_PT_NONEMPTYSTRING,0,szMinKVIrcVersion) - KVSM_PARAMETER("icon_id",KVS_PT_STRING,KVS_PF_OPTIONAL,(rd.szIconId)) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, (rd.szName)) + KVSM_PARAMETER("version", KVS_PT_NONEMPTYSTRING, 0, (rd.szVersion)) + KVSM_PARAMETER_IGNORED("visible_text") + KVSM_PARAMETER_IGNORED("description") + KVSM_PARAMETER("min_kvirc_version", KVS_PT_NONEMPTYSTRING, 0, szMinKVIrcVersion) + KVSM_PARAMETER("icon_id", KVS_PT_STRING, KVS_PF_OPTIONAL, (rd.szIconId)) KVSM_PARAMETERS_END(c) - - if(!(c->getParameterCode(2,rd.szVisibleNameScript) && c->getParameterCode(3,rd.szDescriptionScript))) + if(!(c->getParameterCode(2, rd.szVisibleNameScript) && c->getParameterCode(3, rd.szDescriptionScript))) { - c->error(__tr2qs_ctx("Internal error: call a head-shrinker","addon")); + c->error(__tr2qs_ctx("Internal error: call a head-shrinker", "addon")); return false; } @@ -510,57 +529,57 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c) if(!KviMiscUtils::isValidVersionString(rd.szVersion)) { - c->error(__tr2qs_ctx("The specified version \"%Q\" is not a valid version string","addon"),&(rd.szVersion)); + c->error(__tr2qs_ctx("The specified version \"%Q\" is not a valid version string", "addon"), &(rd.szVersion)); return false; } if(!KviMiscUtils::isValidVersionString(szMinKVIrcVersion)) { - c->error(__tr2qs_ctx("The specified KVIrc version \"%Q\" is not a valid version string","addon"),&szMinKVIrcVersion); + c->error(__tr2qs_ctx("The specified KVIrc version \"%Q\" is not a valid version string", "addon"), &szMinKVIrcVersion); return false; } - if(KviMiscUtils::compareVersions(szMinKVIrcVersion,KVI_VERSION "." KVI_SOURCES_DATE) < 0) + if(KviMiscUtils::compareVersions(szMinKVIrcVersion, KVI_VERSION "." KVI_SOURCES_DATE) < 0) { - c->error(__tr2qs_ctx("This KVIrc executable is too old to run this addon (minimum version required is %Q)","addon"),&szMinKVIrcVersion); + c->error(__tr2qs_ctx("This KVIrc executable is too old to run this addon (minimum version required is %Q)", "addon"), &szMinKVIrcVersion); return false; } - if(!c->switches()->find('q',"quiet")) - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Attempting to register addon \"%Q\" with version %Q","addon"),&(rd.szName),&(rd.szVersion)); + if(!c->switches()->find('q', "quiet")) + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Attempting to register addon \"%Q\" with version %Q", "addon"), &(rd.szName), &(rd.szVersion)); KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(rd.szName); if(a) { // the same addon already exists - if(KviMiscUtils::compareVersions(a->version(),rd.szVersion) < 0) + if(KviMiscUtils::compareVersions(a->version(), rd.szVersion) < 0) { // and it has a higher version... // complain unless -f is used - if(!c->switches()->find('f',"force")) + if(!c->switches()->find('f', "force")) { - c->error(__tr2qs_ctx("The addon \"%Q\" already exists with version %Q which is higher than %Q","addon"),&(rd.szName),&(a->version()),&(rd.szVersion)); + c->error(__tr2qs_ctx("The addon \"%Q\" already exists with version %Q which is higher than %Q", "addon"), &(rd.szName), &(a->version()), &(rd.szVersion)); return false; } } - if(!c->switches()->find('q',"quiet")) - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Uninstalling existing addon version %Q","addon"),&(a->version())); + if(!c->switches()->find('q', "quiet")) + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Uninstalling existing addon version %Q", "addon"), &(a->version())); - bool bUninstall = !c->switches()->find('n',"no-uninstall"); + bool bUninstall = !c->switches()->find('n', "no-uninstall"); // uninstall the existing version - KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName,c->window(),bUninstall,bUninstall); + KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName, c->window(), bUninstall, bUninstall); } if(!KviKvsScriptAddonManager::instance()->registerAddon(&rd)) { - c->error(__tr2qs_ctx("Addon registration failed","addon")); + c->error(__tr2qs_ctx("Addon registration failed", "addon")); return false; } - if(!c->switches()->find('q',"quiet")) - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Addon successfully registered","addon")); + if(!c->switches()->find('q', "quiet")) + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Addon successfully registered", "addon")); return true; } @@ -608,39 +627,39 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) QStringList lEntries; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) - KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) - KVSM_PARAMETER("files",KVS_PT_STRINGLIST,0,lEntries) + KVSM_PARAMETER("name", KVS_PT_NONEMPTYSTRING, 0, szName) + KVSM_PARAMETER("target", KVS_PT_NONEMPTYSTRING, 0, szTarget) + KVSM_PARAMETER("files", KVS_PT_STRINGLIST, 0, lEntries) KVSM_PARAMETERS_END(c) - bool bQuiet = c->switches()->find('q',"quiet"); + bool bQuiet = c->switches()->find('q', "quiet"); // we had a typo here, support the old switch name for backward scripts compatibility - bool bSkipNonExistent = c->switches()->find('i',"skip-nonexistent") || c->switches()->find('i',"skip-nonexisting"); + bool bSkipNonExistent = c->switches()->find('i', "skip-nonexistent") || c->switches()->find('i', "skip-nonexisting"); KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); if(!a) { if(!bQuiet) - c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist","addon").arg(szName)); + c->warning(__tr2qs_ctx("The addon \"%1\" doesn't exist", "addon").arg(szName)); return true; } if(szTarget.isEmpty()) - return c->error(__tr2qs_ctx("The target path can't be empty","addon")); + return c->error(__tr2qs_ctx("The target path can't be empty", "addon")); if(szTarget.indexOf("..") != -1) - return c->error(__tr2qs_ctx("The target path can't contain ..","addon")); + return c->error(__tr2qs_ctx("The target path can't contain ..", "addon")); if(lEntries.isEmpty()) { if(!bQuiet) - c->warning(__tr2qs_ctx("Empty file list","addon")); + c->warning(__tr2qs_ctx("Empty file list", "addon")); return true; // nothing to do } QStringList lExpandedEntries; - foreach(QString szEntry,lEntries) + foreach(QString szEntry, lEntries) { KviFileUtils::adjustFilePath(szEntry); @@ -654,28 +673,29 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) { szPath = "."; szFilter = szEntry; - } else { + } + else + { szPath = szEntry.left(idx); - szFilter = szEntry.mid(idx+1); + szFilter = szEntry.mid(idx + 1); } QDir dir(szPath); if(!dir.exists()) { if(!bSkipNonExistent) - return c->error(__tr2qs_ctx("The directory '%1' doesn't exist","addon").arg(szPath)); + return c->error(__tr2qs_ctx("The directory '%1' doesn't exist", "addon").arg(szPath)); if(!bQuiet) - c->warning(__tr2qs_ctx("Skipping non-existent entry '%1'","addon").arg(szEntry)); + c->warning(__tr2qs_ctx("Skipping non-existent entry '%1'", "addon").arg(szEntry)); continue; } QStringList sl = dir.entryList( - QStringList(szFilter), - QDir::Files | QDir::NoSymLinks | QDir::Readable | QDir::Hidden | QDir::System, - QDir::Unsorted - ); + QStringList(szFilter), + QDir::Files | QDir::NoSymLinks | QDir::Readable | QDir::Hidden | QDir::System, + QDir::Unsorted); - foreach(QString sz,sl) + foreach(QString sz, sl) { lExpandedEntries.append(QString("%1%2%3").arg(szPath).arg(QString(KVI_PATH_SEPARATOR_CHAR)).arg(sz)); } @@ -686,18 +706,18 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) if(!inf.exists()) { if(!bSkipNonExistent) - return c->error(__tr2qs_ctx("The file '%1' doesn't exist","addon").arg(szEntry)); + return c->error(__tr2qs_ctx("The file '%1' doesn't exist", "addon").arg(szEntry)); if(!bQuiet) - c->warning(__tr2qs_ctx("Skipping non-existent entry '%1'","addon").arg(szEntry)); + c->warning(__tr2qs_ctx("Skipping non-existent entry '%1'", "addon").arg(szEntry)); continue; } if(!inf.isFile()) { if(!bSkipNonExistent) - return c->error(__tr2qs_ctx("The entry '%1' is not a file","addon").arg(szEntry)); + return c->error(__tr2qs_ctx("The entry '%1' is not a file", "addon").arg(szEntry)); if(!bQuiet) - c->warning(__tr2qs_ctx("Skipping invalid entry '%1'","addon").arg(szEntry)); + c->warning(__tr2qs_ctx("Skipping invalid entry '%1'", "addon").arg(szEntry)); continue; } @@ -706,26 +726,26 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) // create target path QString szTargetPath; - g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szTarget); + g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szTarget); KviFileUtils::makeDir(szTargetPath); - for(QStringList::Iterator it = lExpandedEntries.begin();it != lExpandedEntries.end();++it) + for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it) { QFileInfo inf(*it); if(!inf.exists()) { - qDebug("ERROR: file %s doesn't exist, but it should...",inf.fileName().toUtf8().data()); + qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data()); continue; // bleah.. should never happen } QString szEntry = QString("%1%2%3").arg(szTarget).arg(QString(KVI_PATH_SEPARATOR_CHAR)).arg(inf.fileName()); - g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szEntry); + g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry); if(!bQuiet) - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Installing file '%1' into '%2'","addon").arg(*it).arg(szTargetPath)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath)); - KviFileUtils::copyFile(*it,szTargetPath); + KviFileUtils::copyFile(*it, szTargetPath); a->addInstalledFile(szEntry); } @@ -749,10 +769,10 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c) otherwise it is opened as part of the current frame window.[br] */ -static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall *c) +static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall * c) { - AddonManagementDialog::display(c->hasSwitch('t',"toplevel")); + AddonManagementDialog::display(c->hasSwitch('t', "toplevel")); return true; } @@ -775,13 +795,13 @@ static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c) QString szAddonPackFile; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("package_path",KVS_PT_STRING,0,szAddonPackFile) + KVSM_PARAMETER("package_path", KVS_PT_STRING, 0, szAddonPackFile) KVSM_PARAMETERS_END(c) QString szError; - if(!AddonFunctions::installAddonPackage(szAddonPackFile,szError)) + if(!AddonFunctions::installAddonPackage(szAddonPackFile, szError)) { - c->error(__tr2qs_ctx("Error installing addon package: %Q","addon"),&szError); + c->error(__tr2qs_ctx("Error installing addon package: %Q", "addon"), &szError); return false; } @@ -817,61 +837,59 @@ static bool addon_kvs_cmd_pack(KviKvsModuleCommandCall * c) AddonInfo info; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("package_path",KVS_PT_NONEMPTYSTRING,0,info.szSavePath) - KVSM_PARAMETER("addon_name",KVS_PT_NONEMPTYSTRING,0,info.szName) - KVSM_PARAMETER("addon_version",KVS_PT_NONEMPTYSTRING,0,info.szVersion) - KVSM_PARAMETER("description",KVS_PT_STRING,0,info.szDescription) - KVSM_PARAMETER("author",KVS_PT_NONEMPTYSTRING,0,info.szAuthor) - KVSM_PARAMETER("min_kvirc_version",KVS_PT_STRING,0,info.szMinVersion) - KVSM_PARAMETER("image",KVS_PT_STRING,0,info.szImage) - KVSM_PARAMETER("addon_path",KVS_PT_NONEMPTYSTRING,0,info.szDirPath) + KVSM_PARAMETER("package_path", KVS_PT_NONEMPTYSTRING, 0, info.szSavePath) + KVSM_PARAMETER("addon_name", KVS_PT_NONEMPTYSTRING, 0, info.szName) + KVSM_PARAMETER("addon_version", KVS_PT_NONEMPTYSTRING, 0, info.szVersion) + KVSM_PARAMETER("description", KVS_PT_STRING, 0, info.szDescription) + KVSM_PARAMETER("author", KVS_PT_NONEMPTYSTRING, 0, info.szAuthor) + KVSM_PARAMETER("min_kvirc_version", KVS_PT_STRING, 0, info.szMinVersion) + KVSM_PARAMETER("image", KVS_PT_STRING, 0, info.szImage) + KVSM_PARAMETER("addon_path", KVS_PT_NONEMPTYSTRING, 0, info.szDirPath) KVSM_PARAMETERS_END(c) QString szError; - if(AddonFunctions::pack(info,szError)) + if(AddonFunctions::pack(info, szError)) return true; c->error(szError); return false; } - - -static bool addon_module_init(KviModule *m) +static bool addon_module_init(KviModule * m) { - KVSM_REGISTER_FUNCTION(m,"exists",addon_kvs_fnc_exists); - KVSM_REGISTER_FUNCTION(m,"version",addon_kvs_fnc_version); - - KVSM_REGISTER_SIMPLE_COMMAND(m,"dialog",addon_kvs_cmd_dialog); - KVSM_REGISTER_SIMPLE_COMMAND(m,"list",addon_kvs_cmd_list); - KVSM_REGISTER_SIMPLE_COMMAND(m,"install",addon_kvs_cmd_install); - KVSM_REGISTER_SIMPLE_COMMAND(m,"uninstall",addon_kvs_cmd_uninstall); - KVSM_REGISTER_SIMPLE_COMMAND(m,"configure",addon_kvs_cmd_configure); - KVSM_REGISTER_SIMPLE_COMMAND(m,"help",addon_kvs_cmd_help); - KVSM_REGISTER_SIMPLE_COMMAND(m,"installfiles",addon_kvs_cmd_installfiles); - KVSM_REGISTER_SIMPLE_COMMAND(m,"pack",addon_kvs_cmd_pack); - - KVSM_REGISTER_CALLBACK_COMMAND(m,"setconfigurecallback",addon_kvs_cmd_setconfigurecallback); - KVSM_REGISTER_CALLBACK_COMMAND(m,"sethelpcallback",addon_kvs_cmd_sethelpcallback); - KVSM_REGISTER_CALLBACK_COMMAND(m,"register",addon_kvs_cmd_register); + KVSM_REGISTER_FUNCTION(m, "exists", addon_kvs_fnc_exists); + KVSM_REGISTER_FUNCTION(m, "version", addon_kvs_fnc_version); + + KVSM_REGISTER_SIMPLE_COMMAND(m, "dialog", addon_kvs_cmd_dialog); + KVSM_REGISTER_SIMPLE_COMMAND(m, "list", addon_kvs_cmd_list); + KVSM_REGISTER_SIMPLE_COMMAND(m, "install", addon_kvs_cmd_install); + KVSM_REGISTER_SIMPLE_COMMAND(m, "uninstall", addon_kvs_cmd_uninstall); + KVSM_REGISTER_SIMPLE_COMMAND(m, "configure", addon_kvs_cmd_configure); + KVSM_REGISTER_SIMPLE_COMMAND(m, "help", addon_kvs_cmd_help); + KVSM_REGISTER_SIMPLE_COMMAND(m, "installfiles", addon_kvs_cmd_installfiles); + KVSM_REGISTER_SIMPLE_COMMAND(m, "pack", addon_kvs_cmd_pack); + + KVSM_REGISTER_CALLBACK_COMMAND(m, "setconfigurecallback", addon_kvs_cmd_setconfigurecallback); + KVSM_REGISTER_CALLBACK_COMMAND(m, "sethelpcallback", addon_kvs_cmd_sethelpcallback); + KVSM_REGISTER_CALLBACK_COMMAND(m, "register", addon_kvs_cmd_register); QString szBuf; m->getDefaultConfigFileName(szBuf); - KviConfigurationFile cfg(szBuf,KviConfigurationFile::Read); - g_rectManagementDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440)); + KviConfigurationFile cfg(szBuf, KviConfigurationFile::Read); + g_rectManagementDialogGeometry = cfg.readRectEntry("EditorGeometry", QRect(10, 10, 390, 440)); return true; } -static bool addon_module_cleanup(KviModule *m) +static bool addon_module_cleanup(KviModule * m) { AddonManagementDialog::cleanup(); QString szBuf; m->getDefaultConfigFileName(szBuf); - KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write); - cfg.writeEntry("EditorGeometry",g_rectManagementDialogGeometry); + KviConfigurationFile cfg(szBuf, KviConfigurationFile::Write); + cfg.writeEntry("EditorGeometry", g_rectManagementDialogGeometry); return true; } @@ -881,16 +899,14 @@ static bool addon_module_can_unload(KviModule *) return (!AddonManagementDialog::instance()); } - KVIRC_MODULE( - "Addon", // module name - "4.0.0", // module version - "Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net)\n" \ - " 2008 Elvio Basello (hell at hellvis69 dot netsons dot org)", // author & (C) - "Addon management functions for the KVS engine", - addon_module_init, - addon_module_can_unload, - 0, - addon_module_cleanup, - "addon" -) + "Addon", // module name + "4.0.0", // module version + "Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net)\n" + " 2008 Elvio Basello (hell at hellvis69 dot netsons dot org)", // author & (C) + "Addon management functions for the KVS engine", + addon_module_init, + addon_module_can_unload, + 0, + addon_module_cleanup, + "addon") -- cgit v1.3.1-10-gc9f91