From 7f013d766723468f4c4785411dcf5d42694cec3b Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 10:24:50 -0400
Subject: Fix up the QML test routine a bit, and add a couple works-in-progress
 for a new firefly screensaver.

---
 .../extrafiles/screensavers/Fireflies.qml          | 18 ++++++++
 .../extrafiles/screensavers/Firefly.qml            | 52 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
new file mode 100644
index 00000000..36ed4df5
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+import "." as QML
+
+Rectangle {
+  id : canvas
+  anchors.fill: parent
+  color: "black"
+  
+  Repeater {
+      model: Math.round(Math.random()*100)+30
+     QML.Firefly {
+       parent: canvas
+       x: Math.round(Math.random()*canvas.width)
+       y: Math.round(Math.random()*canvas.height)
+     }
+  }  //end of Repeater
+} //end of canvas rectangle
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
new file mode 100644
index 00000000..704811a7
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
@@ -0,0 +1,52 @@
+import QtQuick 2.0
+import QtQuick.Window 2.2
+import QtGraphicalEffects 1.0
+
+Item {
+
+  RectangularGlow {
+    anchors.fill: fly
+    glowRadius: 0.1
+    spread: 0.1
+    color: Qt.rgba(Math.random()*255,Math.random()*255,0,0.3)
+    cornerRadius: fly.radius + glowRadius
+  }
+
+  Rectangle {
+    id: fly
+    width: Math.round(Math.random()*3)+2
+    height: width
+    color: Qt.rgba(Math.random()*255,Math.random()*255,0,0.8)    
+    radius: Math.floor(width/2)
+    property int jitterX: Math.round(Math.random()*100)+10
+    property int jitterY: Math.round(Math.random()*100)+10
+      
+  }
+
+   Behavior on x {
+       SmoothedAnimation {
+           velocity: 10+Math.random()*canvas.width/100
+       }
+   }
+   Behavior on y {
+       SmoothedAnimation {
+           velocity: 10+Math.random()*canvas.height/100
+       }
+   }
+
+      Timer {
+        interval: Math.round(Math.random()*1000)
+         repeat: true
+         running: true
+         onTriggered: {
+              if ( (x+fly.jitterX)>canvas.width || (x+fly.jitterX)<0 ){ fly.jitterX = 0-fly.jitterX }
+              x = x+fly.jitterX
+              if( (y+fly.jitterY)>canvas.height || (y+fly.jitterY)<0 ){ fly.jitterY = 0-fly.jitterY }
+              y = y+fly.jitterY
+              fly.jitterX = (Math.round(Math.random())*2 - 1) *fly.jitterX
+              fly.jitterY = (Math.round(Math.random())*2 - 1) *fly.jitterY
+            fly.color = Qt.rgba(Math.random()*255,Math.random()*255,Math.random()*150,0.8)
+           
+         }
+     } //end of timer
+} //end of item
-- 
cgit 


From 23efad7b8634b32ff6f4d901af9997bc98206af3 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 11:09:16 -0400
Subject: Update the Fireflies screensaver - seems to work fine now

---
 .../extrafiles/screensavers/Fireflies.qml          |  3 +-
 .../extrafiles/screensavers/Firefly.qml            | 39 ++++++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
