Skip to content

Commit a2711f9

Browse files
dinusvdinusv
committed
Merge branch 'dev'
2 parents fec3186 + d0710bd commit a2711f9

File tree

409 files changed

+9412
-6829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+9412
-6829
lines changed

‎.github/workflows/.build_livekeys.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- name: Download dependencies Linux
4949
if: runner.os == 'Linux'
5050
run: |
51+
sudo apt-get update
5152
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
5253
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
5354
sudo apt-get install -y libtiff5 libtiff5-dev python3-setuptools doxygen libssl1.0-dev nodejs-dev npm
@@ -98,12 +99,12 @@ jobs:
9899
- name: Set up Python ${{ matrix.python-version }}
99100
uses: actions/setup-python@v1
100101
with:
101-
python-version: 3.9
102+
python-version: 3.8
102103

103104
- name: Setup Qt MacOS
104105
if: runner.os == 'macOS'
105106
run: |
106-
pip3 install aqtinstall
107+
pip3 install aqtinstall==1.1.4
107108
aqt install 5.14.2 --outputdir /opt/qt mac desktop clang_64 -m qtwebengine qtquick3d
108109
aqt doc 5.14.2 --outputdir /opt/qt mac desktop -m qtwebengine
109110
export QTDIR=/opt/qt/5.14.2/clang_64
@@ -112,7 +113,7 @@ jobs:
112113
- name: Setup Qt Linux
113114
if: runner.os == 'Linux'
114115
run: |
115-
pip3 install aqtinstall
116+
pip3 install aqtinstall==1.1.4
116117
echo "Installed aqtinstall"
117118
aqt install 5.14.2 --outputdir /opt/qt linux desktop gcc_64 -m qtwebengine qtquick3d
118119
aqt doc 5.14.2 --outputdir /opt/qt linux desktop -m qtwebengine

‎.qmake.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
PROJECT_ROOT = $$PWD
1616
BUILD_PATH = $$shadowed($$PWD)
17-
LIVEKEYS_VERSION = 1.8.0
17+
LIVEKEYS_VERSION = 1.9.1
1818

