[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasmate/terietor/porting] plasmate: when we import a package, the mainwindow must load it
From:       Antonis Tsiapaliokas <kok3rs () gmail ! com>
Date:       2014-03-26 9:28:40
Message-ID: E1WSk8W-0007Ke-Un () scm ! kde ! org
[Download RAW message or body]

Git commit 9e56808d48a3b2629d587583136d9894744b232b by Antonis Tsiapaliokas.
Committed on 26/03/2014 at 09:27.
Pushed by tsiapaliokas into branch 'terietor/porting'.

when we import a package, the mainwindow must load it

M  +11   -5    plasmate/startpage.cpp

http://commits.kde.org/plasmate/9e56808d48a3b2629d587583136d9894744b232b

diff --git a/plasmate/startpage.cpp b/plasmate/startpage.cpp
index c57a58a..893f395 100644
--- a/plasmate/startpage.cpp
+++ b/plasmate/startpage.cpp
@@ -127,6 +127,13 @@ void StartPage::setupWidgets()
 
         m_projectHandler->recentProject(path);
         resetStatus();
+
+        //load our project
+        QString metadataDesktop = path;
+        const QString projectPath = metadataDesktop.replace(QStringLiteral("metadata.desktop"), "");
+        m_packageHandler->setPackagePath(projectPath);
+        m_packageHandler->loadPackage();
+        m_mainWindow->loadProject(findMainScript(projectPath));
         emit projectSelected(path);
     });
 
@@ -446,18 +453,17 @@ void StartPage::checkLocalProjectPath(const QString& name)
     m_ui.invalidPlasmagikLabelEmpty->setVisible(false);
     m_ui.invalidPlasmagikLabelNoMetadataDesktop->setVisible(false);
 
-    QDir dir(KShell::tildeExpand(name));
-    QFile metadataDesktop(dir.path() + "/metadata.desktop");
-    qDebug() << "checking: " << name << dir.exists();
+    QFile metadataDesktop(name);
+    qDebug() << "checking: " << name;
     m_ui.loadLocalProject->setEnabled(metadataDesktop.exists());
 
     if (name.isEmpty()) {
         m_ui.invalidPlasmagikLabelEmpty->setVisible(true);
         m_ui.invalidPlasmagikLabelNoMetadataDesktop->setVisible(false);
-    } else if (!metadataDesktop.exists()) {
+    } else if (!metadataDesktop.exists() && !metadataDesktop.fileName().endsWith(QStringLiteral("metadata.desktop"))) {
         m_ui.invalidPlasmagikLabelEmpty->setVisible(false);
         m_ui.invalidPlasmagikLabelNoMetadataDesktop->setVisible(true);
-        m_ui.invalidPlasmagikLabelNoMetadataDesktop->setText(i18n("metadata.desktop does not exist in %1", dir.path()));
+        m_ui.invalidPlasmagikLabelNoMetadataDesktop->setText(i18n("metadata.desktop does not exist in %1", name));
     } else if (!name.isEmpty()) {
         m_ui.invalidPlasmagikLabelEmpty->setVisible(false);
         m_ui.invalidPlasmagikLabelNoMetadataDesktop->setVisible(false);
[prev in list] [next in list] [prev in thread] [next in thread]