From 5c90e1ef078d42a4250dd07e6069bf6ef58c8f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Thu, 20 Aug 2015 01:15:08 +0200
Subject: [PATCH] Improved "time of day" UI

---
 .../modeler/quickapp/MainModelerWindow.cpp    |  54 ++++++++-
 .../modeler/quickapp/MainModelerWindow.h      |   6 +
 .../modeler/quickapp/qml/BaseChoice.qml       |   3 +-
 .../modeler/quickapp/qml/BaseChoiceItem.qml   |  21 +++-
 .../modeler/quickapp/qml/BasePanel.qml        |  15 ++-
 .../modeler/quickapp/qml/BaseRectangle.qml    |   1 -
 .../quickapp/qml/BaseSecondaryToolbar.qml     |  11 ++
 .../modeler/quickapp/qml/CameraChoice.qml     |  31 ++---
 .../modeler/quickapp/qml/ClickableImage.qml   |  15 +++
 .../quickapp/qml/PanelAtmosphereDaytime.qml   | 109 ++++++++++++++++--
 .../modeler/quickapp/qml/PanelWaterLevel.qml  |   3 +-
 .../modeler/quickapp/qml/Toolbar.qml          |  11 +-
 .../modeler/quickapp/qml/ToolbarButton.qml    |   1 +
 .../modeler/quickapp/qml/Tooltip.qml          |  21 +++-
 src/interface/modeler/quickapp/qml/app.qrc    |   9 ++
 .../quickapp/qml/images/arrow_down.png        | Bin 0 -> 229 bytes
 .../modeler/quickapp/qml/images/arrow_up.png  | Bin 0 -> 243 bytes
 .../modeler/quickapp/qml/images/icon_exit.png | Bin 0 -> 834 bytes
 .../quickapp/qml/images/icon_file_load.png    | Bin 0 -> 502 bytes
 .../quickapp/qml/images/icon_file_new.png     | Bin 0 -> 760 bytes
 .../quickapp/qml/images/icon_file_save.png    | Bin 0 -> 514 bytes
 .../modeler/quickapp/qml/images/tab_file.png  | Bin 0 -> 1589 bytes
 src/interface/modeler/quickapp/qml/main.qml   | 101 +++++++++-------
 23 files changed, 316 insertions(+), 96 deletions(-)
 create mode 100644 src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml
 create mode 100644 src/interface/modeler/quickapp/qml/ClickableImage.qml
 create mode 100644 src/interface/modeler/quickapp/qml/images/arrow_down.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/arrow_up.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/icon_exit.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/icon_file_load.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/icon_file_new.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/icon_file_save.png
 create mode 100644 src/interface/modeler/quickapp/qml/images/tab_file.png

diff --git a/src/interface/modeler/quickapp/MainModelerWindow.cpp b/src/interface/modeler/quickapp/MainModelerWindow.cpp
index fcf8fd1..c0ac81f 100644
--- a/src/interface/modeler/quickapp/MainModelerWindow.cpp
+++ b/src/interface/modeler/quickapp/MainModelerWindow.cpp
@@ -37,6 +37,24 @@ MainModelerWindow::MainModelerWindow()
     water = new WaterModeler(this);
 
     render_process = new RenderProcess(this, render_preview_provider);
+
+    // Bind file buttons
+    QObject *button_new = findQmlObject("tool_file_new");
+    if (button_new) {
+        connect(button_new, SIGNAL(clicked()), this, SLOT(newFile()));
+    }
+    QObject *button_save = findQmlObject("tool_file_save");
+    if (button_save) {
+        connect(button_save, SIGNAL(clicked()), this, SLOT(saveFile()));
+    }
+    QObject *button_load = findQmlObject("tool_file_load");
+    if (button_load) {
+        connect(button_load, SIGNAL(clicked()), this, SLOT(loadFile()));
+    }
+    QObject *button_exit = findQmlObject("tool_file_exit");
+    if (button_exit) {
+        connect(button_exit, SIGNAL(clicked()), this, SLOT(exit()));
+    }
 }
 
 MainModelerWindow::~MainModelerWindow()
@@ -76,6 +94,32 @@ void MainModelerWindow::setState(const QString &stateName)
     rootObject()->setProperty("state", stateName);
 }
 
