SVN commit 1096785 by yuenlim:

Changelog entry + build fix


 M  +3 -0      CHANGELOG  
 M  +10 -10    editors/metadata/metadataeditor.cpp  
 M  +2 -2      mainwindow.cpp  
 M  +0 -6      packagemodel.cpp  
 M  +0 -6      packagemodel.h  
 M  +5 -5      publisher/publisher.cpp  
 M  +9 -9      startpage.cpp  


--- trunk/playground/base/plasma/plasmate/CHANGELOG #1096784:1096785
@@ -1,3 +1,6 @@
+--February 27, 2010--
+- Added support for PopupApplets.
+
 --February 25,2010--
 - Implemented project notes as dockwidget.
 - Implemented import/export to GHNS.
--- trunk/playground/base/plasma/plasmate/editors/metadata/metadataeditor.cpp #1096784:1096785
@@ -96,15 +96,15 @@
 
     QString serviceType = metadata->serviceType();
 
-    if (serviceType == QString(PackageModel::plasmoidType)) {
+    if (serviceType == "Plasma/Applet") {
         view->type_combo->setCurrentIndex(0);
-    } else if (serviceType == QString(PackageModel::popupType)) {
+    } else if (serviceType == "Plasma/PopupApplet") {
         view->type_combo->setCurrentIndex(1);
-    } else if (serviceType == QString(PackageModel::dataengineType)) {
+    } else if (serviceType == "Plasma/DataEngine") {
         view->type_combo->setCurrentIndex(2);
-    } else if (serviceType == QString(PackageModel::themeType)) {
+    } else if (serviceType == "Plasma/Theme") {
         view->type_combo->setCurrentIndex(3);
-    } else if (serviceType == QString(PackageModel::runnerType)) {
+    } else if (serviceType == "Plasma/Runner") {
         view->type_combo->setCurrentIndex(4);
     } else {
         kWarning() << "Unknown service type" << serviceType;
@@ -139,24 +139,24 @@
 
     switch (view->type_combo->currentIndex()) {
     case 0:
-        metadata->setServiceType(PackageModel::plasmoidType);
+        metadata->setServiceType("Plasma/Applet");
         currentType = Plasma::AppletComponent;
         break;
     case 1:
-        metadata->setServiceType(PackageModel::popupType);
+        metadata->setServiceType("Plasma/PopupApplet");
         currentType = Plasma::AppletComponent;
         break;
     case 2:
-        metadata->setServiceType(PackageModel::dataengineType);
+        metadata->setServiceType("Plasma/DataEngine");
         currentType = Plasma::DataEngineComponent;
         break;
     case 3:
-        metadata->setServiceType(PackageModel::themeType);
+        metadata->setServiceType("Plasma/Theme");
         view->api_combo->setEnabled(false);
         return;
         break;
     case 4:
-        metadata->setServiceType(PackageModel::runnerType);
+        metadata->setServiceType("Plasma/Runner");
         currentType = Plasma::RunnerComponent;
         break;
     default:
--- trunk/playground/base/plasma/plasmate/mainwindow.cpp #1096784:1096785
@@ -542,8 +542,8 @@
 
     //Workaround for Plasma::PackageStructure not recognizing Plasma/PopupApplet as a valid type
     //FIXME:
-    if (actualType == PackageModel::popupType) {
-        actualType = PackageModel::plasmoidType;
+    if (actualType == "Plasma/PopupApplet") {
+        actualType = "Plasma/Applet";
     }
 
     // Add it to the recent files first.
--- trunk/playground/base/plasma/plasmate/packagemodel.cpp #1096784:1096785
@@ -14,12 +14,6 @@
 #include <Plasma/Package>
 #include <Plasma/PackageMetadata>
 
-const QString PackageModel::dataengineType = "Plasma/DataEngine";
-const QString PackageModel::runnerType = "Plasma/Runner";
-const QString PackageModel::themeType = "Plasma/Theme";
-const QString PackageModel::plasmoidType = "Plasma/Applet";
-const QString PackageModel::popupType = "Plasma/PopupApplet";
-
 PackageModel::PackageModel(QObject *parent)
         : QAbstractItemModel(parent),
         m_directory(0),
--- trunk/playground/base/plasma/plasmate/packagemodel.h #1096784:1096785
@@ -19,12 +19,6 @@
 
 public:
 
-    static const QString plasmoidType;
-    static const QString popupType;
-    static const QString runnerType;
-    static const QString dataengineType;
-    static const QString themeType;
-
     explicit PackageModel(QObject *parent = 0);
     ~PackageModel();
 
--- trunk/playground/base/plasma/plasmate/publisher/publisher.cpp #1096784:1096785
@@ -34,9 +34,9 @@
     QString installText = i18n("Click to install the current project directly onto your computer.");
     QString publishLabel = i18n("Publish project");
     QString publishText = i18n("Click to publish the current project online, so that other people can find and install it using the Internet.");
-    
-    m_extension = type == PackageModel::plasmoidType ? "plasmoid" : "zip";
 
+    m_extension = (type == "Plasma/Applet" || type == "Plasma/PopupApplet") ? "plasmoid" : "zip";
+
     m_exporterUrl = new KUrlRequester(this);
     m_exporterUrl->setFilter(QString("*.") + m_extension);
     m_exporterUrl->setMode(KFile::File | KFile::LocalOnly);
@@ -117,11 +117,11 @@
 
     QStringList argv("plasmapkg");
     argv.append("-t");
-    if (m_projectType == PackageModel::runnerType) {
+    if (m_projectType == "Plasma/Runner") {
         argv.append("runner");
-    } else if (m_projectType == PackageModel::dataengineType) {
+    } else if (m_projectType == "Plasma/DataEngine") {
         argv.append("dataengine");
-    } else if (m_projectType == PackageModel::themeType) {
+    } else if (m_projectType == "Plasma/Theme") {
         argv.append("theme");
     } else {
         argv.append("plasmoid");
--- trunk/playground/base/plasma/plasmate/startpage.cpp #1096784:1096785
@@ -249,14 +249,14 @@
 
         QString serviceType = metadata.serviceType();
 
-        if (serviceType == PackageModel::plasmoidType ||
-            serviceType == PackageModel::popupType) {
+        if (serviceType == "Plasma/Applet" ||
+            serviceType == "Plasma/PopupApplet") {
             item->setIcon(KIcon("application-x-plasma"));
-        } else if (serviceType == PackageModel::dataengineType) {
+        } else if (serviceType == "Plasma/DataEngine") {
             item->setIcon(KIcon("kexi"));
-        } else if (serviceType == PackageModel::themeType) {
+        } else if (serviceType == "Plasma/Theme") {
             item->setIcon(KIcon("inkscape"));
-        } else if (serviceType == PackageModel::runnerType) {
+        } else if (serviceType == "Plasma/Runner") {
             item->setIcon(KIcon("system-run"));
         } else {
             kWarning() << "Unknown service type" << serviceType;
@@ -290,15 +290,15 @@
     // type -> serviceTypes
     QString serviceTypes;
     if (ui->contentTypes->currentRow() == 1) {
-        serviceTypes = PackageModel::dataengineType;
+        serviceTypes = "Plasma/DataEngine";
         templateFilePath.append("mainDataEngine");
     } else if (ui->contentTypes->currentRow() == 2) {
-        serviceTypes = PackageModel::runnerType;
+        serviceTypes = "Plasma/Runner";
         templateFilePath.append("mainRunner");
     } else if (ui->contentTypes->currentRow() == 3) {
-        serviceTypes = PackageModel::themeType;
+        serviceTypes = "Plasma/Theme";
     } else {
-        serviceTypes = PackageModel::plasmoidType;
+        serviceTypes = "Plasma/Applet";
         templateFilePath.append("mainPlasmoid");
     }