1919
macx:DEPLOY_PATH = $$BUILD_PATH/bin/livekeys.app/Contents
2020
else:DEPLOY_PATH = $$BUILD_PATH/bin

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[![Build Status](https://travis-ci.com/live-keys/livekeys.svg?branch=master)](https://travis-ci.com/live-keys/livekeys)
1313
[![Build status](https://ci.appveyor.com/api/projects/status/3l5t69h7q3gpkec1?svg=true)](https://ci.appveyor.com/project/dinusv/livekeys)
1414

15-
* **Version**: 1.9.0
15+
* **Version**: 1.9.1
1616
* **License**: LGPL
1717
* **Website**: [livekeys.io](https://livekeys.io)
1818
* **Demo**: [www.youtube.com/watch?v=ZPt5KSy1wh0](https://www.youtube.com/watch?v=ZPt5KSy1wh0)

‎application/application.qrc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file alias="LogWindow.qml">qml/LogWindow.qml</file>
43
<file alias="Top.qml">qml/Top.qml</file>
54
<file alias="ProjectEnvironment.qml">qml/ProjectEnvironment.qml</file>
6-
<file alias="MessageDialogButton.qml">qml/MessageDialogButton.qml</file>
75
<file alias="MessageDialogInternal.qml">qml/MessageDialogInternal.qml</file>
86
<file alias="ProjectNavigation.qml">qml/ProjectNavigation.qml</file>
97
<file alias="ProjectAddEntry.qml">qml/ProjectAddEntry.qml</file>
@@ -26,9 +24,9 @@
2624
<file alias="DocumentationViewPane.qml">qml/DocumentationViewPane.qml</file>
2725
<file alias="TextEditNodeView.qml">qml/TextEditNodeView.qml</file>
2826
<file alias="StartupBox.qml">qml/StartupBox.qml</file>
29-
<file alias="ContextMenu.qml">qml/ContextMenu.qml</file>
3027
<file alias="Viewer.qml">qml/Viewer.qml</file>
3128
<file alias="MessagesContainer.qml">qml/MessagesContainer.qml</file>
29+
<file alias="PaneEnvironment.qml">qml/PaneEnvironment.qml</file>
3230
</qresource>
3331
<qresource prefix="/fonts">
3432
<file alias="UbuntuMono-Bold.ttf">fonts/UbuntuMono-Bold.ttf</file>

‎application/qml/DocumentationViewPane.qml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import editor 1.0
33
import base 1.0
44
import live 1.0
55
import fs 1.0 as Fs
6+
import workspace 1.0
67

78
Pane{
89
id: root

‎application/qml/LiveKeysTheme.qml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import QtQuick 2.3
22
import editor 1.0
3+
import workspace 1.0
34

45
WorkspaceTheme{
56
name: "LiveKeys"

‎application/qml/LogContainer.qml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import live 1.0
77
import editor 1.0
88
import workspace 1.0 as Workspace
99

10-
Pane{
10+
Workspace.Pane{
1111
id: root
1212
paneType: 'log'
1313
paneState : { return {} }
@@ -192,7 +192,7 @@ Pane{
192192
height: 30
193193
color : root.topColor
194194

195-
PaneDragItem{
195+
Workspace.PaneDragItem{
196196
anchors.verticalCenter: parent.verticalCenter
197197
anchors.left: parent.left
198198
anchors.leftMargin: 5
@@ -379,8 +379,8 @@ Pane{
379379
onClicked : {
380380
logMenu.visible = false
381381
var clone = root.paneClone()
382-
var index = root.parentSplitterIndex()
383-
lk.layers.workspace.panes.splitPaneHorizontallyWith(root.parentSplitter, index, clone)
382+
var index = root.parentSplitViewIndex()
383+
lk.layers.workspace.panes.splitPaneHorizontallyWith(root.parentSplitView, index, clone)
384384
}
385385
}
386386

@@ -390,8 +390,8 @@ Pane{
390390
onClicked : {
391391
logMenu.visible = false
392392
var clone = root.paneClone()
393-
var index = root.parentSplitterIndex()
394-
lk.layers.workspace.panes.splitPaneVerticallyWith(root.parentSplitter, index, clone)
393+
var index = root.parentSplitViewIndex()
394+
lk.layers.workspace.panes.splitPaneVerticallyWith(root.parentSplitView, index, clone)
395395
}
396396
}
397397

‎application/qml/LogWindow.qml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎application/qml/MessageDialogButton.qml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎application/qml/MessageDialogConfirm.qml‎

Lines changed: 66 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,85 @@ MessageDialogInternal{
5555
aitem.forceActiveFocus()
5656
}
5757

58-
MessageDialogButton{
58+
property Component buttonStyle: Rectangle{
59+
id: dialogButton
60+
61+
property alias text: buttonLabel.text
62+
property var callback : function(){}
63+
64+
signal clicked()
65+
onClicked: parent.clicked()
66+
67+
color: buttonMouseArea.containsMouse ? "#11212c" : "#0b151c"
68+
width: 100
69+
height: 30
70+
71+
Text{
72+
id: buttonLabel
73+
anchors.centerIn: parent
74+
text: ""
75+
color: "#ccc"
76+
font.pixelSize: 12
77+
font.family: "Open Sans, sans-serif"
78+
font.weight: Font.Light
79+
}
80+
MouseArea{
81+
id: buttonMouseArea
82+
anchors.fill: parent
83+
hoverEnabled: true
84+
onClicked: {
85+
dialogButton.clicked()
86+
}
87+
}
88+
}
89+
90+
Loader{
5991
id: messageBoxButton1
92+
93+
property string text: ''
94+
property var callback: function(){}
95+
signal clicked()
96+
6097
visible : text !== ''
98+
sourceComponent: root.buttonStyle
99+
onItemChanged: {
100+
if ( item )
101+
item.text = Qt.binding(function(){ return messageBoxButton1.text } )
102+
}
61103
onClicked: messageBoxButton1.callback(root)
62104
}
63105

64-
MessageDialogButton{
106+
Loader{
65107
id: messageBoxButton2
66-
anchors.centerIn: parent
108+
109+
property string text: ''
110+
property var callback: function(){}
111+
signal clicked()
112+
113+
anchors.horizontalCenter: parent.horizontalCenter
67114
visible : text !== ''
115+
sourceComponent: root.buttonStyle
116+
onItemChanged: {
117+
if ( item )
118+
item.text = Qt.binding(function(){ return messageBoxButton2.text } )
119+
}
68120
onClicked: messageBoxButton2.callback(root)
69121
}
70122

71-
MessageDialogButton{
123+
Loader{
72124
id: messageBoxButton3
125+
126+
property string text: ''
127+
property var callback: function(){}
128+
signal clicked()
129+
73130
anchors.right: parent.right
74131
visible : text !== ''
132+
sourceComponent: root.buttonStyle
133+
onItemChanged: {
134+
if ( item )
135+
item.text = Qt.binding(function(){ return messageBoxButton3.text } )
136+
}
75137
onClicked: messageBoxButton3.callback(root)
76138
}
77139
}

0 commit comments

Comments
 (0)