From ab74c843fe8538d733b3ebfe80d9b08b3cafdeaf Mon Sep 17 00:00:00 2001 From: Delanir Date: Thu, 15 Jun 2017 19:26:40 +0100 Subject: [PATCH] Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE --- scripts/defaultScripts.js | 3 ++- .../system}/fingerPaint/PaintWindow.qml | 0 .../system}/fingerPaint/content/CheckerBoard.qml | 0 .../system}/fingerPaint/content/ColorUtils.js | 0 .../system}/fingerPaint/content/ColorWheel.qml | 0 .../system}/fingerPaint/content/NumberBox.qml | 0 .../system}/fingerPaint/content/PanelBorder.qml | 0 .../system}/fingerPaint/content/VerticalSlider.qml | 0 .../system}/fingerPaint/content/Wheel.qml | 0 .../fingerPaint/content/brushes/paintbrush1.png | Bin .../fingerPaint/content/brushes/paintbrush2.png | Bin .../fingerPaint/content/brushes/paintbrush3.png | Bin .../fingerPaint/content/brushes/paintbrush4.png | Bin .../fingerPaint/content/brushes/paintbrush5.png | Bin .../fingerPaint/content/brushes/paintbrush6.png | Bin .../system}/fingerPaint/content/mathUtils.js | 0 .../fingerPaint/content/tabicons/brushesBtn.png | Bin .../content/tabicons/colorpaletteBtn.png | Bin .../system}/fingerPaint/content/tabicons/eraser.png | Bin .../fingerPaint/content/tabicons/linewidthBtn.png | Bin .../content/tabicons/pointingfinger128px.png | Bin .../system}/fingerPaint/fingerPaint.js | 0 22 files changed, 2 insertions(+), 1 deletion(-) rename {script-archive => scripts/system}/fingerPaint/PaintWindow.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/CheckerBoard.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/ColorUtils.js (100%) rename {script-archive => scripts/system}/fingerPaint/content/ColorWheel.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/NumberBox.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/PanelBorder.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/VerticalSlider.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/Wheel.qml (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush1.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush2.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush3.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush4.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush5.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/brushes/paintbrush6.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/mathUtils.js (100%) rename {script-archive => scripts/system}/fingerPaint/content/tabicons/brushesBtn.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/tabicons/colorpaletteBtn.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/tabicons/eraser.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/tabicons/linewidthBtn.png (100%) rename {script-archive => scripts/system}/fingerPaint/content/tabicons/pointingfinger128px.png (100%) rename {script-archive => scripts/system}/fingerPaint/fingerPaint.js (100%) diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 81ce72d901..ce933da009 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -32,7 +32,8 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/tablet-ui/tabletUI.js" ]; var DEFAULT_SCRIPTS_SEPARATE = [ - "system/controllers/controllerScripts.js" + "system/controllers/controllerScripts.js", + "system/fingerPaint/fingerPaint.js" ]; // add a menu item for debugging diff --git a/script-archive/fingerPaint/PaintWindow.qml b/scripts/system/fingerPaint/PaintWindow.qml similarity index 100% rename from script-archive/fingerPaint/PaintWindow.qml rename to scripts/system/fingerPaint/PaintWindow.qml diff --git a/script-archive/fingerPaint/content/CheckerBoard.qml b/scripts/system/fingerPaint/content/CheckerBoard.qml similarity index 100% rename from script-archive/fingerPaint/content/CheckerBoard.qml rename to scripts/system/fingerPaint/content/CheckerBoard.qml diff --git a/script-archive/fingerPaint/content/ColorUtils.js b/scripts/system/fingerPaint/content/ColorUtils.js similarity index 100% rename from script-archive/fingerPaint/content/ColorUtils.js rename to scripts/system/fingerPaint/content/ColorUtils.js diff --git a/script-archive/fingerPaint/content/ColorWheel.qml b/scripts/system/fingerPaint/content/ColorWheel.qml similarity index 100% rename from script-archive/fingerPaint/content/ColorWheel.qml rename to scripts/system/fingerPaint/content/ColorWheel.qml diff --git a/script-archive/fingerPaint/content/NumberBox.qml b/scripts/system/fingerPaint/content/NumberBox.qml similarity index 100% rename from script-archive/fingerPaint/content/NumberBox.qml rename to scripts/system/fingerPaint/content/NumberBox.qml diff --git a/script-archive/fingerPaint/content/PanelBorder.qml b/scripts/system/fingerPaint/content/PanelBorder.qml similarity index 100% rename from script-archive/fingerPaint/content/PanelBorder.qml rename to scripts/system/fingerPaint/content/PanelBorder.qml diff --git a/script-archive/fingerPaint/content/VerticalSlider.qml b/scripts/system/fingerPaint/content/VerticalSlider.qml similarity index 100% rename from script-archive/fingerPaint/content/VerticalSlider.qml rename to scripts/system/fingerPaint/content/VerticalSlider.qml diff --git a/script-archive/fingerPaint/content/Wheel.qml b/scripts/system/fingerPaint/content/Wheel.qml similarity index 100% rename from script-archive/fingerPaint/content/Wheel.qml rename to scripts/system/fingerPaint/content/Wheel.qml diff --git a/script-archive/fingerPaint/content/brushes/paintbrush1.png b/scripts/system/fingerPaint/content/brushes/paintbrush1.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush1.png rename to scripts/system/fingerPaint/content/brushes/paintbrush1.png diff --git a/script-archive/fingerPaint/content/brushes/paintbrush2.png b/scripts/system/fingerPaint/content/brushes/paintbrush2.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush2.png rename to scripts/system/fingerPaint/content/brushes/paintbrush2.png diff --git a/script-archive/fingerPaint/content/brushes/paintbrush3.png b/scripts/system/fingerPaint/content/brushes/paintbrush3.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush3.png rename to scripts/system/fingerPaint/content/brushes/paintbrush3.png diff --git a/script-archive/fingerPaint/content/brushes/paintbrush4.png b/scripts/system/fingerPaint/content/brushes/paintbrush4.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush4.png rename to scripts/system/fingerPaint/content/brushes/paintbrush4.png diff --git a/script-archive/fingerPaint/content/brushes/paintbrush5.png b/scripts/system/fingerPaint/content/brushes/paintbrush5.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush5.png rename to scripts/system/fingerPaint/content/brushes/paintbrush5.png diff --git a/script-archive/fingerPaint/content/brushes/paintbrush6.png b/scripts/system/fingerPaint/content/brushes/paintbrush6.png similarity index 100% rename from script-archive/fingerPaint/content/brushes/paintbrush6.png rename to scripts/system/fingerPaint/content/brushes/paintbrush6.png diff --git a/script-archive/fingerPaint/content/mathUtils.js b/scripts/system/fingerPaint/content/mathUtils.js similarity index 100% rename from script-archive/fingerPaint/content/mathUtils.js rename to scripts/system/fingerPaint/content/mathUtils.js diff --git a/script-archive/fingerPaint/content/tabicons/brushesBtn.png b/scripts/system/fingerPaint/content/tabicons/brushesBtn.png similarity index 100% rename from script-archive/fingerPaint/content/tabicons/brushesBtn.png rename to scripts/system/fingerPaint/content/tabicons/brushesBtn.png diff --git a/script-archive/fingerPaint/content/tabicons/colorpaletteBtn.png b/scripts/system/fingerPaint/content/tabicons/colorpaletteBtn.png similarity index 100% rename from script-archive/fingerPaint/content/tabicons/colorpaletteBtn.png rename to scripts/system/fingerPaint/content/tabicons/colorpaletteBtn.png diff --git a/script-archive/fingerPaint/content/tabicons/eraser.png b/scripts/system/fingerPaint/content/tabicons/eraser.png similarity index 100% rename from script-archive/fingerPaint/content/tabicons/eraser.png rename to scripts/system/fingerPaint/content/tabicons/eraser.png diff --git a/script-archive/fingerPaint/content/tabicons/linewidthBtn.png b/scripts/system/fingerPaint/content/tabicons/linewidthBtn.png similarity index 100% rename from script-archive/fingerPaint/content/tabicons/linewidthBtn.png rename to scripts/system/fingerPaint/content/tabicons/linewidthBtn.png diff --git a/script-archive/fingerPaint/content/tabicons/pointingfinger128px.png b/scripts/system/fingerPaint/content/tabicons/pointingfinger128px.png similarity index 100% rename from script-archive/fingerPaint/content/tabicons/pointingfinger128px.png rename to scripts/system/fingerPaint/content/tabicons/pointingfinger128px.png diff --git a/script-archive/fingerPaint/fingerPaint.js b/scripts/system/fingerPaint/fingerPaint.js similarity index 100% rename from script-archive/fingerPaint/fingerPaint.js rename to scripts/system/fingerPaint/fingerPaint.js