index 36ed4df5..c2295a8f 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
@@ -8,11 +8,12 @@ Rectangle {
   color: "black"
   
   Repeater {
-      model: Math.round(Math.random()*100)+30
+      model: Math.round(Math.random()*200)+60
      QML.Firefly {
        parent: canvas
        x: Math.round(Math.random()*canvas.width)
        y: Math.round(Math.random()*canvas.height)
      }
   }  //end of Repeater
+
 } //end of canvas rectangle
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
index 704811a7..7b65d8ec 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
@@ -6,23 +6,28 @@ Item {
 
   RectangularGlow {
     anchors.fill: fly
-    glowRadius: 0.1
-    spread: 0.1
-    color: Qt.rgba(Math.random()*255,Math.random()*255,0,0.3)
+    glowRadius: Math.round(fly.radius /2)
+    spread: 0.5
+    color: Qt.rgba(1,1,1,0.3)
     cornerRadius: fly.radius + glowRadius
   }
 
   Rectangle {
     id: fly
-    width: Math.round(Math.random()*3)+2
+    width: Math.round(Math.random()*canvas.width/200)+2
     height: width
-    color: Qt.rgba(Math.random()*255,Math.random()*255,0,0.8)    
+    x: parent.x
+    y: parent.y
+    color: Qt.rgba(Math.random(),Math.random(),0,0.5)    
     radius: Math.floor(width/2)
     property int jitterX: Math.round(Math.random()*100)+10
     property int jitterY: Math.round(Math.random()*100)+10
-      
-  }
-
+     
+    Behavior on color {
+      ColorAnimation {
+        duration: 500
+      }
+    }
    Behavior on x {
        SmoothedAnimation {
            velocity: 10+Math.random()*canvas.width/100
@@ -34,18 +39,24 @@ Item {
        }
    }
 
+  }
+
+
+  
       Timer {
-        interval: Math.round(Math.random()*1000)
+        interval: 5
          repeat: true
          running: true
+         property bool starting: true
          onTriggered: {
-              if ( (x+fly.jitterX)>canvas.width || (x+fly.jitterX)<0 ){ fly.jitterX = 0-fly.jitterX }
-              x = x+fly.jitterX
-              if( (y+fly.jitterY)>canvas.height || (y+fly.jitterY)<0 ){ fly.jitterY = 0-fly.jitterY }
-              y = y+fly.jitterY
+              if(starting){ interval = Math.round(Math.random()*1000)+500; starting = false; }
+              if ( (fly.x+fly.jitterX)>parent.width || (fly.x+fly.jitterX)<0 ){ fly.jitterX = 0-fly.jitterX }
+              fly.x = fly.x+fly.jitterX
+              if( (fly.y+fly.jitterY)>parent.height || (fly.y+fly.jitterY)<0 ){ fly.jitterY = 0-fly.jitterY }
+              fly.y = fly.y+fly.jitterY
               fly.jitterX = (Math.round(Math.random())*2 - 1) *fly.jitterX
               fly.jitterY = (Math.round(Math.random())*2 - 1) *fly.jitterY
-            fly.color = Qt.rgba(Math.random()*255,Math.random()*255,Math.random()*150,0.8)
+            fly.color = Qt.rgba(Math.random(),Math.random(),Math.random(),0.5)
            
          }
      } //end of timer
-- 
cgit 


From f81d342ebc0aba7295c78b91a0ecfb1cb013f723 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 11:16:58 -0400
Subject: Make the number of fireflies scale a bit better with the size of the
 screen

---
 .../core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
index c2295a8f..d8dcc1ed 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
@@ -8,7 +8,7 @@ Rectangle {
   color: "black"
   
   Repeater {
-      model: Math.round(Math.random()*200)+60
+      model: Math.round(Math.random()*canvas.width/10)+100
      QML.Firefly {
        parent: canvas
        x: Math.round(Math.random()*canvas.width)
-- 
cgit 


From 93536aa33906895760d87c79da5f74471fcf0696 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 13:18:53 -0400
Subject: Change the layout of the screensaver files directory a bit. This adds
 the formalization of a JSON manifest for determining which screensavers are
 valid and how to launch them, as well as all sorts of other legal/author
 information as desired.

---
 .../extrafiles/screensavers/Fireflies.json         | 26 +++++++
 .../extrafiles/screensavers/Fireflies.qml          | 19 ------
 .../extrafiles/screensavers/Firefly.qml            | 63 -----------------
 .../extrafiles/screensavers/README.md              | 79 ++++++++++++++++++++++
 .../screensavers/qml_scripts/Fireflies.qml         | 19 ++++++
 .../screensavers/qml_scripts/Firefly.qml           | 63 +++++++++++++++++
 6 files changed, 187 insertions(+), 82 deletions(-)
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Fireflies.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Firefly.qml

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
new file mode 100644
index 00000000..e01d6d2b
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
@@ -0,0 +1,26 @@
+{
+  "name" : {
+    "default" : "Fireflies"
+  },
+  "description" : {
+    "default" : "Dancing balls of light on the screen"
+  },
+  "author" : {
+    "name" : "Ken Moore",
+    "email" : "ken@ixsystems.com",
+    "website" : "https://github.com/beanpole135",
+    "company" : "iXsystems",
+    "company_website" : "http://ixsystems.com"
+  },
+  "meta" : {
+    "license" : "3-clause BSD",
+    "license_url" : "https://github.com/trueos/lumina/blob/master/LICENSE",
+    "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
+    "date_created" : "20171010",
+    "version" : "1.0"
+  }
+  "qml" : {
+    "qml_file" : "qml_scripts/Fireflies.qml",
+    "additional_files" : ["qml_scripts/Firefly.qml"]
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
deleted file mode 100644
index d8dcc1ed..00000000
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-import "." as QML
-
-Rectangle {
-  id : canvas
-  anchors.fill: parent
-  color: "black"
-  
-  Repeater {
-      model: Math.round(Math.random()*canvas.width/10)+100
-     QML.Firefly {
-       parent: canvas
-       x: Math.round(Math.random()*canvas.width)
-       y: Math.round(Math.random()*canvas.height)
-     }
-  }  //end of Repeater
-
-} //end of canvas rectangle
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
deleted file mode 100644
index 7b65d8ec..00000000
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Firefly.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtGraphicalEffects 1.0
-
-Item {
-
-  RectangularGlow {
-    anchors.fill: fly
-    glowRadius: Math.round(fly.radius /2)
-    spread: 0.5
-    color: Qt.rgba(1,1,1,0.3)
-    cornerRadius: fly.radius + glowRadius
-  }
-
-  Rectangle {
-    id: fly
-    width: Math.round(Math.random()*canvas.width/200)+2
-    height: width
-    x: parent.x
-    y: parent.y
-    color: Qt.rgba(Math.random(),Math.random(),0,0.5)    
-    radius: Math.floor(width/2)
-    property int jitterX: Math.round(Math.random()*100)+10
-    property int jitterY: Math.round(Math.random()*100)+10
-     
-    Behavior on color {
-      ColorAnimation {
-        duration: 500
-      }
-    }
-   Behavior on x {
-       SmoothedAnimation {
-           velocity: 10+Math.random()*canvas.width/100
-       }
-   }
-   Behavior on y {
-       SmoothedAnimation {
-           velocity: 10+Math.random()*canvas.height/100
-       }
-   }
-
-  }
-
-
-  
-      Timer {
-        interval: 5
-         repeat: true
-         running: true
-         property bool starting: true
-         onTriggered: {
-              if(starting){ interval = Math.round(Math.random()*1000)+500; starting = false; }
-              if ( (fly.x+fly.jitterX)>parent.width || (fly.x+fly.jitterX)<0 ){ fly.jitterX = 0-fly.jitterX }
-              fly.x = fly.x+fly.jitterX
-              if( (fly.y+fly.jitterY)>parent.height || (fly.y+fly.jitterY)<0 ){ fly.jitterY = 0-fly.jitterY }
-              fly.y = fly.y+fly.jitterY
-              fly.jitterX = (Math.round(Math.random())*2 - 1) *fly.jitterX
-              fly.jitterY = (Math.round(Math.random())*2 - 1) *fly.jitterY
-            fly.color = Qt.rgba(Math.random(),Math.random(),Math.random(),0.5)
-           
-         }
-     } //end of timer
-} //end of item
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
new file mode 100644
index 00000000..768f0e14
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
@@ -0,0 +1,79 @@
+## Screensaver Format
+The screensaver system for the Lumina desktop allows for the creation and use of scripts written in the QML language, with a number of screensavers and other examples installed out-of-box. There are only a couple warnings/caveats to consider when developing a new screensaver:
+
+1. The root object in your QML script will be automatically sized to fit the screen as needed. Avoid trying to hard-code specific screen dimensions within your script as it will not work properly.
+2. A JSON manifest file must be created (format listed below) and placed into one of the screensaver plugin directories for it to be recognized as a valid screensaver by the desktop.
+
+
+### JSON Manifest
+The manifest file contains all the information needed to actually validate/launch the screensaver, as well as additional information about the author and/or the screensaver itself.
+
+Example JSON manifest file (sample.json):
+```
+{
+  "name" : {
+    "default" : "sample",
+    "en_US" : "US English localization of the name"
+    "en" : "Generic english localization of the name"
+  }
+ 
+  "description" : {
+    "default" : "sample screensaver",
+    "en_US" : "US English Localization of the description"
+  }
+
+  "author" : {
+    "name" : "Me",
+    "email" : "Me@myself.net",
+    "website" : "http://mywebsite.net",
+    "company" : "iXsystems"
+    "company_website" : "http://ixsystems.com"
+  }
+
+  "meta" : {
+    "license" : "3-clause BSD",
+    "license_url" : "https://github.com/trueos/lumina/blob/master/LICENSE",
+    "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
+    "date_created" : "20171010",
+    "date_updated" : "20171011",
+    "version" : "1.0"
+  }
+
+  "qml" : {
+    "exec" : "absolute/or/relative/path/to/script.qml",
+    "additional_files" : ["file/which/must/exist.png"],
+    "qt_min_version" : "5.0",
+    "qt_max_version" : "6.0"
+  }
+}
+```
+
+Details of the individual items in the manifest:
+* NOTE: for locale codes, both long and short version are acceptable:
+  Example 1: If the current locale is "en_GB", but the JSON manifest lists translations for "en_US" and "en", then the "en" translation will be used.
+  Example 2: If the current locale is "en_GB", but neither "en_GB" nor "en" translations exist, then the "default" version will be used.
+
+* **name** : (required) This is the official name of the screensaver to show to users
+   * *default* : (required) Non-translated name of the screensaver
+   * *[locale]* : (optional) Translated name for specific [locale]
+* **description** : (required) This is a short description of the screensaver to show to users
+   * *default* : (required) Non-translated description of the screensaver
+   * *[locale]* : (optional) Translated description for specific [locale]
+* **author** : (all optional) Additional information about the author(s) of the screensaver
+   * *name* : Name of the author
+   * *email* : Email to contact the author (useful for licensing questions and such)
+   * *website* : Personal website for the author (github/facebook/twitter profile, etc)
+   * *company* : Company for which the author is creating this screensaver
+   * *company_website* : Website for the company
+* **meta** : (all optional) Additional information about the screensaver itself
+   * *license* : License the screensaver is released under
+   * *license_url* : Website which contains the full text of the license
+   * *copyright* : Copyright notice for this screensaver
+   * *date_created* : (yyyyMMdd) Date the screensaver was initially created
+   * *date_updated* : (yyyyMMdd) Date the screensaver was last updated
+   * *version* : Current version of the screensaver (typically updated every time "date_updated" is changed)
+* **qml** : (required) Information about launching the screensaver and checking validity
+   * *exec* : (required) Absolute or relative path to the QML script (relative to the directory which contains the JSON manifest)
+   * *additional_files* : (optional) Array of paths for other files/scripts which must exist for the screensaver to work properly.
+   * *qt_min_version* : (optional) Minimum version of the Qt libraries that this screensaver supports
+   * *qt_max_version* : (optional) Maximum version of the Qt libraries that this screensaver supports 
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Fireflies.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Fireflies.qml
new file mode 100644
index 00000000..d8dcc1ed
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Fireflies.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+import "." as QML
+
+Rectangle {
+  id : canvas
+  anchors.fill: parent
+  color: "black"
+  
+  Repeater {
+      model: Math.round(Math.random()*canvas.width/10)+100
+     QML.Firefly {
+       parent: canvas
+       x: Math.round(Math.random()*canvas.width)
+       y: Math.round(Math.random()*canvas.height)
+     }
+  }  //end of Repeater
+
+} //end of canvas rectangle
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Firefly.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Firefly.qml
new file mode 100644
index 00000000..7b65d8ec
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Firefly.qml
@@ -0,0 +1,63 @@
+import QtQuick 2.0
+import QtQuick.Window 2.2
+import QtGraphicalEffects 1.0
+
+Item {
+
+  RectangularGlow {
+    anchors.fill: fly
+    glowRadius: Math.round(fly.radius /2)
+    spread: 0.5
+    color: Qt.rgba(1,1,1,0.3)
+    cornerRadius: fly.radius + glowRadius
+  }
+
+  Rectangle {
+    id: fly
+    width: Math.round(Math.random()*canvas.width/200)+2
+    height: width
+    x: parent.x
+    y: parent.y
+    color: Qt.rgba(Math.random(),Math.random(),0,0.5)    
+    radius: Math.floor(width/2)
+    property int jitterX: Math.round(Math.random()*100)+10
+    property int jitterY: Math.round(Math.random()*100)+10
+     
+    Behavior on color {
+      ColorAnimation {
+        duration: 500
+      }
+    }
+   Behavior on x {
+       SmoothedAnimation {
+           velocity: 10+Math.random()*canvas.width/100
+       }
+   }
+   Behavior on y {
+       SmoothedAnimation {
+           velocity: 10+Math.random()*canvas.height/100
+       }
+   }
+
+  }
+
+
+  
+      Timer {
+        interval: 5
+         repeat: true
+         running: true
+         property bool starting: true
+         onTriggered: {
+              if(starting){ interval = Math.round(Math.random()*1000)+500; starting = false; }
+              if ( (fly.x+fly.jitterX)>parent.width || (fly.x+fly.jitterX)<0 ){ fly.jitterX = 0-fly.jitterX }
+              fly.x = fly.x+fly.jitterX
+              if( (fly.y+fly.jitterY)>parent.height || (fly.y+fly.jitterY)<0 ){ fly.jitterY = 0-fly.jitterY }
+              fly.y = fly.y+fly.jitterY
+              fly.jitterX = (Math.round(Math.random())*2 - 1) *fly.jitterX
+              fly.jitterY = (Math.round(Math.random())*2 - 1) *fly.jitterY
+            fly.color = Qt.rgba(Math.random(),Math.random(),Math.random(),0.5)
+           
+         }
+     } //end of timer
+} //end of item
-- 
cgit 


From 526b11d189b41c94da315bb80de4c78e176f8471 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 13:30:56 -0400
Subject: Cleanup a lot of stale/unused files within the Lumina2 souce tree.

---
 .../extrafiles/audiofiles/LICENCE                  |   7 -----
 .../extrafiles/audiofiles/Login.ogg                | Bin 32111 -> 0 bytes
 .../extrafiles/audiofiles/Logout.ogg               | Bin 31255 -> 0 bytes
 .../extrafiles/audiofiles/low-battery.ogg          | Bin 49748 -> 0 bytes
 .../extrafiles/lumina-desktop.desktop              |  34 ---------------------
 .../wallpapers/Lumina_Wispy_blue-grey-zoom.jpg     | Bin 6269314 -> 0 bytes
 .../wallpapers/Lumina_Wispy_blue-grey.jpg          | Bin 6508360 -> 0 bytes
 .../extrafiles/wallpapers/Lumina_Wispy_gold.jpg    | Bin 2523711 -> 0 bytes
 .../extrafiles/wallpapers/Lumina_Wispy_green.jpg   | Bin 1286362 -> 0 bytes
 .../wallpapers/Lumina_Wispy_grey-blue-zoom.jpg     | Bin 563037 -> 0 bytes
 .../wallpapers/Lumina_Wispy_grey-blue.jpg          | Bin 361771 -> 0 bytes
 .../extrafiles/wallpapers/Lumina_Wispy_purple.jpg  | Bin 926969 -> 0 bytes
 .../extrafiles/wallpapers/Lumina_Wispy_red.jpg     | Bin 1141515 -> 0 bytes
 .../core/lumina-desktop-unified/lumina-desktop.pro |   3 ++
 14 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/LICENCE
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Login.ogg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Logout.ogg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/low-battery.ogg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/lumina-desktop.desktop
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_gold.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_green.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_purple.jpg
 delete mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_red.jpg

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/LICENCE b/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/LICENCE
deleted file mode 100644
index aa601d5e..00000000
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/LICENCE
+++ /dev/null
@@ -1,7 +0,0 @@
-These audio files are BSD-licensed and were created/owned by the TrueOS Project:
- -   Login.ogg
- -   Logout.ogg
-
-These audio files are freely available on jewelbeat.com:
-"Music by JewelBeat. Download your free music and free sound effects at www.jewelbeat.com."
- -  low-battery.ogg (http://www.jewelbeat.com/free/free-sound-effects/musical%20effects/Tympani_2.mp3 - converted to OGG afterward)
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Login.ogg b/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Login.ogg
deleted file mode 100644
index 43a07e27..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Login.ogg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Logout.ogg b/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Logout.ogg
deleted file mode 100644
index e63ae07f..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/Logout.ogg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/low-battery.ogg b/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/low-battery.ogg
deleted file mode 100644
index d129a2b3..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/audiofiles/low-battery.ogg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/lumina-desktop.desktop b/src-qt5/core/lumina-desktop-unified/extrafiles/lumina-desktop.desktop
deleted file mode 100644
index 7d87f93a..00000000
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/lumina-desktop.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Exec=start-lumina-desktop
-TryExec=start-lumina-desktop
-Icon=Lumina-DE
-Type=Application
-Name=Lumina
-Name[de]=Lumina
-Name[en_GB]=Lumina
-Name[en_ZA]=Lumina
-Name[et]=Lumina
-Name[fr]=Lumina
-Name[fr_CA]=Lumina
-Name[hi]=ल्यूमिना
-Name[ja]=Lumina
-Name[mt]=Lumina
-Name[pl]=Lumina
-Name[pt_BR]=Lumina
-Name[ru]=Lumina
-Name[uk]=Lumina
-Name[vi]=Lumina
-Comment=A Lightweight Desktop for FreeBSD
-Comment[de]=Eine leichtgewichtige Arbeitsplatzumgebung für FreeBSD
-Comment[en_GB]=A Lightweight Desktop for FreeBSD
-Comment[en_ZA]=A Lightweight Desktop for FreeBSD
-Comment[et]=Minimalistlik töölauakeskkond FreeBSD-le
-Comment[fr]=Un environnement bureau léger pour FreeBSD
-Comment[fr_CA]=Un environnement bureau léger pour FreeBSD
-Comment[hi]=एक हल्का डेस्कटॉप फ्री बी.एस.डी के लिए
-Comment[ja]=FreeBSD の為に作られた軽快なデスクトップ環境
-Comment[mt]=A Desktop irqiq għal FreeBSD
-Comment[pl]=Lekkie Środowisko graficzne dla FreeBSD
-Comment[pt_BR]=Um ambiente de trabalho leve para FreeBSD
-Comment[uk]=Легковісне оточення стільниці для FreeBSD
-Comment[vi]=Một máy tính để bàn nhẹ cho FreeBSD
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg
deleted file mode 100644
index 481ca438..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey.jpg
deleted file mode 100644
index 9da67596..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_blue-grey.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_gold.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_gold.jpg
deleted file mode 100644
index cba03cee..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_gold.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_green.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_green.jpg
deleted file mode 100644
index 80b0d3e3..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_green.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg
deleted file mode 100644
index 4f753ed5..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue.jpg
deleted file mode 100644
index c214cd78..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_grey-blue.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_purple.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_purple.jpg
deleted file mode 100644
index e4c3d7a8..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_purple.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_red.jpg b/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_red.jpg
deleted file mode 100644
index a092f636..00000000
Binary files a/src-qt5/core/lumina-desktop-unified/extrafiles/wallpapers/Lumina_Wispy_red.jpg and /dev/null differ
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index e8cf2f28..ba958401 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -54,6 +54,9 @@ desktop.files = lumina-desktop.desktop
 defaults.path = $${L_SHAREDIR}/lumina-desktop
 defaults.files = defaults/*
 
+extrafiles.path = $${L_SHAREDIR}/lumina-desktop
+extrafiles.files = extrafiles/*
+
 TRANSLATIONS =  i18n/lumina-desktop_af.ts \
                 i18n/lumina-desktop_ar.ts \
                 i18n/lumina-desktop_az.ts \
-- 
cgit 


From 7dd1ca13749571408725ac45e8d1e1d3bbf7c798 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 10 Oct 2017 15:29:13 -0400
Subject: Write up the new ScreenSaver plugins management class (untested) Also
 cleanup a bit more of the documentation for the new plugin system.

---
 .../extrafiles/screensavers/Fireflies.json                   |  2 +-
 .../lumina-desktop-unified/extrafiles/screensavers/README.md | 12 ++++++------
 src-qt5/core/lumina-desktop-unified/lumina-desktop.pro       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
index e01d6d2b..8d0d25c4 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
@@ -18,7 +18,7 @@
     "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
     "date_created" : "20171010",
     "version" : "1.0"
-  }
+  },
   "qml" : {
     "qml_file" : "qml_scripts/Fireflies.qml",
     "additional_files" : ["qml_scripts/Firefly.qml"]
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
index 768f0e14..d9093b44 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/README.md
@@ -13,22 +13,22 @@ Example JSON manifest file (sample.json):
 {
   "name" : {
     "default" : "sample",
-    "en_US" : "US English localization of the name"
+    "en_US" : "US English localization of the name",
     "en" : "Generic english localization of the name"
-  }
+  },
  
   "description" : {
     "default" : "sample screensaver",
     "en_US" : "US English Localization of the description"
-  }
+  },
 
   "author" : {
     "name" : "Me",
     "email" : "Me@myself.net",
     "website" : "http://mywebsite.net",
-    "company" : "iXsystems"
+    "company" : "iXsystems",
     "company_website" : "http://ixsystems.com"
-  }
+  },
 
   "meta" : {
     "license" : "3-clause BSD",
@@ -37,7 +37,7 @@ Example JSON manifest file (sample.json):
     "date_created" : "20171010",
     "date_updated" : "20171011",
     "version" : "1.0"
-  }
+  },
 
   "qml" : {
     "exec" : "absolute/or/relative/path/to/script.qml",
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index ba958401..9b0c2fb3 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -123,7 +123,7 @@ TRANSLATIONS =  i18n/lumina-desktop_af.ts \
 dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/
 dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/
 
-INSTALLS += target desktop defaults
+INSTALLS += target desktop defaults extrafiles
 
 WITH_I18N{
   INSTALLS += dotrans
-- 
cgit 


From dfac324cb6b02d19857f0e5dcced099d31ce957d Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 11 Oct 2017 10:34:53 -0400
Subject: Get the Lumina2 screensaver system converted over to the new
 QML-backed plugin system. Still need to clean up some old files within the
 source tree, but it all works right now.

---
 src-qt5/core/lumina-desktop-unified/LSession.cpp   |  4 +-
 .../extrafiles/screensavers/Fireflies.json         |  2 +-
 .../core/lumina-desktop-unified/global-includes.h  |  1 +
 .../core/lumina-desktop-unified/lumina-desktop.pro | 13 ++++-
 .../src-screensaver/SSBaseWidget.cpp               | 63 +++++++---------------
 .../src-screensaver/SSBaseWidget.h                 | 12 ++---
 6 files changed, 39 insertions(+), 56 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index d70ff973..bace2dbe 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -356,12 +356,12 @@ void LSession::launchStartupApps(){
 void LSession::checkUserFiles(){
   //internal version conversion examples:
   //  [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001]
-  QString OVS = DesktopSettings::instance()->value(DesktopSettings::System,"DesktopVersion","0").toString(); //Old Version String
+  /*QString OVS = DesktopSettings::instance()->value(DesktopSettings::System,"DesktopVersion","0").toString(); //Old Version String
   bool changed = LDesktopUtils::checkUserFiles(OVS);
   if(changed){
     //Save the current version of the session to the settings file (for next time)
     DesktopSettings::instance()->setValue(DesktopSettings::System,"DesktopVersion", this->applicationVersion());
-  }
+  }*/
 }
 
 
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
index 8d0d25c4..c09de308 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Fireflies.json
@@ -20,7 +20,7 @@
     "version" : "1.0"
   },
   "qml" : {
-    "qml_file" : "qml_scripts/Fireflies.qml",
+    "exec" : "qml_scripts/Fireflies.qml",
     "additional_files" : ["qml_scripts/Firefly.qml"]
   }
 }
diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h
index 184f5b8d..ba1beb06 100644
--- a/src-qt5/core/lumina-desktop-unified/global-includes.h
+++ b/src-qt5/core/lumina-desktop-unified/global-includes.h
@@ -53,6 +53,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QQuickView>
 
 
 // libLumina includes
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index 9b0c2fb3..6b9ee876 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -1,8 +1,15 @@
 include($${PWD}/../../OS-detect.pri)
 
-QT       += core gui network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia multimediawidgets concurrent svg
+lessThan(QT_MAJOR_VERSION, 5) {
+  message("[ERROR] Qt 5.4+ is required to use the Lumina Desktop!")
+  exit
+}
+lessThan(QT_MINOR_VERSION, 4){
+  message("[ERROR] Qt 5.4+ is required to use the Lumina Desktop!")
+  exit
+}
 
+QT *= core gui network widgets x11extras multimedia multimediawidgets concurrent svg quick qml
 
 
 TARGET = lumina-desktop-unified
@@ -22,6 +29,8 @@ include(../libLumina/NativeWindow.pri)
 include(../libLumina/XDGMime.pri)
 include(../libLumina/LIconCache.pri)
 
+include(../../src-cpp/plugins-screensaver.pri)
+
 #include  all the main individual source groups
 include(src-screensaver/screensaver.pri)
 include(src-events/events.pri)
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
index a6d5be60..227e51ac 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -12,10 +12,11 @@
 // ========
 //   PUBLIC
 // ========
-SSBaseWidget::SSBaseWidget(QWidget *parent) : QWidget(parent){
+SSBaseWidget::SSBaseWidget(QWidget *parent) : QQuickView(parent->windowHandle()){
   this->setObjectName("LuminaBaseSSWidget");
-  ANIM = 0;
-  this->setMouseTracking(true);
+  this->setResizeMode(QQuickView::SizeRootObjectToView);
+  this->setColor(QColor("black")); //default color for the view
+  //this->setMouseTracking(true);
   plugType="none";
   restartTimer = new QTimer(this);
     restartTimer->setInterval( DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "globals/plugin_time_seconds", 60).toInt() * 1000);
@@ -24,7 +25,6 @@ SSBaseWidget::SSBaseWidget(QWidget *parent) : QWidget(parent){
 }
 
 SSBaseWidget::~SSBaseWidget(){
-  if(ANIM!=0){ this->stopPainting(); }
 }
 
 void SSBaseWidget::setPlugin(QString plug){
@@ -35,54 +35,27 @@ void SSBaseWidget::setPlugin(QString plug){
 //  PUBLIC SLOTS
 // =============
 void SSBaseWidget::startPainting(){
-  cplug = plugType;
   //free up any old animation instance
-  if(ANIM!=0){
-    stopPainting();
-  }
+  stopPainting();
   //If a random plugin - grab one of the known plugins
-  if(cplug=="random"){
-    QStringList valid = BaseAnimGroup::KnownAnimations();
-    valid.removeAll("none"); //they want a screensaver - remove the "none" option from the valid list
-    if(valid.isEmpty()){ cplug = "none"; } //no known plugins
-    else{ cplug = valid[ qrand()%valid.length() ]; } //grab a random plugin
-  }
-  if(DEBUG){ qDebug() << " - Screen Saver:" << plugType << cplug; }
-  //Now list all the various plugins and start them appropriately
-  QString style;
-  if(cplug=="none"){
-    style = "background: black;"; //show the underlying black parent widget
-  }else{
-    style = "background: black;";
+  if(plugType=="random"){
+    QList<SSPlugin> valid = SSPluginSystem::findAllPlugins();
+    if(!valid.isEmpty()){ cplug = valid[ qrand()%valid.length() ]; } //grab a random plugin
+  }else if(plugType!="none"){
+    cplug = SSPluginSystem::findPlugin(plugType);
   }
-  this->setStyleSheet("QWidget#LuminaBaseSSWidget{ "+style+"}");
-  this->repaint();
-  //If not a stylesheet-based plugin - set it here
-  if(cplug!="none"){
-    ANIM = BaseAnimGroup::NewAnimation(cplug, this);
-    connect(ANIM, SIGNAL(finished()), this, SLOT(startPainting()) ); //repeat the plugin as needed
-    ANIM->LoadAnimations();
+  if(DEBUG){ qDebug() << " - Screen Saver:" << plugType << cplug.scriptURL() << cplug.isValid(); }
+  if(cplug.isValid()){
+    this->setSource( cplug.scriptURL() );
+    restartTimer->start();
   }
-  //Now start the animation(s)
-  if(ANIM!=0){
-    if(ANIM->animationCount()>0){
-      if(DEBUG){ qDebug() << " - Starting SS Plugin:" << cplug << ANIM->animationCount() << ANIM->duration() << ANIM->loopCount(); }
-      ANIM->start();
-    }
-  }
-  restartTimer->start();
+
 }
 
 void SSBaseWidget::stopPainting(){
-  if(ANIM!=0){
-    if(DEBUG){ qDebug() << "Stopping Animation!!"; }
-    ANIM->stop();
-    //ANIM->clear();
-    ANIM->deleteLater();
-    ANIM = 0;
-    //Delete any child widgets of the canvas
-    QList<QWidget*> widgets = this->findChildren<QWidget*>("",Qt::FindDirectChildrenOnly);
-    for(int i=0; i<widgets.length(); i++){ widgets[i]->deleteLater(); }
+  if(!this->source().isEmpty()){
+    this->setSource(QUrl());
+    cplug = SSPlugin(); //empty structure
   }
   if(restartTimer->isActive()){ restartTimer->stop(); }
 }
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
index af809127..fdb23e66 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
@@ -10,9 +10,9 @@
 #define _LUMINA_DESKTOP_SCREEN_SAVER_BASE_WIDGET_H
 
 #include "global-includes.h"
-#include "animations/BaseAnimGroup.h"
+#include <plugins-screensaver.h>
 
-class SSBaseWidget : public QWidget{
+class SSBaseWidget : public QQuickView{
 	Q_OBJECT
 public:
 	SSBaseWidget(QWidget *parent);
@@ -25,8 +25,8 @@ public slots:
 	void stopPainting();
 
 private:
-	QString plugType, cplug; //type of custom painting to do
-	BaseAnimGroup *ANIM;
+        QString plugType;
+        SSPlugin cplug;
 	QTimer *restartTimer;
 
 private slots:
@@ -43,12 +43,12 @@ protected:
 	  ev->accept();
 	  emit InputDetected();
 	}
-	void paintEvent(QPaintEvent*){
+	/*void paintEvent(QPaintEvent*){
 	  QStyleOption opt;
 	  opt.init(this);
 	  QPainter p(this);
 	  style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-	}
+	}*/
 
 };
 
-- 
cgit 


From a2bb82ae14f9f52c15e08880a559781d6f9e9ecb Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 11 Oct 2017 12:14:26 -0400
Subject: A bit more cleanup for the screensaver system. Now the old animations
 are completely ignored in the build, and the mouse cursor is hidden while the
 screensaver is active.

---
 .../core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp    | 6 +++---
 src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h  | 6 ------
 src-qt5/core/lumina-desktop-unified/src-screensaver/screensaver.pri | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
index 227e51ac..122307b3 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -16,10 +16,10 @@ SSBaseWidget::SSBaseWidget(QWidget *parent) : QQuickView(parent->windowHandle())
   this->setObjectName("LuminaBaseSSWidget");
   this->setResizeMode(QQuickView::SizeRootObjectToView);
   this->setColor(QColor("black")); //default color for the view
-  //this->setMouseTracking(true);
+  this->setCursor(Qt::BlankCursor);
   plugType="none";
   restartTimer = new QTimer(this);
-    restartTimer->setInterval( DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "globals/plugin_time_seconds", 60).toInt() * 1000);
+    restartTimer->setInterval( DesktopSettings::instance()->value(DesktopSettings::ScreenSaver, "globals/plugin_time_seconds", 120).toInt() * 1000);
     restartTimer->setSingleShot(true);
   connect(restartTimer, SIGNAL(timeout()), this, SLOT(startPainting()) );
 }
@@ -47,7 +47,7 @@ void SSBaseWidget::startPainting(){
   if(DEBUG){ qDebug() << " - Screen Saver:" << plugType << cplug.scriptURL() << cplug.isValid(); }
   if(cplug.isValid()){
     this->setSource( cplug.scriptURL() );
-    restartTimer->start();
+    if(plugType=="random"){ restartTimer->start(); }
   }
 
 }
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
index fdb23e66..72e02702 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
@@ -43,12 +43,6 @@ protected:
 	  ev->accept();
 	  emit InputDetected();
 	}
-	/*void paintEvent(QPaintEvent*){
-	  QStyleOption opt;
-	  opt.init(this);
-	  QPainter p(this);
-	  style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-	}*/
 
 };
 
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/screensaver.pri b/src-qt5/core/lumina-desktop-unified/src-screensaver/screensaver.pri
index f95891c1..92cc7bd2 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/screensaver.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/screensaver.pri
@@ -9,7 +9,7 @@ HEADERS *= $${PWD}/LLockScreen.h \
 FORMS *= $${PWD}/LLockScreen.ui
 
 #update the includepath so we can just (#include <LScreenSaver.h>) as needed without paths
-INCLUDEPATH *= ${PWD}
+INCLUDEPATH *= $${PWD}
 
 #Now include all the screensaver animations/options
-include(animations/animations.pri)
+#include(animations/animations.pri)
-- 
cgit 


From 2cedaf2c2ac9e4b4e3078c5a6f04ba5fc3f4f5b3 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 11 Oct 2017 14:46:54 -0400
Subject: Update lumina-checkpass with 2 additional options: 1. "-fd <file
 descriptor>" pass in a file descriptor (such as 0 for standard input) to read
 password 2. "-f <file path>" pass in a file path to read the password

Then update lumina-desktop-unified to use the "-f" version with a QTemporaryFile.
I was trying to get it to use the "-fd" version, but the file descriptor I am getting from the QTemporaryFile does not seem to work properly - still need to track this down a bit more later but the -f option works fine for now.
---
 src-qt5/core/lumina-desktop-unified/global-includes.h       |  1 +
 .../lumina-desktop-unified/src-screensaver/LLockScreen.cpp  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h
index ba1beb06..ae57ac08 100644
--- a/src-qt5/core/lumina-desktop-unified/global-includes.h
+++ b/src-qt5/core/lumina-desktop-unified/global-includes.h
@@ -19,6 +19,7 @@
 #include <QMouseEvent>
 #include <QAction>
 #include <QPoint>
+#include <QTemporaryFile>
 #include <QFile>
 #include <QDir>
 #include <QString>
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
index 0ff70142..b791ffd2 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
@@ -77,7 +77,18 @@ void LLockScreen::TryUnlock(){
   this->setEnabled(false);
   QString pass = ui->line_password->text();
     ui->line_password->clear();
-  bool ok = (LUtils::runCmd("lumina-checkpass", QStringList() << pass) == 0);
+  //Create a temporary file for the password, then pass that file descriptor to lumina-checkpass
+  QTemporaryFile *TF = new QTemporaryFile(".XXXXXXXXXX");
+  TF->setAutoRemove(true);
+  bool ok = false;
+  if( TF->open() ){
+    QTextStream in(TF);
+    in << pass;
+    in.flush(); //make sure we push it to the file **right now** since we need to keep the file open
+    ok = (LUtils::runCmd("lumina-checkpass", QStringList() << "-f" << TF->fileName() ) == 0);
+    TF->close();
+  }
+  delete TF;
   if(ok){
     emit ScreenUnlocked();
     this->setEnabled(true);
-- 
cgit 


From 0de3da7df93ab5791b62d2b3da0a4fc9abdd4e4d Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 12 Oct 2017 10:26:39 -0400
Subject: Add a new screensaver: Warp This is a starfield "warping" effect
 screensaver. Also turn off a bunch of debugging within the C++ screensaver
 plugin system

---
 .../extrafiles/screensavers/Warp.json              | 25 ++++++++++
 .../extrafiles/screensavers/qml_scripts/Warp.qml   | 57 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Warp.json
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Warp.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Warp.json
new file mode 100644
index 00000000..888df01f
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Warp.json
@@ -0,0 +1,25 @@
+{
+  "name" : {
+    "default" : "Warp"
+  },
+  "description" : {
+    "default" : "Warp trail through the stars"
+  },
+  "author" : {
+    "name" : "Ken Moore",
+    "email" : "ken@ixsystems.com",
+    "website" : "https://github.com/beanpole135",
+    "company" : "iXsystems",
+    "company_website" : "http://ixsystems.com"
+  },
+  "meta" : {
+    "license" : "3-clause BSD",
+    "license_url" : "https://github.com/trueos/lumina/blob/master/LICENSE",
+    "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
+    "date_created" : "20171012",
+    "version" : "1.0"
+  },
+  "qml" : {
+    "exec" : "qml_scripts/Warp.qml"
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
new file mode 100644
index 00000000..4ad4378f
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
@@ -0,0 +1,57 @@
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+
+Rectangle {
+  id : canvas
+  anchors.fill: parent
+  color: "black"
+  
+  // CREATE STARFIELD
+  Repeater {
+      model: Math.round(Math.random()*canvas.width/10)+500
+     Rectangle {
+       parent: canvas
+       x: Math.round(Math.random()*canvas.width)
+       y: Math.round(Math.random()*canvas.height)
+       width: Math.round(Math.random()*3)+3
+       height: width
+       radius: width/2
+       color: "white"
+     }
+  }  //end of Repeater
+
+  // NOW CREATE THE WARP EFFECT
+  ZoomBlur {
+    id: blur
+    anchors.fill: canvas
+    source: canvas
+    samples: 24
+    length: canvas.width / 20
+    horizontalOffset: 0
+    verticalOffset: 0
+
+    Behavior on horizontalOffset{
+      NumberAnimation{
+        duration: 3000
+      }
+    }
+    Behavior on verticalOffset{
+      NumberAnimation{
+        duration: 3000
+      }
+    }
+  } //end of zoom blur
+
+  Timer {
+        interval: 5
+         repeat: true
+         running: true
+         property bool starting: true
+         onTriggered: {
+              if(starting){ interval = 3010; starting = false; }
+              blur.horizontalOffset = (Math.random()*canvas.width/4) - (canvas.width/8)
+              blur.verticalOffset = (Math.random()*canvas.height/4) - (canvas.height/8)
+         }
+     } //end of timer
+
+} //end of canvas rectangle
-- 
cgit 


From 910fce821941ccf0671d5ec9508b6a5df4922277 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 12 Oct 2017 10:43:19 -0400
Subject: Add some color to the "Warp" starfield.

---
 .../extrafiles/screensavers/qml_scripts/Warp.qml              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
index 4ad4378f..08ae15a0 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
@@ -5,7 +5,13 @@ Rectangle {
   id : canvas
   anchors.fill: parent
   color: "black"
-  
+
+  function getStarColor(num){
+    if(num < 0.5) { return "white" }
+    if(num < 1.5) { return "mistyrose" }
+    return "lightblue"
+  }  
+
   // CREATE STARFIELD
   Repeater {
       model: Math.round(Math.random()*canvas.width/10)+500
@@ -16,7 +22,8 @@ Rectangle {
        width: Math.round(Math.random()*3)+3
        height: width
        radius: width/2
-       color: "white"
+       color: getStarColor( (index%3) )
+
      }
   }  //end of Repeater
 
-- 
cgit 


From 465ea1c7cb25bbc45c33be0e7bef5541540c5b20 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 12 Oct 2017 11:38:04 -0400
Subject: Tinker with the color divisions in "Warp" a bit - ensure more even
 distribution of colors

---
 .../extrafiles/screensavers/qml_scripts/Warp.qml                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
index 08ae15a0..1cf9bc37 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Warp.qml
@@ -7,8 +7,8 @@ Rectangle {
   color: "black"
 
   function getStarColor(num){
-    if(num < 0.5) { return "white" }
-    if(num < 1.5) { return "mistyrose" }
+    if(num < 1) { return "white" }
+    if(num < 2) { return "mistyrose" }
     return "lightblue"
   }  
 
-- 
cgit 


From d04f35ab9b827085d1cbee0bc2f7cae7787557ef Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Fri, 13 Oct 2017 16:25:18 -0400
Subject: Another checkpoint commit for Lumina 2 Almost have the QML-based
 desktop canvas working - still tracking down some QML syntax issues.

---
 src-qt5/core/lumina-desktop-unified/LSession.cpp   |  9 +++---
 .../core/lumina-desktop-unified/global-includes.h  |  9 ++++--
 .../core/lumina-desktop-unified/global-objects.h   |  4 +++
 .../core/lumina-desktop-unified/lumina-desktop.pro | 10 ++-----
 .../src-desktop/RootWindow.cpp                     | 33 ++++++++++++++++++++++
 .../src-desktop/RootWindow.h                       | 32 +++++++++++++++++++++
 .../lumina-desktop-unified/src-desktop/desktop.pri |  8 ++++--
 7 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index bace2dbe..cc754005 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -129,15 +129,15 @@ void LSession::setupSession(){
   QList<QScreen*> scrns= QApplication::screens();
   for(int i=0; i<scrns.length(); i++){
     qDebug() << "   --- Load Wallpaper for Screen:" << scrns[i]->name();
-    Lumina::ROOTWIN->ChangeWallpaper(scrns[i]->name(), RootWindow::Stretch, LOS::LuminaShare()+"desktop-background.jpg");
+    RootDesktopObject::instance()->ChangeWallpaper(scrns[i]->name(), LOS::LuminaShare()+"desktop-background.jpg");
   }
-  Lumina::ROOTWIN->start();
+  //Lumina::ROOTWIN->start();
   Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
   Lumina::NWS->setRoot_currentWorkspace(0);
   if(DEBUG){ qDebug() << " - Create Desktop Context Menu"; }
-  DesktopContextMenu *cmenu = new DesktopContextMenu(Lumina::ROOTWIN);
+  /*DesktopContextMenu *cmenu = new DesktopContextMenu(Lumina::ROOTWIN);
   connect(cmenu, SIGNAL(showLeaveDialog()), this, SLOT(StartLogout()) );
-  cmenu->start();
+  cmenu->start();*/
 
   //desktopFiles = QDir(QDir::homePath()+"/Desktop").entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs, QDir::Name | QDir::IgnoreCase | QDir::DirsFirst);
   //updateDesktops();
@@ -229,6 +229,7 @@ void LSession::setupGlobalConnections(){
   connect(Lumina::ROOTWIN, SIGNAL(RegisterVirtualRoot(WId)), Lumina::NWS, SLOT(RegisterVirtualRoot(WId)) );
   connect(Lumina::ROOTWIN, SIGNAL(RootResized(QRect)), Lumina::NWS, SLOT(setRoot_desktopGeometry(QRect)) );
   connect(Lumina::ROOTWIN, SIGNAL(MouseMoved()), Lumina::SS, SLOT(newInputEvent()) );
+  connect(Lumina::ROOTWIN, SIGNAL(startLogout()), this, SLOT(StartLogout()) );
 
   //Native Window Class connections
   connect(Lumina::NEF, SIGNAL(WindowCreated(WId)), Lumina::NWS, SLOT(NewWindowDetected(WId)));
diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h
index ae57ac08..91604362 100644
--- a/src-qt5/core/lumina-desktop-unified/global-includes.h
+++ b/src-qt5/core/lumina-desktop-unified/global-includes.h
@@ -55,7 +55,13 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QQuickView>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickImageProvider>
 
+// C++ Backend classes for QML interface
+#include <RootDesktopObject.h>
+#include <ScreenObject.h>
 
 // libLumina includes
 #include <LuminaX11.h>
@@ -66,7 +72,6 @@
 #include <LDesktopUtils.h>
 #include <LuminaSingleApplication.h>
 #include <DesktopSettings.h>
-#include <RootWindow.h>
 #include <ExternalProcess.h>
 #include <NativeWindow.h>
 #include <NativeWindowSystem.h>
@@ -74,8 +79,6 @@
 #include <XDGMime.h>
 #include <LIconCache.h>
 
-// Standard C includes
-#include <unistd.h>
 
 //Setup any global defines (no classes or global objects: use "global-objects.h" for that)
 
diff --git a/src-qt5/core/lumina-desktop-unified/global-objects.h b/src-qt5/core/lumina-desktop-unified/global-objects.h
index 0c990dc6..c204587f 100644
--- a/src-qt5/core/lumina-desktop-unified/global-objects.h
+++ b/src-qt5/core/lumina-desktop-unified/global-objects.h
@@ -25,8 +25,12 @@
 
 #include "src-screensaver/LScreenSaver.h"
 //#include "src-WM/LWindowManager.h"
+#include <RootWindow.h>
 #include "LSession.h"
 
+// Standard C includes
+#include <unistd.h>
+
 //Any special defines for settings/testing
 #define ANIMTIME 80 //animation time in milliseconds
 
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index 6b9ee876..21e46b22 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -16,18 +16,13 @@ TARGET = lumina-desktop-unified
 target.path = $${L_BINDIR}
 
 #include all the special classes from the Lumina tree
-include(../libLumina/ResizeMenu.pri)
 include(../libLumina/LDesktopUtils.pri) #includes LUtils and LOS
 include(../libLumina/LuminaXDG.pri)
-#include(../libLumina/LuminaX11.pri)
 include(../libLumina/LuminaSingleApplication.pri)
-include(../libLumina/LuminaThemes.pri)
 include(../libLumina/DesktopSettings.pri)
-include(../libLumina/RootWindow.pri)
 include(../libLumina/ExternalProcess.pri)
-include(../libLumina/NativeWindow.pri)
+include(../../src-cpp/NativeWindow.pri)
 include(../libLumina/XDGMime.pri)
-include(../libLumina/LIconCache.pri)
 
 include(../../src-cpp/plugins-screensaver.pri)
 
@@ -45,8 +40,7 @@ SOURCES += main.cpp \
 HEADERS  += global-includes.h \
 	global-objects.h \
 	LSession.h \
-	BootSplash.h \
-	JsonMenu.h
+	BootSplash.h
 
 FORMS    +=	BootSplash.ui 
 
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
new file mode 100644
index 00000000..c0710bbc
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
@@ -0,0 +1,33 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "RootWindow.h"
+
+RootWindow::RootWindow(){
+  root_win = QWindow::fromWinId( QX11Info::appRootWindow() ); //
+  root_view = new QQuickView(root_win); //make it a child of the root window
+  root_obj = RootDesktopObject::instance();
+  syncRootSize();
+  connect(root_win, SIGNAL(widthChanged(int)), this, SLOT(syncRootSize()) );
+  connect(root_win, SIGNAL(heightChanged(int)),this, SLOT(syncRootSize()) );
+  //Now setup the QQuickView
+  root_view->setResizeMode(QQuickView::SizeRootObjectToView);
+  root_view->engine()->rootContext()->setContextProperty("RootObject", root_obj);
+  root_view->setSource(QUrl("qrc:///qml/RootDesktop"));
+  root_view->show();
+}
+
+RootWindow::~RootWindow(){
+  root_view->deleteLater();
+  root_obj->deleteLater();
+}
+
+void RootWindow::syncRootSize(){
+  if(root_win->width() != root_view->width() || root_win->height() != root_view->height()){
+    root_view->setGeometry(0, 0, root_win->width(), root_win->height() );
+    emit RootResized(root_view->geometry());
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
new file mode 100644
index 00000000..1050ba21
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
@@ -0,0 +1,32 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#ifndef _LUMINA_DESKTOP_ROOT_WINDOW_H
+#define _LUMINA_DESKTOP_ROOT_WINDOW_H
+#include <global-includes.h>
+
+class RootWindow : public QObject{
+	Q_OBJECT
+private:
+	QWindow *root_win;
+	QQuickView *root_view;
+	RootDesktopObject *root_obj;
+
+public:
+	RootWindow();
+	~RootWindow();
+
+public slots:
+	void syncRootSize();
+
+signals:
+	void startLogout();
+	void RegisterVirtualRoot(WId);
+	void RootResized(QRect);
+	void MouseMoved();
+};
+
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index 75aef8a6..25aa02b7 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,6 +1,8 @@
-SOURCES *= $${PWD}/ContextMenu.cpp
+SOURCES *= $${PWD}/RootWindow.cpp
 
-HEADERS *= $${PWD}/ContextMenu.h
+HEADERS *= $${PWD}/RootWindow.h
 
 #update the includepath so we can just #include as needed without paths
-INCLUDEPATH *= ${PWD}
+INCLUDEPATH *= $${PWD}
+
+include(../../../src-cpp/Desktop.pri)
-- 
cgit 


From 7a3e9e46423d999d47e19b26e910c849028599de Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 18 Oct 2017 11:58:59 -0400
Subject: Another quick checkpoint for Lumina 2 files. Nothing too spectacular
 yet - still in the experimental stage for the QML usage.

---
 src-qt5/core/lumina-desktop-unified/LSession.cpp    | 12 ++++++------
 .../src-desktop/RootWindow.cpp                      | 21 ++++++++++++++++-----
 .../lumina-desktop-unified/src-desktop/RootWindow.h |  2 ++
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index cc754005..426b91b4 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -104,7 +104,7 @@ void LSession::setupSession(){
     splash.showScreen("user");
   if(DEBUG){ qDebug() << " - Init User Files:" << timer->elapsed();}
   //checkUserFiles(); //adds these files to the watcher as well
-
+  Lumina::ROOTWIN->start();
   //Initialize the internal variables
   //DESKTOPS.clear();
 
@@ -116,7 +116,6 @@ void LSession::setupSession(){
   if(DEBUG){ qDebug() << " - Populate App List:" << timer->elapsed();}
   Lumina::APPLIST->updateList();
   //appmenu = new AppMenu();
-
     splash.showScreen("menus");
   //if(DEBUG){ qDebug() << " - Init SettingsMenu:" << timer->elapsed();}
   //settingsmenu = new SettingsMenu();
@@ -129,12 +128,13 @@ void LSession::setupSession(){
   QList<QScreen*> scrns= QApplication::screens();
   for(int i=0; i<scrns.length(); i++){
     qDebug() << "   --- Load Wallpaper for Screen:" << scrns[i]->name();
-    RootDesktopObject::instance()->ChangeWallpaper(scrns[i]->name(), LOS::LuminaShare()+"desktop-background.jpg");
+    RootDesktopObject::instance()->ChangeWallpaper(scrns[i]->name(),QUrl::fromLocalFile(LOS::LuminaShare()+"desktop-background.jpg").toString() );
   }
-  //Lumina::ROOTWIN->start();
   Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
   Lumina::NWS->setRoot_currentWorkspace(0);
+
   if(DEBUG){ qDebug() << " - Create Desktop Context Menu"; }
+
   /*DesktopContextMenu *cmenu = new DesktopContextMenu(Lumina::ROOTWIN);
   connect(cmenu, SIGNAL(showLeaveDialog()), this, SLOT(StartLogout()) );
   cmenu->start();*/
@@ -228,8 +228,8 @@ void LSession::setupGlobalConnections(){
   //Root window connections
   connect(Lumina::ROOTWIN, SIGNAL(RegisterVirtualRoot(WId)), Lumina::NWS, SLOT(RegisterVirtualRoot(WId)) );
   connect(Lumina::ROOTWIN, SIGNAL(RootResized(QRect)), Lumina::NWS, SLOT(setRoot_desktopGeometry(QRect)) );
-  connect(Lumina::ROOTWIN, SIGNAL(MouseMoved()), Lumina::SS, SLOT(newInputEvent()) );
-  connect(Lumina::ROOTWIN, SIGNAL(startLogout()), this, SLOT(StartLogout()) );
+  connect(RootDesktopObject::instance(), SIGNAL(mouseMoved()), Lumina::SS, SLOT(newInputEvent()) );
+  connect(RootDesktopObject::instance(), SIGNAL(startLogout()), this, SLOT(StartLogout()) );
 
   //Native Window Class connections
   connect(Lumina::NEF, SIGNAL(WindowCreated(WId)), Lumina::NWS, SLOT(NewWindowDetected(WId)));
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
index c0710bbc..2aac6f3e 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
@@ -6,7 +6,7 @@
 //===========================================
 #include "RootWindow.h"
 
-RootWindow::RootWindow(){
+RootWindow::RootWindow() : QObject(){
   root_win = QWindow::fromWinId( QX11Info::appRootWindow() ); //
   root_view = new QQuickView(root_win); //make it a child of the root window
   root_obj = RootDesktopObject::instance();
@@ -16,8 +16,7 @@ RootWindow::RootWindow(){
   //Now setup the QQuickView
   root_view->setResizeMode(QQuickView::SizeRootObjectToView);
   root_view->engine()->rootContext()->setContextProperty("RootObject", root_obj);
-  root_view->setSource(QUrl("qrc:///qml/RootDesktop"));
-  root_view->show();
+  RootDesktopObject::RegisterType(); //make sure object classes are registered with the QML subsystems
 }
 
 RootWindow::~RootWindow(){
@@ -25,9 +24,21 @@ RootWindow::~RootWindow(){
   root_obj->deleteLater();
 }
 
+void RootWindow::start(){
+  root_view->setSource(QUrl("qrc:///qml/RootDesktop"));
+  root_win->show();
+  root_view->show();
+}
+
 void RootWindow::syncRootSize(){
-  if(root_win->width() != root_view->width() || root_win->height() != root_view->height()){
-    root_view->setGeometry(0, 0, root_win->width(), root_win->height() );
+  //qDebug() << "Sync Root Size:" << root_win->width() << root_win->height() << root_view->geometry();
+  QList<QScreen*> screens = QApplication::screens();
+  QRect unif;
+  for(int i=0; i<screens.length(); i++){ unif = unif.united(screens[i]->geometry()); }
+  if(unif.width() != root_view->width() || unif.height() != root_view->height()){
+    root_view->setGeometry(0, 0, unif.width(), unif.height() );
     emit RootResized(root_view->geometry());
   }
+  root_obj->updateScreens();
+  //qDebug() << " - after:" << root_view->geometry();
 }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
index 1050ba21..ba489465 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
@@ -19,6 +19,8 @@ public:
 	RootWindow();
 	~RootWindow();
 
+	void start();
+
 public slots:
 	void syncRootSize();
 
-- 
cgit 


From 50cda0d1b7c6061cccb89389f44f9173026a678b Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 25 Oct 2017 12:11:53 -0400
Subject: Re-arrange the 2.0 desktop sources (QML + associated C++ files). Also
 another checkpoint commit with some of the QML desktop stuff (have a working
 context menu, wallpapers not working yet though)

---
 src-qt5/core/lumina-desktop-unified/LSession.cpp   |  1 +
 .../src-desktop/RootWindow.cpp                     |  2 +-
 .../lumina-desktop-unified/src-desktop/desktop.pri |  5 +-
 .../src-desktop/src-cpp/RootDesktopObject.cpp      | 77 ++++++++++++++++++++++
 .../src-desktop/src-cpp/RootDesktopObject.h        | 54 +++++++++++++++
 .../src-desktop/src-cpp/ScreenObject.cpp           | 31 +++++++++
 .../src-desktop/src-cpp/ScreenObject.h             | 48 ++++++++++++++
 .../src-desktop/src-cpp/src-cpp.pri                |  8 +++
 .../src-desktop/src-qml/ContextMenu.qml            | 36 ++++++++++
 .../src-desktop/src-qml/RootDesktop.qml            | 57 ++++++++++++++++
 .../src-desktop/src-qml/WallpaperImage.qml         | 25 +++++++
 .../src-desktop/src-qml/src-qml.pri                |  7 ++
 .../src-desktop/src-qml/src-qml.qrc                |  7 ++
 13 files changed, 356 insertions(+), 2 deletions(-)
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
 create mode 100644 src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index 426b91b4..e1251c01 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -230,6 +230,7 @@ void LSession::setupGlobalConnections(){
   connect(Lumina::ROOTWIN, SIGNAL(RootResized(QRect)), Lumina::NWS, SLOT(setRoot_desktopGeometry(QRect)) );
   connect(RootDesktopObject::instance(), SIGNAL(mouseMoved()), Lumina::SS, SLOT(newInputEvent()) );
   connect(RootDesktopObject::instance(), SIGNAL(startLogout()), this, SLOT(StartLogout()) );
+  connect(RootDesktopObject::instance(), SIGNAL(lockScreen()), Lumina::SS, SLOT(LockScreenNow()) );
 
   //Native Window Class connections
   connect(Lumina::NEF, SIGNAL(WindowCreated(WId)), Lumina::NWS, SLOT(NewWindowDetected(WId)));
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
index 2aac6f3e..0cfa4e6b 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.cpp
@@ -25,7 +25,7 @@ RootWindow::~RootWindow(){
 }
 
 void RootWindow::start(){
-  root_view->setSource(QUrl("qrc:///qml/RootDesktop"));
+  root_view->setSource(QUrl("qrc:///qml/RootDesktop.qml"));
   root_win->show();
   root_view->show();
 }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index 25aa02b7..e4c4faeb 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,3 +1,5 @@
+QT *= gui widgets qml quick
+
 SOURCES *= $${PWD}/RootWindow.cpp
 
 HEADERS *= $${PWD}/RootWindow.h
@@ -5,4 +7,5 @@ HEADERS *= $${PWD}/RootWindow.h
 #update the includepath so we can just #include as needed without paths
 INCLUDEPATH *= $${PWD}
 
-include(../../../src-cpp/Desktop.pri)
+include($${PWD}/src-cpp/src-cpp.pri)
+include($${PWD}/src-qml/src-qml.pri)
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
new file mode 100644
index 00000000..9842712e
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
@@ -0,0 +1,77 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "RootDesktopObject.h"
+#include <QQmlEngine>
+#include <QApplication>
+#include <QScreen>
+
+#include <QDebug>
+
+// === PUBLIC ===
+RootDesktopObject::RootDesktopObject(QObject *parent) : QObject(parent){
+  updateScreens(); //make sure the internal list is updated right away
+}
+
+RootDesktopObject::~RootDesktopObject(){
+
+}
+
+void RootDesktopObject::RegisterType(){
+  qmlRegisterType<RootDesktopObject>("Lumina.Backend.RootDesktopObject", 2, 0, "RootDesktopObject");
+  //Also register any types that are needed by this class
+  ScreenObject::RegisterType();
+}
+
+RootDesktopObject* RootDesktopObject::instance(){
+  static RootDesktopObject* r_obj = new RootDesktopObject();
+  return r_obj;
+}
+
+//QML Read Functions
+QList<ScreenObject*> RootDesktopObject::screens(){
+  return s_objects;
+}
+
+void RootDesktopObject::logout(){
+  emit startLogout();
+}
+
+void RootDesktopObject::lockscreen(){
+  emit lockScreen();
+}
+
+void RootDesktopObject::mousePositionChanged(){
+  emit mouseMoved();
+}
+
+// === PUBLIC SLOTS ===
+void RootDesktopObject::updateScreens(){
+  QList<QScreen*> scrns = QApplication::screens();
+  QList<ScreenObject*> tmp; //copy of the internal array initially
+  for(int i=0; i<scrns.length(); i++){
+    bool found = false;
+    for(int j=0; j<s_objects.length() && !found; j++){
+      if(s_objects[j]->name()==scrns[i]->name()){ found = true; tmp << s_objects.takeAt(j); }
+    }
+    if(!found){ tmp << new ScreenObject(scrns[i], this); }
+  }
+  //Delete any leftover objects
+  for(int i=0; i<s_objects.length(); i++){ s_objects[i]->deleteLater(); }
+  s_objects = tmp;
+  emit screensChanged();
+  for(int i=0; i<s_objects.length(); i++){
+    s_objects[i]->emit geomChanged();
+  }
+}
+
+void RootDesktopObject::ChangeWallpaper(QString screen, QString value){
+  for(int i=0; i<s_objects.length(); i++){
+    if(s_objects[i]->name()==screen){ s_objects[i]->setBackground(value); break; }
+  }
+}
+
+// === PRIVATE ===
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
new file mode 100644
index 00000000..dd7c7ab3
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
@@ -0,0 +1,54 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This is the base C++ object that is used to pass information to the QML "RootDesktop" object
+//===========================================
+#ifndef _LUMINA_DESKTOP_QML_BACKEND_ROOT_DESKTOP_OBJECT_H
+#define _LUMINA_DESKTOP_QML_BACKEND_ROOT_DESKTOP_OBJECT_H
+#include <QObject>
+#include <QList>
+
+#include "ScreenObject.h"
+
+class RootDesktopObject : public QObject{
+	Q_OBJECT
+	//Define all the QML Properties here (interface between QML and the C++ methods below)
+	Q_PROPERTY( QList<ScreenObject*> screens READ screens NOTIFY screensChanged)
+
+public:
+	//main contructor/destructor
+	RootDesktopObject(QObject *parent = 0);
+	~RootDesktopObject();
+
+	static void RegisterType();
+
+	//primary interface to fetch the current instance of the class (so only one is running at any given time)
+	static RootDesktopObject* instance();
+
+	//QML Read Functions
+	QList<ScreenObject*> screens();
+
+	//QML Access Functions
+	Q_INVOKABLE void logout();
+	Q_INVOKABLE void lockscreen();
+	Q_INVOKABLE void mousePositionChanged();
+private:
+	QList<ScreenObject*> s_objects;
+
+public slots:
+	void updateScreens(); //rescan/update screen objects
+	void ChangeWallpaper(QString screen, QString);
+
+private slots:
+
+signals:
+	void screensChanged();
+	void startLogout();
+	void mouseMoved();
+	void lockScreen();
+
+};
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
new file mode 100644
index 00000000..4c1d6189
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
@@ -0,0 +1,31 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "ScreenObject.h"
+#include <QQmlEngine>
+#include <QDebug>
+
+ScreenObject::ScreenObject(QScreen *scrn, QObject *parent) : QObject(parent){
+  bg_screen = scrn;
+}
+
+void ScreenObject::RegisterType(){
+  qmlRegisterType<ScreenObject>("Lumina.Backend.ScreenObject",2,0, "ScreenObject");
+}
+
+QString ScreenObject::name(){ return bg_screen->name(); }
+QString ScreenObject::background(){ qDebug() << "Got Background:" << bg_screen->name() << bg << bg_screen->geometry(); return bg; }
+int ScreenObject::x(){ return bg_screen->geometry().x(); }
+int ScreenObject::y(){ return bg_screen->geometry().y(); }
+int ScreenObject::width(){ return bg_screen->geometry().width(); }
+int ScreenObject::height(){ return bg_screen->geometry().height(); }
+
+void ScreenObject::setBackground(QString fileOrColor){
+  if(bg!=fileOrColor){
+    bg = fileOrColor;
+    emit backgroundChanged();
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
new file mode 100644
index 00000000..8076f1ae
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
@@ -0,0 +1,48 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This is the base C++ object that is used to pass Screen/Wallpaper info to the QML classes
+//===========================================
+#ifndef _LUMINA_DESKTOP_SCREEN_DESKTOP_OBJECT_H
+#define _LUMINA_DESKTOP_SCREEN_DESKTOP_OBJECT_H
+#include <QObject>
+#include <QString>
+#include <QScreen>
+
+class ScreenObject : public QObject {
+	Q_OBJECT
+	Q_PROPERTY( QString name READ name )
+	Q_PROPERTY( QString background READ background NOTIFY backgroundChanged)
+	Q_PROPERTY( int x READ x NOTIFY geomChanged)
+	Q_PROPERTY( int y READ y NOTIFY geomChanged)
+	Q_PROPERTY( int width READ width NOTIFY geomChanged)
+	Q_PROPERTY( int height READ height NOTIFY geomChanged)
+
+private:
+	QScreen *bg_screen;
+	QString bg;
+
+public:
+	ScreenObject(QScreen *scrn = 0, QObject *parent = 0);
+
+	static void RegisterType();
+
+	Q_INVOKABLE QString name();
+	Q_INVOKABLE QString background();
+	Q_INVOKABLE int x();
+	Q_INVOKABLE int y();
+	Q_INVOKABLE int width();
+	Q_INVOKABLE int height();
+
+public slots:
+	void setBackground(QString fileOrColor);
+
+signals:
+	void backgroundChanged();
+	void geomChanged();
+};
+
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
new file mode 100644
index 00000000..33b699da
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
@@ -0,0 +1,8 @@
+SOURCES *= $${PWD}/RootDesktopObject.cpp \
+		$${PWD}/ScreenObject.cpp
+
+HEADERS *= $${PWD}/RootDesktopObject.h \
+		$${PWD}/ScreenObject.h
+
+INCLUDEPATH *= $${PWD}
+
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml
new file mode 100644
index 00000000..e5bac0b5
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml
@@ -0,0 +1,36 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+import QtQuick 2.2
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.0
+
+import Lumina.Backend.RootDesktopObject 2.0
+
+Menu { 
+    id: contextMenu
+    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+    MenuItem {
+      text: "Lock Screen"
+      onTriggered: {
+        RootObject.lockscreen()
+      }
+    }
+
+    MenuItem {
+      text: "Logout"
+      //iconName: "system-log-out"
+      indicator: Image{
+        asynchronous: true
+        //autoTransform: true
+        //source: "image://theme/system-logout"
+        source: "file:///usr/local/share/icons/material-design-light/scalable/actions/system-log-out.svg"
+      }
+      onTriggered: {
+        RootObject.logout()
+      }
+    }
+  }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
new file mode 100644
index 00000000..a1a9164f
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
@@ -0,0 +1,57 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This is the base QML script the launches/controls the desktop interface itself
+//===========================================
+// NOTE: This needs to be paired/used with the corresponding C++ class: RootDesktopObject
+//  Which should be added as the "RootObject" context property to the QML engine
+//------------------
+//  Example Code:
+//  RootDesktopObject *rootobj = new RootDesktopObject();
+//  QQuickView *root = new QQuickView();
+//    root->setResizeMode(QQuickView::SizeRootObjectToView);
+//    root->engine()->rootContext()->setContextProperty("RootObject", rootobj);
+//===========================================
+import QtQuick 2.2
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.0
+
+import "." as QML
+
+import Lumina.Backend.RootDesktopObject 2.0
+import Lumina.Backend.ScreenObject 2.0
+
+Rectangle {
+  id: rootCanvas
+  color: "black"
+
+  //Setup the right-click context menu
+  MouseArea { 
+    anchors.fill: rootCanvas
+    acceptedButtons: Qt.RightButton
+    onClicked: { 
+      contextMenu.x = mouseX
+      contextMenu.y = mouseY
+      contextMenu.open() 
+    }
+    onPositionChanged: {
+      RootObject.mousePositionChanged()
+    }
+  }
+
+  //Create the context menu itself
+  QML.ContextMenu { id: contextMenu }
+
+  //Setup the wallpapers
+  Repeater{
+    model: RootObject.screens
+    QML.WallpaperImage{
+      //console.log( modelData.name() )
+      object: modelData
+      z: 0+index
+    }
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml
new file mode 100644
index 00000000..4d39b0b8
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml
@@ -0,0 +1,25 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+import QtQuick 2.2
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.0
+
+import Lumina.Backend.ScreenObject 2.0
+
+AnimatedImage {
+    //C++ backend object
+    property ScreenObject object
+
+    //Normal geometries/placements
+    asynchronous: true
+    clip: true
+    source: object.background
+    x: object.x
+    y: object.y
+    width: object.width
+    height: object.height
+  }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
new file mode 100644
index 00000000..99905253
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
@@ -0,0 +1,7 @@
+#Show the QML files to lupdate for translation purposes - not for the actual build
+lupdate_only{
+  SOURCES *= $${PWD}/RootDesktop.qml \
+		$${PWD}/ContextMenu.qml
+}
+
+RESOURCES *= $${PWD}/src-qml.qrc
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc
new file mode 100644
index 00000000..ebdcc606
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc
@@ -0,0 +1,7 @@
+<RCC>
+  <qresource prefix="qml">
+    <file>RootDesktop.qml</file>
+    <file>ContextMenu.qml</file>
+    <file>WallpaperImage.qml</file>
+  </qresource>
+</RCC>
-- 
cgit 


From 5b5e79737f38b7eee6ced0cd08d7cdd437c0e708 Mon Sep 17 00:00:00 2001
From: ZackaryWelch <welch.zackary@gmail.com>
Date: Wed, 25 Oct 2017 19:01:17 -0400
Subject: Added the QML Video screensaver

---
 .../extrafiles/screensavers/Video.json             | 25 +++++++++++
 .../extrafiles/screensavers/qml_scripts/Video.qml  | 50 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Video.json
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Video.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Video.json
new file mode 100644
index 00000000..2fa6e6da
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Video.json
@@ -0,0 +1,25 @@
+{
+  "name" : {
+    "default" : "Video"
+  },
+  "description" : {
+    "default" : "Play a single video or a list of videos in a loop"
+  },
+  "author" : {
+    "name" : "Zackary Welch",
+    "email" : "zwelch@ixsystems.com",
+    "website" : "https://github.com/ZackaryWelch",
+    "company" : "iXsystems",
+    "company_website" : "http://ixsystems.com"
+  },
+  "meta" : {
+    "license" : "3-clause BSD",
+    "license_url" : "https://github.com/trueos/lumina/blob/master/LICENSE",
+    "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
+    "date_created" : "20171025",
+    "version" : "1.0"
+  },
+  "qml" : {
+    "exec" : "qml_scripts/Video.qml"
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml
new file mode 100644
index 00000000..e7d0626d
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml
@@ -0,0 +1,50 @@
+import QtQuick 2.0
+import QtMultimedia 5.7
+import QtQuick.Window 2.2
+import Qt.labs.folderlistmodel 2.1
+
+Rectangle {
+  //width: Screen.width
+  //height: Screen.height
+  width: 800
+  height: 600
+  color: "black"
+
+  FolderListModel {
+    id: folderModel 
+    folder: "/usr/local/videos"
+  } 
+
+  Repeater {
+    model: folderModel
+    Component {
+      Item { 
+        Component.onCompleted: { playlist.addItem(fileURL) }
+      }
+    }
+  }
+
+  Playlist {
+    id: playlist
+    playbackMode: Playlist.Random
+    PlaylistItem { source: "/" }
+    onError: { console.log("ERROR") }
+  }
+
+  MediaPlayer {
+    id: player
+    autoPlay: true
+    playlist: playlist
+  }
+
+  VideoOutput {
+    id: videoOutput
+    source: player
+    anchors.fill: parent
+  }
+  
+  Component.onCompleted: {
+    playlist.shuffle()
+    console.log(playlist.itemCount)
+  }
+}
-- 
cgit 


From a821ac6d6bd60dbbfffd7661ecbaa2d9e4c26338 Mon Sep 17 00:00:00 2001
From: ZackaryWelch <welch.zackary@gmail.com>
Date: Wed, 25 Oct 2017 20:18:13 -0400
Subject: Started incorporating the Grav screensaver to QML

---
 .../extrafiles/screensavers/qml_scripts/Grav.qml   | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
new file mode 100644
index 00000000..d5245c9b
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
@@ -0,0 +1,106 @@
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
+
+Rectangle {
+  id : canvas
+  anchors.fill: parent
+  width: 800
+  height: 600
+  color: "black"
+
+  //Between 5 and 15 planets, read from settings
+  property var planets: Math.round(( Math.random() * 10 ) + 5 )
+
+  //Create planets
+  Repeater {
+     model: planets
+
+     Rectangle {
+       id : index
+       parent: canvas
+
+       //Place the planet randomly on the canvas, but not too close to the edge
+       x: Math.round(Math.random()*canvas.width)
+
+       //Check to make sure the planets are not too close to the sun (outside a 50px radius)
+       //while( Math.round(Math.random()*canvas.width) < (width/2 + 50) or Math.round(Math.random()*canvas.width) > (width/2 - 50))
+
+       y: Math.round(Math.random()*canvas.height)
+
+
+       //Create the orbit animation
+
+       //Planet size between 14 and 32 pixels
+       width: Math.round(1.75 * (((Math.random() * 10) + 8 )))
+       height: width
+
+       //Make each rectangle look circular
+       radius: width / 2
+
+       //Give each planet a random color, semi-transparent
+       color: Qt.rgba(Math.random(), Math.random(), Math.random(), 0.5)
+     }
+  }
+
+  //Create the star
+  Rectangle{
+    id: star
+    parent: canvas
+
+    //Centers in star in the center of the canvas 
+    x: Math.round(canvas.width / 2)
+    y: Math.round(canvas.height / 2)
+
+    width: 60 
+    height: width 
+
+    //Create the wobble animation
+    SequentialAnimation on height {
+      loops: Animation.Infinite
+      PropertyAnimation { duration: 2000; to: 90 }
+      PropertyAnimation { duration: 2000; to: 60 }
+    }
+
+    SequentialAnimation on width {
+      loops: Animation.Infinite
+      PropertyAnimation { duration: 2000; to: 90 }
+      PropertyAnimation { duration: 2000; to: 60 }
+    }
+
+    //border.width: 4
+    //border.color: "blue"
+    color: "black"
+    radius: width / 2
+
+    //Creates a radial gradient to make the star look cool
+    RadialGradient {
+      anchors.fill: parent
+      gradient: Gradient { 
+        GradientStop { position:0    ;color: Qt.rgba(0,0,0,0)}
+        GradientStop { position:0.18 ;color: Qt.rgba(0,0,0,0)}
+        GradientStop { position:0.2  ;color: Qt.rgba(0.32,0.47,0.30,0.13)}
+        GradientStop { position:0.3  ;color: Qt.rgba(0.62,0.92,0.58,0.25)}
+        GradientStop { position:0.4  ;color: Qt.rgba(1.00,0.93,0.59,0.51)}
+        GradientStop { position:0.5  ;color: Qt.rgba(0,0,0,0)}
+      }
+    } 
+
+  }
+
+  /*Motion timer
+  Timer {
+    interval: 1
+    repeat: true
+    running: true
+    property bool starting: true
+
+    onTriggered: {
+      if(starting) { interval = 3010; starting = false; }
+
+    }
+  }*/
+  
+  Component.onCompleted: {
+    //console.log(Math.random())
+  } 
+}
-- 
cgit 


From aae93096bccb55ab9e60621f559e5116b9403a5f Mon Sep 17 00:00:00 2001
From: ZackaryWelch <welch.zackary@gmail.com>
Date: Wed, 8 Nov 2017 19:27:45 -0500
Subject: Finished Grav screensaver in QML

---
 .../extrafiles/screensavers/qml_scripts/Grav.qml   | 117 ++++++++++++---------
 1 file changed, 67 insertions(+), 50 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified')

diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
index d5245c9b..7a3c33cd 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
@@ -8,38 +8,74 @@ Rectangle {
   height: 600
   color: "black"
 
+  //TODO Add orbital trails option
+
   //Between 5 and 15 planets, read from settings
-  property var planets: Math.round(( Math.random() * 10 ) + 5 )
+  property int planets: Math.round(( Math.random() * 10 ) + 5 )
+  property int cx: Math.round(width/2)
+  property int cy: Math.round(height/2)
 
   //Create planets
   Repeater {
-     model: planets
-
-     Rectangle {
-       id : index
-       parent: canvas
-
-       //Place the planet randomly on the canvas, but not too close to the edge
-       x: Math.round(Math.random()*canvas.width)
-
-       //Check to make sure the planets are not too close to the sun (outside a 50px radius)
-       //while( Math.round(Math.random()*canvas.width) < (width/2 + 50) or Math.round(Math.random()*canvas.width) > (width/2 - 50))
-
-       y: Math.round(Math.random()*canvas.height)
-
-
-       //Create the orbit animation
-
-       //Planet size between 14 and 32 pixels
-       width: Math.round(1.75 * (((Math.random() * 10) + 8 )))
-       height: width
-
-       //Make each rectangle look circular
-       radius: width / 2
-
-       //Give each planet a random color, semi-transparent
-       color: Qt.rgba(Math.random(), Math.random(), Math.random(), 0.5)
-     }
+    id: planetRepeater
+    model: planets
+
+    Rectangle {
+      id : index
+      parent: canvas
+
+      //Creates random distance for elipse
+      property double c: Math.random() * 250
+      property double b: Math.random() * 150 + c
+      property double a: Math.sqrt(b*b+c*c)
+      //Random angle of rotation
+      property double th: Math.random() * Math.PI 
+
+      //Calculates starting position
+      x: Math.round(cx + a * Math.cos(th))
+      y: Math.round(cy + b * Math.sin(th))
+
+      //Planet size between 14 and 32 pixels
+      width: Math.round(1.75 * (((Math.random() * 10) + 8 )))
+      height: width
+
+      //Make each rectangle look circular
+      radius: width / 2
+
+      //Give each planet a random color, semi-transparent
+      color: Qt.rgba(Math.random(), Math.random(), Math.random(), 0.5)
+
+      Timer {
+        //Each planet updates between 1ms and 51ms (smaller times=faster)
+        interval: Math.round(Math.random() * 50 ) + 1
+        repeat: true
+        running: true
+        property bool starting: true
+        property int time: 0
+
+        onTriggered: {
+          //Move a planet 80 pixels away from the sun if the planet is too close
+          if(starting) {
+            if(x > cx && Math.abs(cx-x) < 80) {
+              x+=80
+            }else if(x < cx && Math.abs(cx-x) < 80) {
+              x-=80
+            }
+
+            if(y > cy && Math.abs(cy-y) < 80) {
+              y+=80
+            }else if(y < cy && Math.abs(cy-y) < 80) {
+              y-=80
+            }
+            starting = false;
+          }
+          //Parametric equation that calculates the position of the general ellipse. Completes a loop ever 314 cycles. Credit to 
+          x = cx+a*Math.cos(2*Math.PI*(time/314.0))*Math.cos(th) - b*Math.sin(2*Math.PI*(time/314.0))*Math.sin(th)
+          y = cy+a*Math.cos(2*Math.PI*(time/314.0))*Math.sin(th) + b*Math.sin(2*Math.PI*(time/314.0))*Math.cos(th)
+          time++;
+        }
+      }
+    }
   }
 
   //Create the star
@@ -47,9 +83,9 @@ Rectangle {
     id: star
     parent: canvas
 
-    //Centers in star in the center of the canvas 
-    x: Math.round(canvas.width / 2)
-    y: Math.round(canvas.height / 2)
+    //Centers in star in the center of the canvas, with an offset to center the animation
+    x: cx - 30
+    y: cy - 30
 
     width: 60 
     height: width 
@@ -67,8 +103,6 @@ Rectangle {
       PropertyAnimation { duration: 2000; to: 60 }
     }
 
-    //border.width: 4
-    //border.color: "blue"
     color: "black"
     radius: width / 2
 
@@ -86,21 +120,4 @@ Rectangle {
     } 
 
   }
-
-  /*Motion timer
-  Timer {
-    interval: 1
-    repeat: true
-    running: true
-    property bool starting: true
-
-    onTriggered: {
-      if(starting) { interval = 3010; starting = false; }
-
-    }
-  }*/
-  
-  Component.onCompleted: {
-    //console.log(Math.random())
-  } 
 }
-- 
cgit