Merge branch 'dev'

live-keys · Jul 1, 2021 · a2711f9 · a2711f9
2 parents fec3186 + d0710bd
commit a2711f9
Show file tree

Hide file tree

Showing 409 changed files with 9,412 additions and 6,829 deletions.
diff --git a/.github/workflows/.build_livekeys.yml b/.github/workflows/.build_livekeys.yml
@@ -48,6 +48,7 @@ jobs:
       - name: Download dependencies Linux
         if: runner.os == 'Linux'
         run: |
+          sudo apt-get update
           sudo apt-get install -y gcc-7 g++-7 build-essential cmake cmake-data libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
           sudo apt-get install -y python-dev python-numpy python3 python3-pip libtbb2 libtbb-dev libjpeg-dev libpng-dev libdc1394-22-dev libgl1-mesa-dev unzip
           sudo apt-get install -y libtiff5 libtiff5-dev python3-setuptools doxygen libssl1.0-dev nodejs-dev npm
@@ -98,12 +99,12 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.8
 
       - name: Setup Qt MacOS
         if: runner.os == 'macOS'
         run: |
-          pip3 install aqtinstall
+          pip3 install aqtinstall==1.1.4
           aqt install 5.14.2 --outputdir /opt/qt mac desktop clang_64 -m qtwebengine qtquick3d
           aqt doc 5.14.2 --outputdir /opt/qt mac desktop -m qtwebengine
           export QTDIR=/opt/qt/5.14.2/clang_64
@@ -112,7 +113,7 @@ jobs:
       - name: Setup Qt Linux
         if: runner.os == 'Linux'
         run: |
-          pip3 install aqtinstall
+          pip3 install aqtinstall==1.1.4
           echo "Installed aqtinstall"
           aqt install 5.14.2 --outputdir /opt/qt linux desktop gcc_64 -m qtwebengine qtquick3d
           aqt doc 5.14.2 --outputdir /opt/qt linux desktop -m qtwebengine

diff --git a/.qmake.conf b/.qmake.conf
@@ -14,7 +14,7 @@
 
 PROJECT_ROOT     = $$PWD
 BUILD_PATH       = $$shadowed($$PWD)