+void MainModelerWindow::newFile()
+{
+    getScenery()->autoPreset();
+    renderer->reset();
+}
+
+void MainModelerWindow::saveFile()
+{
+    getScenery()->saveGlobal("saved.p3d");
+}
+
+void MainModelerWindow::loadFile()
+{
+    Scenery loaded;
+    if (loaded.loadGlobal("saved.p3d") == Scenery::FILE_OPERATION_OK)
+    {
+        loaded.copy(scenery);
+        renderer->reset();
+    }
+}
+
+void MainModelerWindow::exit()
+{
+    QGuiApplication::instance()->exit();
+}
+
 void MainModelerWindow::keyReleaseEvent(QKeyEvent *event)
 {
     if (getState() == "Render Dialog")
@@ -113,30 +157,28 @@ void MainModelerWindow::keyReleaseEvent(QKeyEvent *event)
         {
             if (event->modifiers() & Qt::ControlModifier)
             {
-                QGuiApplication::instance()->exit();
+                exit();
             }
         }
         else if (event->key() == Qt::Key_N)
         {
             if (event->modifiers() & Qt::ControlModifier)
             {
-                getScenery()->autoPreset();
-                renderer->reset();
+                newFile();
             }
         }
         else if (event->key() == Qt::Key_S)
         {
             if (event->modifiers() & Qt::ControlModifier)
             {
-                getScenery()->saveGlobal("saved.p3d");
+                saveFile();
             }
         }
         else if (event->key() == Qt::Key_L or event->key() == Qt::Key_O)
         {
             if (event->modifiers() & Qt::ControlModifier)
             {
-                getScenery()->loadGlobal("saved.p3d");
-                renderer->reset();
+                loadFile();
             }
         }
         else if (event->key() == Qt::Key_Z)
diff --git a/src/interface/modeler/quickapp/MainModelerWindow.h b/src/interface/modeler/quickapp/MainModelerWindow.h
index a48cf26..6f37fcb 100644
--- a/src/interface/modeler/quickapp/MainModelerWindow.h
+++ b/src/interface/modeler/quickapp/MainModelerWindow.h
@@ -25,6 +25,12 @@ public:
     inline OpenGLRenderer *getRenderer() const {return renderer;}
     inline ModelerCameras *getCamera() const {return cameras;}
 
+public slots:
+    void newFile();
+    void saveFile();
+    void loadFile();
+    void exit();
+
 protected:
     virtual void keyReleaseEvent(QKeyEvent *event) override;
 
diff --git a/src/interface/modeler/quickapp/qml/BaseChoice.qml b/src/interface/modeler/quickapp/qml/BaseChoice.qml
index f0ec228..df650f5 100644
--- a/src/interface/modeler/quickapp/qml/BaseChoice.qml
+++ b/src/interface/modeler/quickapp/qml/BaseChoice.qml
@@ -4,9 +4,8 @@ import QtQuick.Layouts 1.1
 
 Item {
     default property alias children : inner_layout.children
+    property alias spacing : inner_layout.spacing
     property int value
-    width: 100
-    height: 32
 
     ExclusiveGroup {
         id: choice_group
diff --git a/src/interface/modeler/quickapp/qml/BaseChoiceItem.qml b/src/interface/modeler/quickapp/qml/BaseChoiceItem.qml
index 7e87197..bafaf7b 100644
--- a/src/interface/modeler/quickapp/qml/BaseChoiceItem.qml
+++ b/src/interface/modeler/quickapp/qml/BaseChoiceItem.qml
@@ -7,18 +7,23 @@ Rectangle {
     property bool checked: false
     property ExclusiveGroup exclusiveGroup: null
     property int value
+    property int padding: 4
 
     color: "#333333"
+    radius: padding * 2
 
     signal toggled(bool value)
 
-    width: 20
-    height: 20
+    width: 40
+    height: 40
 
     Image {
-        anchors.fill: parent
+        id: icon_image
         source: parent.icon
-        antialiasing:  true
+        width: parent.width - 2 * parent.padding
+        height: parent.height - 2 * parent.padding
+        anchors.centerIn: parent
+        antialiasing: true
     }
 
     MouseArea {
@@ -35,6 +40,12 @@ Rectangle {
 
     onCheckedChanged: choice_item.toggled(checked)
 
+    Behavior on color {
+        PropertyAnimation {
+            duration: 200
+        }
+    }
+
     states: [
         State {
             name: "Checked"
@@ -42,7 +53,7 @@ Rectangle {
 
             PropertyChanges {
                 target: choice_item
-                color: "#999999"
+                color: "#dddddd"
             }
         }
 
diff --git a/src/interface/modeler/quickapp/qml/BasePanel.qml b/src/interface/modeler/quickapp/qml/BasePanel.qml
index 36652ae..6250d04 100644
--- a/src/interface/modeler/quickapp/qml/BasePanel.qml
+++ b/src/interface/modeler/quickapp/qml/BasePanel.qml
@@ -4,22 +4,21 @@ BaseRectangle {
     property ToolbarButton tool
     id: panel
 
-    enabled: false
     width: 200
-    height: parent.height - 100
-    color: "#a0909090"
+    height: primary_toolbar.current ? primary_toolbar.current.height : 10
+    color: "#40909090"
 
-    anchors.right: parent.right
-    anchors.verticalCenter: parent.verticalCenter
+    anchors.left: primary_toolbar.current ? primary_toolbar.current.right : parent.left
+    anchors.top: primary_toolbar.current ? primary_toolbar.current.top : parent.top
 
     states: [
         State {
-            name: "Active"
-            when: tool.selected
+            name: "hidden"
+            when: !tool.selected
 
             PropertyChanges {
                 target: panel
-                enabled: true
+                enabled: false
             }
         }
 
diff --git a/src/interface/modeler/quickapp/qml/BaseRectangle.qml b/src/interface/modeler/quickapp/qml/BaseRectangle.qml
index 956ccbb..c074bb7 100644
--- a/src/interface/modeler/quickapp/qml/BaseRectangle.qml
+++ b/src/interface/modeler/quickapp/qml/BaseRectangle.qml
@@ -10,4 +10,3 @@ Rectangle {
         }
     }
 }
-
diff --git a/src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml b/src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml
new file mode 100644
index 0000000..bd4670f
--- /dev/null
+++ b/src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+
+Toolbar {
+    enabled: false
+    height: parent.height - primary_toolbar.height
+    anchors.left: primary_toolbar.left
+    anchors.top: primary_toolbar.bottom
+
+    onEnabledChanged: primary_toolbar.current = this
+}
+
diff --git a/src/interface/modeler/quickapp/qml/CameraChoice.qml b/src/interface/modeler/quickapp/qml/CameraChoice.qml
index b8bdb57..ebbfbee 100644
--- a/src/interface/modeler/quickapp/qml/CameraChoice.qml
+++ b/src/interface/modeler/quickapp/qml/CameraChoice.qml
@@ -1,29 +1,22 @@
 import QtQuick 2.0
 
-BaseRectangle {
+Toolbar {
     id: camera_choice
-    width: 200
-    height: 50
+    horizontal: false
     color: "#90888888"
     objectName: "camera_choice"
 
-    Row {
-        id: inner_space
-        anchors.centerIn: parent
-        spacing: 15
+    ToolbarButton {
+        id: camera_choice_render
+        picture: "images/tab_display.png"
+        hovertext: qsTr("Final render camera")
+        selected: true
+    }
 
-        ToolbarButton {
-            id: camera_choice_render
-            picture: "images/tab_display.png"
-            hovertext: qsTr("Switch to the final camera")
-            selected: true
-        }
-
-        ToolbarButton {
-            id: camera_choice_topdown
-            picture: "images/display_topdown.png"
-            hovertext: qsTr("Switch to the top-down camera")
-        }
+    ToolbarButton {
+        id: camera_choice_topdown
+        picture: "images/display_topdown.png"
+        hovertext: qsTr("Top-down camera")
     }
 
     states: [
diff --git a/src/interface/modeler/quickapp/qml/ClickableImage.qml b/src/interface/modeler/quickapp/qml/ClickableImage.qml
new file mode 100644
index 0000000..a8c9291
--- /dev/null
+++ b/src/interface/modeler/quickapp/qml/ClickableImage.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+
+Image {
+    signal clicked()
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+
+        onClicked: {
+            parent.clicked();
+        }
+    }
+}
+
diff --git a/src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml b/src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml
index 00f680b..74f188c 100644
--- a/src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml
+++ b/src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml
@@ -3,10 +3,11 @@ import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
 BasePanel {
-    width: 70
+    id: daytime
+    width: 100
 
     objectName: "atmosphere_daytime"
-    default property real value: day_night.value == 2 ? 1.0 : slider.value * 0.54 + 0.23;
+    default property real value: day_night.value == 2 ? 0.0 : slider.value * 0.54 + 0.23;
     signal changed(real value)
 
     onValueChanged: {
@@ -20,15 +21,19 @@ BasePanel {
 
     ColumnLayout
     {
-        anchors.fill: parent
-        anchors.margins: 10
+        height: parent.height
+        anchors.horizontalCenter: parent.horizontalCenter
         spacing: 20
 
+        Item {height: 1}
+
         BaseChoice {
             id: day_night
-            width: parent.width
 
-            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.alignment: Qt.AlignHCenter
+            spacing: 10
+            width: 90
+            height: 40
 
             BaseChoiceItem {
                 icon: "images/icon_atmosphere_day.png"
@@ -47,7 +52,97 @@ BasePanel {
             Layout.maximumWidth: 15
             Layout.fillHeight: true
             Layout.alignment: Qt.AlignHCenter
-            visible: day_night.value == 1
         }
+
+        Grid {
+            id: clock
+            property int hour: daytime.value * 86400 / 3600
+            property int minute: (daytime.value * 86400 - 3600 * hour) / 60
+            property int second: daytime.value * 86400 - 3600 * hour - 60 * minute
+            rows: 3
+            columns: 5
+            rowSpacing: 4
+
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_up.png"
+                onClicked: slider.value += (1.0 / 24.0) / 0.54
+            }
+            Item {width: 1; height: 1}
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_up.png"
+                onClicked: slider.value += (1.0 / 3600.0) / 0.54
+            }
+            Item {width: 1; height: 1}
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_up.png"
+                onClicked: slider.value += (1.0 / 86400.0) / 0.54
+            }
+
+            Text {
+                text: (clock.hour > 9 ? "" : "0") + clock.hour.toString()
+                font.pixelSize: 14
+            }
+            Text {
+                text: " : "
+                font.pixelSize: 14
+            }
+            Text {
+                text: (clock.minute > 9 ? "" : "0") + clock.minute.toString()
+                font.pixelSize: 14
+            }
+            Text {
+                text: " : "
+                font.pixelSize: 14
+            }
+            Text {
+                text: (clock.second > 9 ? "" : "0") + clock.second.toString()
+                font.pixelSize: 14
+            }
+
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_down.png"
+                onClicked: slider.value -= (1.0 / 24.0) / 0.54
+            }
+            Item {width: 1; height: 1}
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_down.png"
+                onClicked: slider.value -= (1.0 / 1440.0) / 0.54
+            }
+            Item {width: 1; height: 1}
+            ClickableImage {
+                width: 20
+                height: 10
+                source: "qrc:/images/arrow_down.png"
+                onClicked: slider.value -= (1.0 / 86400.0) / 0.54
+            }
+        }
+
+        Item {height: 1}
     }
+
+    states: [
+        State {
+            name: "night"
+            when: day_night.value == 2
+            PropertyChanges {
+                target: slider
+                enabled: false
+            }
+            PropertyChanges {
+                target: clock
+                enabled: false
+            }
+        }
+
+    ]
 }
diff --git a/src/interface/modeler/quickapp/qml/PanelWaterLevel.qml b/src/interface/modeler/quickapp/qml/PanelWaterLevel.qml
index 90d4be0..74b084a 100644
--- a/src/interface/modeler/quickapp/qml/PanelWaterLevel.qml
+++ b/src/interface/modeler/quickapp/qml/PanelWaterLevel.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.2
 
 BasePanel {
-    width: 20
+    width: 40
 
     BaseSlider {
         objectName: "water_height"
@@ -9,5 +9,6 @@ BasePanel {
         maximumValue: 1
         orientation: Qt.Vertical
         anchors.fill: parent
+        anchors.margins: 10
     }
 }
diff --git a/src/interface/modeler/quickapp/qml/Toolbar.qml b/src/interface/modeler/quickapp/qml/Toolbar.qml
index 3e04d5e..ad5e73d 100644
--- a/src/interface/modeler/quickapp/qml/Toolbar.qml
+++ b/src/interface/modeler/quickapp/qml/Toolbar.qml
@@ -3,13 +3,16 @@ import QtQuick 2.0
 BaseRectangle {
 
     default property alias children : inner_space.children
-    width: 70
-    height: parent.height
+    property bool horizontal: false
+    width: horizontal ? parent.width : 60
+    height: horizontal ? 60 : parent.height
     color: "#50888888"
 
-    Column {
+    Grid {
         id: inner_space
-        spacing: (parent.height - children.length * tool_terrain.height) / (children.length + 1)
+        columns: parent.horizontal ? children.length : 1
+        rows: parent.horizontal ? 1 : children.length
+        spacing: (parent.horizontal ? (parent.width - children.length * tool_terrain.width) : (parent.height - children.length * tool_terrain.height)) / (children.length + 1)
         anchors.centerIn: parent
     }
 
diff --git a/src/interface/modeler/quickapp/qml/ToolbarButton.qml b/src/interface/modeler/quickapp/qml/ToolbarButton.qml
index ab7719f..cab0f34 100644
--- a/src/interface/modeler/quickapp/qml/ToolbarButton.qml
+++ b/src/interface/modeler/quickapp/qml/ToolbarButton.qml
@@ -59,6 +59,7 @@ Item {
         onEntered: {
             parent.hovered = true;
             tooltip_widget.hovertext = hovertext;
+            tooltip_widget.hovered = this;
         }
         onExited: {
             parent.hovered = false;
diff --git a/src/interface/modeler/quickapp/qml/Tooltip.qml b/src/interface/modeler/quickapp/qml/Tooltip.qml
index 05e1631..64b52c8 100644
--- a/src/interface/modeler/quickapp/qml/Tooltip.qml
+++ b/src/interface/modeler/quickapp/qml/Tooltip.qml
@@ -1,16 +1,31 @@
 import QtQuick 2.0
 
 BaseRectangle {
+    property var hovered
     property string helptext
     property string hovertext
-    width: content.width
-    height: content.height
+    width: content.width + 10
+    height: content.height + 10
+    enabled: content.deftext ? true : false
+    anchors.margins: 5
 
     color: "#99000000"
 
     Text {
         id: content
         color: "white"
-        text: parent.helptext || parent.hovertext
+        font.bold: true
+        font.pixelSize: 12
+        property string deftext: parent.helptext || parent.hovertext
+        property string oldtext
+        text: deftext || oldtext
+        anchors.centerIn: parent
+
+        onDeftextChanged: {
+            if (deftext)
+            {
+                oldtext = deftext;
+            }
+        }
     }
 }
diff --git a/src/interface/modeler/quickapp/qml/app.qrc b/src/interface/modeler/quickapp/qml/app.qrc
index 3b20493..db80c69 100644
--- a/src/interface/modeler/quickapp/qml/app.qrc
+++ b/src/interface/modeler/quickapp/qml/app.qrc
@@ -28,5 +28,14 @@
         <file>RenderDialog.qml</file>
         <file>CameraChoice.qml</file>
         <file>BaseRectangle.qml</file>
+        <file>BaseSecondaryToolbar.qml</file>
+        <file>images/icon_exit.png</file>
+        <file>images/icon_file_load.png</file>
+        <file>images/icon_file_new.png</file>
+        <file>images/icon_file_save.png</file>
+        <file>images/tab_file.png</file>
+        <file>images/arrow_down.png</file>
+        <file>images/arrow_up.png</file>
+        <file>ClickableImage.qml</file>
     </qresource>
 </RCC>
diff --git a/src/interface/modeler/quickapp/qml/images/arrow_down.png b/src/interface/modeler/quickapp/qml/images/arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c1365e876bc690c6cbf5a984e3372981df1fa5d
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^VnEE#!3HEB<l1KdDb50q$YKTtw|gMW*r#R`4HRTA
z@$_|Nzt17UCun-!*)<C&)Z*#l7-DfcIbnfdf=kkFBLf2q0|SFUOAqWR<>BEGzreay
zLPFwSa7S;!O^caK&f1)n&-o?W-YKiiDFI1LOn6bu#>SSGq?{<p$@Y4Z)Zy<P1}05&
zmLxkKxUhH1lFwx_ZFUPym^T^%4PD^2BZ=87qpdC2`1Sb~sa=!Bo}LnGJIKJGwls_J
TyL~!8&^-*Eu6{1-oD!M<gvm-L

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/arrow_up.png b/src/interface/modeler/quickapp/qml/images/arrow_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f6c8168a40fff303314bfd6bf021fc8497458bd
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^VnEE#!3HEB<l1KdDb50q$YKTtw|gMW*r#R`4HRTA
z@$_|Nzt17UC#Y@eQ^5%on&j!?7-Dhy?3In2%>e=p59O82ZXSx79dgk1j8>!r`-Y-M
zpM+#VcTdrRR*_@glbJayf6RN&Dfj1XxXkf`e9P`K<uWktnvn6yb*mDK6!Uudh=w!b
z>;5fZvZ=kWnepno?1#shbPgO9-5a^!+;6|elZ<i=&Ac{N3!?V7T+<GCo8?r@A7ZU3
mcJ_gC08@Uy@LaS15%TvrGAEqxoU{SxItEWyKbLh*2~7a26jbH_

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/icon_exit.png b/src/interface/modeler/quickapp/qml/images/icon_exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..136c54e2903ebd75b033620662b1cb3894630626
GIT binary patch
literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-yq6b%^z%4X!E0008vNkl<Zc-rloO=uHA6vuxF4Kbo%
zKQ8rP57iz-6g*WB3m&9Y@gj&Iig;2F#e?EW1QD@<ARavEMFd3=PomQ5MJRYv(MD4}
zs3_u15kH!wH6C_^B}}uko7rS0Gk*xlzPx$6@9leU-^{!P4-XFy4|kDiV(b8L2<S6J
zm!H5@;B_lb_6VpM`uPB4(^UR?iWmPEsA`ZilV%81fi6Yf|4M}wTmaqyCEyJ(E51uW
zS&X|4>~8W#6@a-YrmmPmmr2Gf0Mj9bN+J$FHF5DzG#Fqr@L0D2auQk}@ZG=!ucVuf
zWKp*HF_^`1cmsF?cmrrJt5s@?9l&$oC2-UxgLO-)u0rVlXTXXG86y%I$Ln~GXs8B9
z+YtgepcujPP(nMOpe8Xk2do61MwF<=<fClDIFF(Yi%F9V$0W2Vpki#f7{V_RpJA6@
z?85hnaG0p0UjWtv`^E7CV0))LRbEMw(O3dG)+Rw2?gOh`FN9_qBtN64j2U2qVsTS$
zpkyBS4D{M&fN|iWrgQZGZ-F73LZDmo`PPV>;Phl@3^?KXZ15bg$@S^*wCe^q<FWzn
z0jFFwKoQvKY7+bkth4Dc_)X)vegOTpRf3lYwy9J~;W-i8gOdL$CMvIDfEw^3hP*$E
z(1(EEuFeLx03TzH8R(P+kpl^242pcwk_C~tOJaH8VCXmpTn6SPyk~)HG3B2IPMUm&
zdnA@#D)E3DG3E9XG)m~~Hc4ektQJAbh#G%y44LD=mv*fa=-!N&1$HU&_7W_IZ?q}N
zHQE}B({Hqg^t;7ITkQcg1)k-iSQ@dV5YmZlz@&?XP@Z5NaMHw>PTK>9X}nR|u^x~G
z?wYQ=E)OWwO@h`E-6POZ9&ji0`<6}0C-H!)gtnES2e={<o++4DVM@DMx}8{pLKkb2
z5V&c9@<mc^;hn<V7bf1vxv|Z>GP4Rej9IVDTp?)L_wexW@bFN;Ke6jtRnM+()&Kwi
M07*qoM6N<$g2O;=Bme*a

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_load.png b/src/interface/modeler/quickapp/qml/images/icon_file_load.png
new file mode 100644
index 0000000000000000000000000000000000000000..0502784371ebe059c1f569c89bc1d2a3fd89c260
GIT binary patch
literal 502
zcmV<S0SW$zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000fw
z000fw0YWI7cmMzZ2XskIMF-yq6b%;>NmAKJ0004%Nkl<Zc-rlmKTE?v7{;H*q9}@s
zpy2qbgOlRoF8CD`!KssjAcB)_f`cG}gCD>}2S0+Vo8Ski&!7$+bW@>=f0hij)LMJ#
zoyk2v2;`Ex%jI`((zh2t2qA<JLI@#5e3ZIvXlCEaBu@cs^mx2gGn;8XNV4k=lMDy9
z>|w&Dv+gj7{Shc<)sdM^<xxQN5g-8)5D=0R(F!1W2%tvNq7y)J6~InfydyarjR2B!
z0M45ZzmQA{FM#A2fZHEVUl&>c$vyy2ZK^DiJSuVo+;>oCo8)@o1dzM{Fxg@CGm;C1
z5kPVaz{($+-T2B8k{;ju5`g0_o7YJ8=T<<P;9NO&^N{BVxXhrBagvo>tOvAMADC|u
z6(;~T+cX<7vse8almH2k011$QVhX7La{j}&fXqIPg~a94SjpkKpAGwiW>)uj!}|dC
z(&7Pt-O!If+4H22HfE1{2}(ft(0wNP?s42h|4qO^z)5@zb>X%2mmu`!v})v(2c%0@
svw<ey&CIH<d4Lc?2qA<JLWmgo0#rYY{C|;A7XSbN07*qoM6N<$f^(48O8@`>

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_new.png b/src/interface/modeler/quickapp/qml/images/icon_file_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..661ed4095f9fedb6ab84209a2ba229c8a76f9827
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-yq6b%~$W;7Fn0007)Nkl<Zc-rlnJ7`ov6o$Xu4dSXO
z2#Tnvg@}a@G(JMWM%36UDhR<Qg@v`LM8qyaDjNl@MH{hEi2?BuL?ozbOruuOA~q2b
zi6&#Q=i+$1BxF5v_s-t)!@%9y-E-&sa~|_JU@#aA27|$1Fq9IN|NQ?>U=QFF$8$3l
z@-B<w+U;>H1UO(;xy^{&Cq-9&b&3G3+4to=D>4DAya794lY-3N3=&2{D^gXGvrIuo
zJ;TMiffq3l5Hikm0WZr+KtjSk;8h6W9RXyX6VsiG^lJ-@^iI|rqd;fT3Frn+&$HMW
zY9iG+U^nm@*i~c##(<UcSinS+vS)!Ez(e3@Q3)83wops}!=hvswg4ODd2P|w0o!tT
z=M`^_Fjl545Ol0D5fB6+V!#Gqh0^4_2foEdz#wo!Nmh@f%%})>D%)C(v3-uw1+Gdf
zZ)7cd5bOi?DvfOrco!Q1J-|sNS$AS2;G$9tr~+?ebb)bc76i*mz%BGni4Vu<0^fnJ
z3UU?!KVwaUeHH^syb$UH)+tTS2rwBN0sX)!C0R#+N3jub7x<tcrv`lVKL7Hbm&=*M
zRI6Mk&ojXqaGUJQ*kK`~Z3$Qmd|~b@^=V*DyJmqQ{=Q?V0QXYv&_Tev!&X|rcK$8G
z7?tm?r}`amtd&7<t8zefz*+v(9woI*$u;~^uP=!Q$0Y#gZULGVB3Tt94!DqV1OMzH
z`Q7t8Ent$y!DrQ*g-~$7K^jNoQ^0*-Kd@Q)6Xc!}yJX|z0=AiymA#R7-^j3%{$`Y@
zC=gK(MDVoC>JqQ-6R;k5Am;DuQ3rms+g{~BMkdIrDC=$K4cnm%rF|mKlwsFe1J2W^
qA|02Ae+ixHG=srlFc=Jma^g4ha4MZZ(~Ca<0000<MNUMnLSTY5l0~cl

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_save.png b/src/interface/modeler/quickapp/qml/images/icon_file_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fadb03290b7a8b7bd37b033ae2ed9c8b06ae3db
GIT binary patch
literal 514
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#X$M%Ak65bF}ngN$X?><
z>&kwgLxfkHcXR9$Z3YI$g`O^sAr-gY&f4pJI6&lRzmi|q<Of>pb4m+V1Qirq^u6f$
zCnCnG<V*hwg-id~`Ofv}HSKtz@Ms;sR_xp*qK;em_9=Sg%wF=d<~e)$&XcwJmX-3~
z)fig@oH!Ig#B&KwX%C}<9>X-&18Mzcs}t89l@N|<*x16lp5ey3!acLTa7dKaa(OUt
zDln=vTt2dmS1Ng0Elb+`8JqfdyKb6k&B$<tL5H<x=f{sz8B9J~u%2?xNS^;BR_{8)
zr27nN$|e^TDyO}6osc4ZAgAL(`-W1-XJw4L8`iS%MC)8J^Z2CYu+TVlx&Ovb43l^n
zp4a-#R{j}w!=>X1U&HizzV#DpiWG&vc(?U=#92+`n*4{!;B8^-1e>x|VhTUG5*QEI
zp6qqH#>Cw5VaAiP<yiqtU}v_SF>P44weZhAhL=ZjwtwrsGH?0&<}EBQs&bePe3p;b
zNn>46T~q4Y*rVd~xlHBA$@DN*3&sx<j|gv$Zz|ucb|A59@ekXzeg2apzOZeWsbMbo
zlASa8j8((hDRK_%4!tSbr}%}Sp{Ll={D<LG>ih+jf(l~5_+#*N^>bP0l+XkKgi6cs

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/images/tab_file.png b/src/interface/modeler/quickapp/qml/images/tab_file.png
new file mode 100644
index 0000000000000000000000000000000000000000..9730761587a91a0880edcca01a8c56f5f8342bdc
GIT binary patch
literal 1589
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

literal 0
HcmV?d00001

diff --git a/src/interface/modeler/quickapp/qml/main.qml b/src/interface/modeler/quickapp/qml/main.qml
index 951e286..337a7b1 100644
--- a/src/interface/modeler/quickapp/qml/main.qml
+++ b/src/interface/modeler/quickapp/qml/main.qml
@@ -11,66 +11,58 @@ OpenGLView {
     Tooltip {
         id: tooltip_widget
 
-        anchors.top: parent.top
-        anchors.right: parent.right
+        anchors.top: primary_toolbar.bottom
+        anchors.right: primary_toolbar.right
     }
 
     Toolbar {
         id: primary_toolbar
+        horizontal:  true
         color: "#90888888"
+        property var current
 
+        anchors.top: parent.top
         anchors.left: parent.left
 
-        ToolbarButton {
-            id: tool_display
-            picture: "images/tab_display.png"
-            hovertext: qsTr("Display options")
-        }
         ToolbarButton {
             id: tool_terrain
             picture: "images/tab_terrain.png"
+            hovertext: qsTr("Terrain edition")
         }
         ToolbarButton {
             id: tool_textures
             picture: "images/tab_textures.png"
+            hovertext: qsTr("Terrain textures")
         }
         ToolbarButton {
             id: tool_water
             picture: "images/icon_water.png"
-            hovertext: "Water tools"
+            hovertext: qsTr("Water tools")
         }
         ToolbarButton {
             id: tool_atmosphere
             picture: "images/icon_atmosphere.png"
-            hovertext: "Atmosphere/weather tools"
+            hovertext: qsTr("Atmosphere/weather control")
         }
         ToolbarButton {
             id: tool_clouds
             picture: "images/tab_clouds.png"
+            hovertext: qsTr("Cloud layers")
         }
         ToolbarButton {
             id: tool_render
             picture: "images/tab_render.png"
+            hovertext: qsTr("Rendering")
         }
-    }
-
-    Toolbar {
-        id: display_toolbar
-        enabled: false
-        anchors.left: primary_toolbar.right
-
         ToolbarButton {
-            id: tool_display_topdown
-            picture: "images/display_topdown.png"
-            hovertext: qsTr("Top-down view")
-            helptext: qsTr("Drag the mouse on the map to change the viewpoint.")
+            id: tool_file
+            picture: "images/tab_file.png"
+            hovertext: qsTr("File")
         }
     }
 
-    Toolbar {
+    BaseSecondaryToolbar {
         id: water_toolbar
-        enabled: false
-        anchors.left: primary_toolbar.right
 
         ToolbarButton {
             id: tool_water_level
@@ -79,10 +71,8 @@ OpenGLView {
         }
     }
 
-    Toolbar {
+    BaseSecondaryToolbar {
         id: atmosphere_toolbar
-        enabled: false
-        anchors.left: primary_toolbar.right
 
         ToolbarButton {
             id: tool_atmosphere_daytime
@@ -91,10 +81,8 @@ OpenGLView {
         }
     }
 
-    Toolbar {
+    BaseSecondaryToolbar {
         id: render_toolbar
-        enabled: false
-        anchors.left: primary_toolbar.right
 
         ToolbarButton {
             id: tool_render_quick
@@ -104,10 +92,43 @@ OpenGLView {
         }
     }
 
+    BaseSecondaryToolbar {
+        id: file_toolbar
+
+        ToolbarButton {
+            id: tool_file_new
+            objectName: "tool_file_new"
+            picture: "images/icon_file_new.png"
+            hovertext: qsTr("Generate a new scene")
+        }
+
+        ToolbarButton {
+            id: tool_file_save
+            objectName: "tool_file_save"
+            picture: "images/icon_file_save.png"
+            hovertext: qsTr("Save the current scene to a file")
+        }
+
+        ToolbarButton {
+            id: tool_file_load
+            objectName: "tool_file_load"
+            picture: "images/icon_file_load.png"
+            hovertext: qsTr("Load a scene from a file")
+        }
+
+        ToolbarButton {
+            id: tool_file_exit
+            objectName: "tool_file_exit"
+            picture: "images/icon_exit.png"
+            hovertext: qsTr("Exit the program")
+        }
+    }
+
     CameraChoice {
         id: camera_choice
-        anchors.bottom: main_ui.bottom
-        anchors.horizontalCenter: main_ui.horizontalCenter
+        height: 150
+        anchors.right: main_ui.right
+        anchors.verticalCenter: main_ui.verticalCenter
     }
 
     RenderDialog {
@@ -126,15 +147,6 @@ OpenGLView {
     }
 
     states: [
-        State {
-            name: "Display Mode"
-            when: tool_display.selected
-
-            PropertyChanges {
-                target: display_toolbar
-                enabled: true
-            }
-        },
         State {
             name: "Water Mode"
             when: tool_water.selected
@@ -162,6 +174,15 @@ OpenGLView {
                 enabled: true
             }
         },
+        State {
+            name: "File Mode"
+            when: tool_file.selected
+
+            PropertyChanges {
+                target: file_toolbar
+                enabled: true
+            }
+        },
         State {
             name: "Render Dialog"