Initial reorganization

.gitignore

@@ -9,20 +9,15 @@
 # Preserve files used by Git!
 !.git*
 
-# Preserve ".initial", just for the memories...
-!.initial
-
 # Ignore build-process related files
 Makefile
 *.o
 *.so
 *.a
 moc_*
 qrc_*
-panorama/target/panorama
+target/panorama
 
 # Ignore project-related user-generated files
 *.user
 
-# Ignore that #¤#% config file that is modified every time we test the application
-panorama/target/settings.cfg

panorama-plugins/applications-plugin/applications-plugin.pro

@@ -4,7 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/Applications
+DESTDIR = ../../target/plugins/Panorama/Applications
 
 INCLUDEPATH += ../../panorama/include
 INCLUDEPATH += ../../pandora-libraries/pnd/include

panorama-plugins/pandora-plugin/pandora-plugin.pro

@@ -4,7 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/Pandora
+DESTDIR = ../../target/plugins/Panorama/Pandora
 
 INCLUDEPATH += ../../panorama/include
 INCLUDEPATH += ../../pandora-libraries/pnd/include

panorama-plugins/panorama-plugins.pro

@@ -7,3 +7,4 @@ SUBDIRS = \
     applications-plugin \
     systeminformation-plugin \
     pandora-plugin
+

panorama-plugins/settings-plugin/settings-plugin.pro

@@ -4,7 +4,15 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/Settings
+DESTDIR = ../../target/plugins/Panorama/Settings
+
+pandora {
+    DEFINES += PANDORA
+}
+
+CONFIG(release, debug|release) {
+    DEFINES += RELEASE
+}
 
 INCLUDEPATH += ../../panorama/include
 

panorama-plugins/settings-plugin/src/configuration.cpp

@@ -85,7 +85,11 @@ void ConfigurationPrivate::initConfiguration()
         }
 
         //XXX Hack, add different method for "virtual" settings?
+#if defined(PANDORA) || (!defined(PANDORA) && !defined(RELEASE))
         settings->setValue("panorama/dataDirectory", QCoreApplication::applicationDirPath());
+#else
+        settings->setValue("panorama/dataDirectory", "/usr/share/panorama");
+#endif
 
         watcher.addPath(settings->fileName());
         qDebug() << "Settings are saved in" << settings->fileName();

panorama-plugins/systeminformation-plugin/systeminformation-plugin.pro

@@ -4,7 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/SystemInformation
+DESTDIR = ../../target/plugins/Panorama/SystemInformation
 
 INCLUDEPATH += ../../panorama/include
 

panorama-plugins/textfile-plugin/textfile-plugin.pro

@@ -4,7 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/TextFile
+DESTDIR = ../../target/plugins/Panorama/TextFile
 
 INCLUDEPATH += ../../panorama/include
 

panorama-plugins/ui-plugin/ui-plugin.pro

@@ -4,7 +4,7 @@ QT += declarative
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ../../panorama/target/plugins/Panorama/UI
+DESTDIR = ../../target/plugins/Panorama/UI
 
 INCLUDEPATH += ../../panorama/include
 

panorama.pro

@@ -11,3 +11,23 @@ panorama.depends = panorama-plugins
 
 panorama-plugins.subdir = panorama-plugins
 panorama-plugins.depends = pandora-libraries
+
+unix {
+    isEmpty(PREFIX) {
+        PREFIX = /usr
+    }
+    BINDIR = $$PREFIX/bin
+    DATADIR = $$PREFIX/share
+    LIBDIR = $$PREFIX/lib
+
+    interfaces.files = target/interfaces/*
+    interfaces.path = $$DATADIR/panorama/interfaces
+
+    plugins.files = target/plugins/*
+    plugins.path = $$LIBDIR/panorama/plugins/
+
+    panorama.files = target/panorama
+    panorama.path = $$BINDIR
+
+    INSTALLS += interfaces plugins panorama
+}

panorama/panorama.pro

@@ -20,7 +20,7 @@ poltergeist {
 }
 
 TARGET = panorama
-DESTDIR = target
+DESTDIR = ../target
 TEMPLATE = app
 INCLUDEPATH += include
 SOURCES += \

panorama/src/mainwindow.cpp

@@ -31,6 +31,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
     //Make plugins available
     engine()->addImportPath(QCoreApplication::applicationDirPath() + "/plugins");
+    engine()->addImportPath("/usr/lib/panorama/plugins");
+    engine()->addImportPath(QDir::homePath() + "/.panorama/plugins");
 
     //Load the main QML file
     setSource(QUrl("qrc:/root.qml"));

target/interfaces/Colors/Colors.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}

panorama/target/interfaces/Colors/ui.qml → target/interfaces/Colors/ui.qml

@@ -7,6 +7,7 @@ import Panorama.Pandora 1.0
 import Panorama.Applications 1.0
 import "qml" as Helpers
 import "qml/parser.js" as Parser
+
 PanoramaUI {
     id: ui
     name: "Colors (from PMenu)"

target/interfaces/Magma/Magma.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}

target/interfaces/Simplicity/Simplicity.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}

target/interfaces/Tabbed/Tabbed.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}

target/interfaces/Test/Test.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}

target/interfaces/TestSuite/TestSuite.qmlproject

@@ -0,0 +1,8 @@
+import QmlProject 1.0
+
+Project {
+    QmlFiles { directory: "." }
+    JavaScriptFiles { directory: "." }
+    ImageFiles { directory: "." }
+    importPaths: [ "../../target/plugins/", "../../plugins/", "/usr/lib/panorama/plugins/" ]
+}