-LIVEKEYS_VERSION = 1.8.0
+LIVEKEYS_VERSION = 1.9.1
 
 macx:DEPLOY_PATH = $$BUILD_PATH/bin/livekeys.app/Contents
 else:DEPLOY_PATH = $$BUILD_PATH/bin

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 [![Build Status](https://travis-ci.com/live-keys/livekeys.svg?branch=master)](https://travis-ci.com/live-keys/livekeys)
 [![Build status](https://ci.appveyor.com/api/projects/status/3l5t69h7q3gpkec1?svg=true)](https://ci.appveyor.com/project/dinusv/livekeys)
 
- * **Version**: 1.9.0
+ * **Version**: 1.9.1
  * **License**: LGPL
  * **Website**: [livekeys.io](https://livekeys.io)
  * **Demo**: [www.youtube.com/watch?v=ZPt5KSy1wh0](https://www.youtube.com/watch?v=ZPt5KSy1wh0)

diff --git a/application/application.qrc b/application/application.qrc
@@ -1,9 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="LogWindow.qml">qml/LogWindow.qml</file>
         <file alias="Top.qml">qml/Top.qml</file>
         <file alias="ProjectEnvironment.qml">qml/ProjectEnvironment.qml</file>
-        <file alias="MessageDialogButton.qml">qml/MessageDialogButton.qml</file>
         <file alias="MessageDialogInternal.qml">qml/MessageDialogInternal.qml</file>
         <file alias="ProjectNavigation.qml">qml/ProjectNavigation.qml</file>
         <file alias="ProjectAddEntry.qml">qml/ProjectAddEntry.qml</file>
@@ -26,9 +24,9 @@
         <file alias="DocumentationViewPane.qml">qml/DocumentationViewPane.qml</file>
         <file alias="TextEditNodeView.qml">qml/TextEditNodeView.qml</file>
         <file alias="StartupBox.qml">qml/StartupBox.qml</file>
-        <file alias="ContextMenu.qml">qml/ContextMenu.qml</file>
         <file alias="Viewer.qml">qml/Viewer.qml</file>
         <file alias="MessagesContainer.qml">qml/MessagesContainer.qml</file>
+        <file alias="PaneEnvironment.qml">qml/PaneEnvironment.qml</file>
     </qresource>
     <qresource prefix="/fonts">
         <file alias="UbuntuMono-Bold.ttf">fonts/UbuntuMono-Bold.ttf</file>

diff --git a/application/qml/DocumentationViewPane.qml b/application/qml/DocumentationViewPane.qml
@@ -3,6 +3,7 @@ import editor 1.0
 import base 1.0
 import live 1.0
 import fs 1.0 as Fs
+import workspace 1.0
 
 Pane{
     id: root

diff --git a/application/qml/LiveKeysTheme.qml b/application/qml/LiveKeysTheme.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.3
 import editor 1.0
+import workspace 1.0
 
 WorkspaceTheme{
     name: "LiveKeys"

diff --git a/application/qml/LogContainer.qml b/application/qml/LogContainer.qml
@@ -7,7 +7,7 @@ import live 1.0
 import editor 1.0
 import workspace 1.0 as Workspace
 
-Pane{
+Workspace.Pane{
     id: root
     paneType: 'log'
     paneState : { return {} }
@@ -192,7 +192,7 @@ Pane{
         height: 30
         color : root.topColor
 
-        PaneDragItem{
+        Workspace.PaneDragItem{
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
             anchors.leftMargin: 5
@@ -379,8 +379,8 @@ Pane{
             onClicked : {
                 logMenu.visible = false
                 var clone = root.paneClone()
-                var index = root.parentSplitterIndex()
-                lk.layers.workspace.panes.splitPaneHorizontallyWith(root.parentSplitter, index, clone)
+                var index = root.parentSplitViewIndex()
+                lk.layers.workspace.panes.splitPaneHorizontallyWith(root.parentSplitView, index, clone)
             }
         }
 
@@ -390,8 +390,8 @@ Pane{
             onClicked : {
                 logMenu.visible = false
                 var clone = root.paneClone()
-                var index = root.parentSplitterIndex()
-                lk.layers.workspace.panes.splitPaneVerticallyWith(root.parentSplitter, index, clone)
+                var index = root.parentSplitViewIndex()
+                lk.layers.workspace.panes.splitPaneVerticallyWith(root.parentSplitView, index, clone)
             }
         }
 

diff --git a/application/qml/LogWindow.qml b/application/qml/LogWindow.qml
diff --git a/application/qml/MessageDialogButton.qml b/application/qml/MessageDialogButton.qml
diff --git a/application/qml/MessageDialogConfirm.qml b/application/qml/MessageDialogConfirm.qml
@@ -55,23 +55,85 @@ MessageDialogInternal{
             aitem.forceActiveFocus()
     }
 
-    MessageDialogButton{
+    property Component buttonStyle: Rectangle{
+        id: dialogButton
+
+        property alias text: buttonLabel.text
+        property var callback : function(){}
+
+        signal clicked()
+        onClicked: parent.clicked()
+
+        color: buttonMouseArea.containsMouse ? "#11212c" : "#0b151c"
+        width: 100
+        height: 30
+
+        Text{
+            id: buttonLabel
+            anchors.centerIn: parent
+            text: ""
+            color: "#ccc"
+            font.pixelSize: 12
+            font.family: "Open Sans, sans-serif"
+            font.weight: Font.Light
+        }
+        MouseArea{
+            id: buttonMouseArea
+            anchors.fill: parent
+            hoverEnabled: true
+            onClicked: {
+                dialogButton.clicked()
+            }
+        }
+    }
+
+    Loader{
         id: messageBoxButton1
+
+        property string text: ''
+        property var callback: function(){}
+        signal clicked()
+
         visible : text !== ''
+        sourceComponent: root.buttonStyle
+        onItemChanged: {
+            if ( item )
+                item.text = Qt.binding(function(){ return messageBoxButton1.text } )
+        }
         onClicked: messageBoxButton1.callback(root)
     }
 
-    MessageDialogButton{
+    Loader{
         id: messageBoxButton2
-        anchors.centerIn: parent
+
+        property string text: ''
+        property var callback: function(){}
+        signal clicked()
+
+        anchors.horizontalCenter: parent.horizontalCenter
         visible : text !== ''
+        sourceComponent: root.buttonStyle
+        onItemChanged: {
+            if ( item )
+                item.text = Qt.binding(function(){ return messageBoxButton2.text } )
+        }
         onClicked: messageBoxButton2.callback(root)
     }
 
-    MessageDialogButton{
+    Loader{
         id: messageBoxButton3
+
+        property string text: ''
+        property var callback: function(){}
+        signal clicked()
+
         anchors.right: parent.right
         visible : text !== ''
+        sourceComponent: root.buttonStyle
+        onItemChanged: {
+            if ( item )
+                item.text = Qt.binding(function(){ return messageBoxButton3.text } )
+        }
         onClicked: messageBoxButton3.callback(root)
     }
 }
diff --git a/application/qml/MessageDialogInternal.qml b/application/qml/MessageDialogInternal.qml
@@ -38,12 +38,30 @@ Rectangle{
     Keys.onEscapePressed: root.escapePressed(root)
 
     anchors.centerIn: parent
-    color: "#fff"
+    color: style.background
+    border.width: style.borderWidth
+    border.color: style.borderColor
+    radius: style.radius
+
     width: 400
     height: messageLabel.height < 100 ? messageLabel.height + 100 : 200
     focus: true
     opacity: root.visible ? 1 : 0
 
+    property QtObject style: QtObject{
+        property color background: "#02070b"
+        property color borderColor: "#0c151c"
+        property int borderWidth: 1
+        property int radius: 5
+        property color textColor: "#fff"
+        property font font : Qt.font({
+            family: 'Open Sans, sans-serif',
+            weight: Font.Normal,
+            italic: false,
+            pixelSize: 12
+        })
+    }
+
     Behavior on opacity{ NumberAnimation{ duration: 250} }
 
     ScrollView{
@@ -87,10 +105,8 @@ Rectangle{
 
             wrapMode: Text.WordWrap
 
-            color: "#ccc"
-            font.pixelSize: 12
-            font.family: "Open Sans, sans-serif"
-            font.weight: Font.Light
+            color: root.style.textColor
+            font: root.style.font
         }
     }
 

diff --git a/application/qml/MessagesContainer.qml b/application/qml/MessagesContainer.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.3
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
-import workspace 1.0 as Workspace
 import workspace.icons 1.0 as Icons
+import visual.input 1.0 as Input
 
 Rectangle {
     id: root
@@ -97,7 +97,7 @@ Rectangle {
         }
     }
 
-    Workspace.SelectableListView {
+    Input.SelectableListView {
         id: listView
         anchors.top: parent.top
         anchors.topMargin: 30
@@ -149,7 +149,7 @@ Rectangle {
                 width: parent.width - 35
                 height: msgText.height
 
-                Workspace.Label{
+                Input.Label{
                     id: msgText
                     width: listView.width - 55
                     text: model.message
@@ -203,7 +203,7 @@ Rectangle {
             width: parent.width - 35
             height: noMsgsText.height
 
-            Workspace.Label{
+            Input.Label{
                 id: noMsgsText
                 width: listView.width - 55
                 font.italic: true