Merge branch 'dev'

dinusv · dinusv · commit fec3186a0371 · 2021-04-21T22:20:24.000+03:00
diff --git a/application/images/logo.png b/application/images/logo.png
diff --git a/application/qml/window.qml b/application/qml/window.qml
@@ -69,7 +69,7 @@ ApplicationWindow{
 
             dirOpenDialog.title = title
             dirOpenDialog.callback = callback
-            fileOpenDialog.folder = ""
+            dirOpenDialog.folder = ""
 
             dirOpenDialog.open()
         }
diff --git a/doc/src/images/logo.png b/doc/src/images/logo.png
diff --git a/lib/lveditqmljs/src/codeqmlhandler.cpp b/lib/lveditqmljs/src/codeqmlhandler.cpp
@@ -2799,14 +2799,6 @@ QJSValue CodeQmlHandler::expand(QmlEditFragment *edit, const QJSValue &val){
             if ( !paletteLoader )
                 return QJSValue();
 
-            // check if duplicate
-            for ( auto it = edit->begin(); it != edit->end(); ++it ){
-                CodePalette* loadedPalette = *it;
-                if ( loadedPalette->path() == PaletteContainer::palettePath(paletteLoader) ){
-                    return m_engine->engine()->newQObject(loadedPalette);
-                }
-            }
-
             if ( edit->bindingPalette() && edit->bindingPalette()->path() == PaletteContainer::palettePath(paletteLoader) ){
                 edit->addPalette(edit->bindingPalette());
                 return m_engine->engine()->newQObject(edit->bindingPalette());
diff --git a/plugins/base/baseqml/samples/linkingexecutables/resources/LinkingExecutablesHighlight.qml b/plugins/base/baseqml/samples/linkingexecutables/resources/LinkingExecutablesHighlight.qml
@@ -149,7 +149,7 @@ WorkspaceControl{
                             for ( var pi = 0; pi < palettes.length; ++pi ){
 
                                 var palette = palettes[pi]
-                                if ( palette.name === 'PathPalette' ){
+                                if ( palette.name === 'FilePathPalette' ){
                                     var coords = palette.item.mapToItem(editor, 0, 0)
                                     var editorCoords = editorPane.mapGlobalPosition()
                                     editor.makePositionVisible(coords.y + editorCoords.y + 25 - 80)                            
@@ -241,7 +241,7 @@ WorkspaceControl{
                             highlight.boxX = coords.x + editorCoords.x + 185
                             highlight.boxY = coords.y + editorCoords.y + 70
                             highlight.box.width = 40
-                            highlight.box.height = 120
+                            highlight.box.height = 60
                             highlight.box.border.width = 5
                             highlight.box.border.color = highlight.box.color
                             highlight.box.color = 'transparent'
diff --git a/plugins/base/baseqml/samples/linkingexecutables/resources/ShapeLinkingExecutablesWin.qml b/plugins/base/baseqml/samples/linkingexecutables/resources/ShapeLinkingExecutablesWin.qml
@@ -30,7 +30,7 @@ WorkspaceControl{
                             "properties": [
                                 {
                                     "name": "path",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 },
                                 {
                                     "name": "args",
@@ -51,7 +51,7 @@ WorkspaceControl{
                                 },
                                 {
                                     "name": "path",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 },
                                 {
                                     "name": "args",
diff --git a/plugins/editqml/qml/ObjectContainer.qml b/plugins/editqml/qml/ObjectContainer.qml
@@ -261,7 +261,7 @@ Item{
             compact = false
             if (paletteControls.instructionsShaping) return
             paletteControls.openEmptyNestedObjects(root)
-            // paletteControls.openDefaults(root)
+            paletteControls.openDefaults(root)
 
             var id = editingFragment.objectId()
             var check = (objectContainer.title.indexOf('#') === -1)
diff --git a/plugins/fs/fsqml/samples/readingfiles/resources/ReadingFilesHighlight.qml b/plugins/fs/fsqml/samples/readingfiles/resources/ReadingFilesHighlight.qml
@@ -307,7 +307,7 @@ WorkspaceControl{
             highlight = createHighlight(state)
 
             highlight.boxX = viewerCoords.x - 10
-            highlight.boxY = viewerCoords.y - 10
+            highlight.boxY = viewerCoords.y + 20
             highlight.box.width = 460
             highlight.box.height = 35
             highlight.box.border.width = 5
diff --git a/plugins/lcvcore/samples/coloradjustments/resources/ShapeColorAdjustments.qml b/plugins/lcvcore/samples/coloradjustments/resources/ShapeColorAdjustments.qml
@@ -21,7 +21,7 @@ WorkspaceControl{
                             "properties": [
                                 {
                                     "name": "source",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 }
                             ]
                         },
diff --git a/plugins/lcvcore/samples/drawing/drawing.md b/plugins/lcvcore/samples/drawing/drawing.md
@@ -7,9 +7,10 @@ This sample shows a processing pipeline for drawing.
 
  * The [first component]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#first-component;livekeys://open/resources/DrawingRemoveHighlight.qml#first-component}) creates a blank white image of size 800x600
 
- * Our second component is a [`Draw` component]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#draw-component;livekeys://open/resources/DrawingRemoveHighlight.qml#draw-component}), allowing you to draw on the blank image.
- You can select the brush size by [this icon]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#brush-icon;livekeys://open/resources/DrawingRemoveHighlight.qml#brush-icon}), and the color through the [box just
- below]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#color-icon;livekeys://open/resources/DrawingRemoveHighlight.qml#color-icon}).
+ * Our second component is a [`DrawSurface` component]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#draw-component;livekeys://open/resources/DrawingRemoveHighlight.qml#draw-component}), allowing you to draw on the blank image, or create a gradient.
+ You can select the brush tool by clicking on [this icon]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#brush-icon;livekeys://open/resources/DrawingRemoveHighlight.qml#brush-icon}). After that, you can change the brush size by clicking [here]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#brush-size;livekeys://open/resources/DrawingRemoveHighlight.qml#brush-size}) and dragging the slider. 
+ The gradient tool can be selected by clicking on [this icon]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#gradient-icon;livekeys://open/resources/DrawingRemoveHighlight.qml#gradient-icon}), and the gradient itself is created by dragging a point across the image shown. 
+ For both tools, you can select the foreground and background colors with the pair of [color pickers]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#color-pickers;livekeys://open/resources/DrawingRemoveHighlight.qml#color-pickers}).
 
  * The [third component]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#histogram-component;livekeys://open/resources/DrawingRemoveHighlight.qml#histogram-component}) is a color histogram of the image, displayed [here]({livekeys-hover:livekeys://open/resources/DrawingHighlight.qml#histogram-view;livekeys://open/resources/DrawingRemoveHighlight.qml#histogram-view}), that
  will update in real-time as the image is being drawn on.
diff --git a/plugins/lcvcore/samples/drawing/resources/DrawingHighlight.qml b/plugins/lcvcore/samples/drawing/resources/DrawingHighlight.qml
@@ -28,6 +28,38 @@ WorkspaceControl{
         return ob
     }
 
+    function findDrawPalette(){
+        var editorPane = lk.layers.workspace.panes.focusPane('editor')
+        if ( !editorPane )
+            return
+
+        var editor = editorPane.editor
+        var codeHandler = editor.documentHandler.codeHandler
+
+        var editingFragments = codeHandler.editingFragments()
+
+        for ( var i = 0; i < editingFragments.length; ++i ){
+            var gridEdit = editingFragments[i]
+            if ( gridEdit.type() === 'qml/QtQuick#Grid' ){
+                var childFragments = gridEdit.getChildFragments()
+                for ( var j = 0; j < childFragments.length; ++j ){
+                    var drawSurfaceEdit = childFragments[j]
+                    if ( drawSurfaceEdit.type() === 'qml/lcvcore#DrawSurface' ){
+                        var palettes = drawSurfaceEdit.paletteList()
+                        for ( var pi = 0; pi < palettes.length; ++pi ){
+                            var palette = palettes[pi]
+                            if (palette.name === 'DrawPalette'){
+                                return palette
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return null
+    }
+
     run: function(workspace, state, fragment){
         var highlight = null
         if ( fragment === 'first-component' ){
@@ -79,7 +111,7 @@ WorkspaceControl{
                     var childFragments = gridEdit.getChildFragments()
                     for ( var j = 0; j < childFragments.length; ++j ){
                         var blankImageEdit = childFragments[j]
-                        if ( blankImageEdit.type() === 'qml/lcvcore#Draw' ){
+                        if ( blankImageEdit.type() === 'qml/lcvcore#DrawSurface' ){
                             var objectContainer = blankImageEdit.visualParent.parent.parent.parent
 
                             var coords = objectContainer.mapToItem(editor, 0, 0)
@@ -89,79 +121,105 @@ WorkspaceControl{
                             highlight = createHighlight(state)
                             highlight.boxX = coords.x + editorCoords.x + 20
                             highlight.boxY = coords.y + editorCoords.y + 33
-                            highlight.box.width = 110
+                            highlight.box.width = 210
                             highlight.box.height = 35
 
                         }
                     }
                 }
             }
         } else if ( fragment === 'brush-icon' ){
+            var drawPalette = findDrawPalette()
+            if (!drawPalette) return
+
             var editorPane = lk.layers.workspace.panes.focusPane('editor')
             if ( !editorPane )
                 return
 
             var editor = editorPane.editor
-            var codeHandler = editor.documentHandler.codeHandler
+            var coords = drawPalette.item.mapToItem(editor, 0, 0)
+            var editorCoords = editorPane.mapGlobalPosition()
+            var xOffset = -3
+            var yOffset = 65
+            editor.makePositionVisible(coords.y + editorCoords.y + yOffset - 80)
+            coords = drawPalette.item.mapToItem(editor, 0, 0)
+            highlight = createHighlight(state)
 
-            var editingFragments = codeHandler.editingFragments()
+            highlight.boxX = coords.x + editorCoords.x + xOffset
+            highlight.boxY = coords.y + editorCoords.y + yOffset
+            highlight.box.width = 30
+            highlight.box.height = 30
+            return highlight
+        } else if ( fragment === 'brush-size' ){
+            var drawPalette = findDrawPalette()
+            if (!drawPalette) return
 
-            for ( var i = 0; i < editingFragments.length; ++i ){
-                var gridEdit = editingFragments[i]
-                if ( gridEdit.type() === 'qml/QtQuick#Grid' ){
-                    var childFragments = gridEdit.getChildFragments()
-                    for ( var j = 0; j < childFragments.length; ++j ){
-                        var blankImageEdit = childFragments[j]
-                        if ( blankImageEdit.type() === 'qml/lcvcore#Draw' ){
-                            var objectContainer = blankImageEdit.visualParent.parent.parent.parent
+            var editorPane = lk.layers.workspace.panes.focusPane('editor')
+            if ( !editorPane )
+                return
 
-                            var coords = objectContainer.mapToItem(editor, 0, 0)
-                            var editorCoords = editorPane.mapGlobalPosition()
-                            editor.makePositionVisible(coords.y + editorCoords.y + 115 - 80)                            
-                            coords = objectContainer.mapToItem(editor, 0, 0)
-                            highlight = createHighlight(state)
-                            highlight.boxX = coords.x + editorCoords.x + 7
-                            highlight.boxY = coords.y + editorCoords.y + 115
-                            highlight.box.width = 35
-                            highlight.box.height = 35
+            var editor = editorPane.editor
+            var coords = drawPalette.item.mapToItem(editor, 0, 0)
+            var editorCoords = editorPane.mapGlobalPosition()
+            var xOffset = 110
+            var yOffset = 30
+            editor.makePositionVisible(coords.y + editorCoords.y + yOffset - 80)
+            coords = drawPalette.item.mapToItem(editor, 0, 0)
+            highlight = createHighlight(state)
+
+            highlight.boxX = coords.x + editorCoords.x + xOffset
+            highlight.boxY = coords.y + editorCoords.y + yOffset
+            highlight.box.width = 30
+            highlight.box.height = 30
+            return highlight
+        } else if ( fragment === 'gradient-icon' ){
+            var drawPalette = findDrawPalette()
+            if (!drawPalette) return
 
-                        }
-                    }
-                }
-            }
-        } else if ( fragment === 'color-icon' ){
             var editorPane = lk.layers.workspace.panes.focusPane('editor')
             if ( !editorPane )
                 return
 
             var editor = editorPane.editor
-            var codeHandler = editor.documentHandler.codeHandler
+            var coords = drawPalette.item.mapToItem(editor, 0, 0)
+            var editorCoords = editorPane.mapGlobalPosition()
+            var xOffset = 24
+            var yOffset = 65
+            editor.makePositionVisible(coords.y + editorCoords.y + yOffset - 80)
+            coords = drawPalette.item.mapToItem(editor, 0, 0)
+            highlight = createHighlight(state)
 
-            var editingFragments = codeHandler.editingFragments()
+            highlight.boxX = coords.x + editorCoords.x + xOffset
+            highlight.boxY = coords.y + editorCoords.y + yOffset
+            highlight.box.width = 30
+            highlight.box.height = 30
+            return highlight
+        } else if ( fragment === 'color-pickers' ){
+            var drawPalette = findDrawPalette()
+            if (!drawPalette) return
 
-            for ( var i = 0; i < editingFragments.length; ++i ){
-                var gridEdit = editingFragments[i]
-                if ( gridEdit.type() === 'qml/QtQuick#Grid' ){
-                    var childFragments = gridEdit.getChildFragments()
-                    for ( var j = 0; j < childFragments.length; ++j ){
-                        var blankImageEdit = childFragments[j]
-                        if ( blankImageEdit.type() === 'qml/lcvcore#Draw' ){
-                            var objectContainer = blankImageEdit.visualParent.parent.parent.parent
+            var editorPane = lk.layers.workspace.panes.focusPane('editor')
+            if ( !editorPane )
+                return
 
-                            var coords = objectContainer.mapToItem(editor, 0, 0)
-                            var editorCoords = editorPane.mapGlobalPosition()
-                            editor.makePositionVisible(coords.y + editorCoords.y + 140 - 80)                            
-                            coords = objectContainer.mapToItem(editor, 0, 0)
-                            highlight = createHighlight(state)
-                            highlight.boxX = coords.x + editorCoords.x + 7
-                            highlight.boxY = coords.y + editorCoords.y + 140
-                            highlight.box.width = 35
-                            highlight.box.height = 35
+            var editor = editorPane.editor
+            var coords = drawPalette.item.mapToItem(editor, 0, 0)
+            var editorCoords = editorPane.mapGlobalPosition()
+            var xOffset = -10
+            var yOffset = 180
+            editor.makePositionVisible(coords.y + editorCoords.y + yOffset - 80)
+            coords = drawPalette.item.mapToItem(editor, 0, 0)
+            highlight = createHighlight(state)
+
+            highlight.boxX = coords.x + editorCoords.x + xOffset
+            highlight.boxY = coords.y + editorCoords.y + yOffset
+            highlight.box.width = 70
+            highlight.box.height = 70
+            highlight.box.border.width = 5
+            highlight.box.border.color = highlight.box.color
+            highlight.box.color = 'transparent'
+            return highlight
 
-                        }
-                    }
-                }
-            }
         } else if ( fragment === 'histogram-component' ){
             var editorPane = lk.layers.workspace.panes.focusPane('editor')
             if ( !editorPane )
@@ -203,7 +261,7 @@ WorkspaceControl{
             var coords = viewerPane.mapGlobalPosition()
             highlight = createHighlight(state)
             highlight.boxX = coords.x - 15
-            highlight.boxY = coords.y - 15
+            highlight.boxY = coords.y + 15
             highlight.box.width = 330
             highlight.box.height = 235
             highlight.box.border.width = 5
diff --git a/plugins/lcvcore/samples/imagetransformations/resources/AddDifferentImage.qml b/plugins/lcvcore/samples/imagetransformations/resources/AddDifferentImage.qml
@@ -32,7 +32,7 @@ WorkspaceControl{
                                 var palettes = sourceProperty.paletteList()
                                 for ( var pi = 0; pi < palettes.length; ++pi ){
                                     var palette = palettes[pi]
-                                    if ( palette.name === 'PathPalette' ){
+                                    if ( palette.name === 'FilePathPalette' ){
                                         palette.value = project.path('../../../../samples/_images/buildings_0246.jpg')
                                     }
                                 }
diff --git a/plugins/lcvcore/samples/imagetransformations/resources/ShapeImageTransformations.qml b/plugins/lcvcore/samples/imagetransformations/resources/ShapeImageTransformations.qml
@@ -20,7 +20,7 @@ WorkspaceControl{
                             "properties": [
                                 {
                                     "name": "source",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 }
                             ]
                         },
diff --git a/plugins/lcvcore/samples/videocoloradjustments/resources/ShapeVideoColorAdjustments.qml b/plugins/lcvcore/samples/videocoloradjustments/resources/ShapeVideoColorAdjustments.qml
@@ -20,7 +20,7 @@ WorkspaceControl{
                             "properties": [
                                 {
                                     "name": "file",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 }
                             ]
                         },
diff --git a/plugins/lcvcore/samples/videotimeline/resources/ShapeVideoTimeline.qml b/plugins/lcvcore/samples/videotimeline/resources/ShapeVideoTimeline.qml
@@ -53,7 +53,7 @@ WorkspaceControl{
                             "properties": [
                                 {
                                     "name": "file",
-                                    "palettes": ["PathPalette"]
+                                    "palettes": ["FilePathPalette"]
                                 }
                             ]
                         }
diff --git a/plugins/lcvcore/samples/videotimeline/resources/VideoTimelineHighlight.qml b/plugins/lcvcore/samples/videotimeline/resources/VideoTimelineHighlight.qml
@@ -93,7 +93,7 @@ WorkspaceControl{
             highlight.box.width = 100
             highlight.box.height = 20
         } else if ( fragment === 'play-button' ){
-            highlight = createTimelineHighlight(state, 31, 31)
+            highlight = createTimelineHighlight(state, 40, 31)
             highlight.box.width = 35
             highlight.box.height = 35
         } else if ( fragment === 'options-button' ){
@@ -148,7 +148,7 @@ WorkspaceControl{
             var coords = viewerPane.mapGlobalPosition()
             highlight = createHighlight(state)
             highlight.boxX = coords.x
-            highlight.boxY = coords.y 
+            highlight.boxY = coords.y + 30
             highlight.box.width = 600
             highlight.box.height = 400
             highlight.box.border.width = 5
@@ -197,7 +197,7 @@ WorkspaceControl{
                                     for ( var pi = 0; pi < palettes.length; ++pi ){
 
                                         var palette = palettes[pi]
-                                        if ( palette.name === 'PathPalette' ){
+                                        if ( palette.name === 'FilePathPalette' ){
                                             var coords = palette.item.mapToItem(editor, 0, 0)
                                             var editorCoords = editorPane.mapGlobalPosition()
                                             editor.makePositionVisible(coords.y + editorCoords.y + 25 - 80)                            

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ ApplicationWindow{`
`69`	`69`
`70`	`70`	`dirOpenDialog.title = title`
`71`	`71`	`dirOpenDialog.callback = callback`
`72`		`- fileOpenDialog.folder = ""`
	`72`	`+ dirOpenDialog.folder = ""`
`73`	`73`
`74`	`74`	`dirOpenDialog.open()`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ WorkspaceControl{`
`30`	`30`	`"properties": [`
`31`	`31`	`{`
`32`	`32`	`"name": "path",`
`33`		`- "palettes": ["PathPalette"]`
	`33`	`+ "palettes": ["FilePathPalette"]`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`"name": "args",`
`@@ -51,7 +51,7 @@ WorkspaceControl{`
`51`	`51`	`},`
`52`	`52`	`{`
`53`	`53`	`"name": "path",`
`54`		`- "palettes": ["PathPalette"]`
	`54`	`+ "palettes": ["FilePathPalette"]`
`55`	`55`	`},`
`56`	`56`	`{`
`57`	`57`	`"name": "args",`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ WorkspaceControl{`
`21`	`21`	`"properties": [`
`22`	`22`	`{`
`23`	`23`	`"name": "source",`
`24`		`- "palettes": ["PathPalette"]`
	`24`	`+ "palettes": ["FilePathPalette"]`
`25`	`25`	`}`
`26`	`26`	`]`
`27`	`27`	`},`