Remote Connection UI (#954)

Mobsya · Nov 11, 2021 · 5fb2d40 · 5fb2d40
1 parent fa5a0ec
commit 5fb2d40
Show file tree

Hide file tree

Showing 9 changed files with 406 additions and 175 deletions.
diff --git a/aseba/launcher/src/assets/remote_access.svg b/aseba/launcher/src/assets/remote_access.svg
diff --git a/aseba/launcher/src/qml.qrc b/aseba/launcher/src/qml.qrc
@@ -38,6 +38,7 @@
         <file>assets/battery_mid.svg</file>
         <file>assets/battery_low.svg</file>
         <file>assets/dummy_node.svg</file>
+		<file>assets/remote_access.svg</file>
         <file>qml/BatteryIndicator.qml</file>
         <file>assets/selected_thymio.svg</file>
         <file>assets/selected_simulated_thymio.svg</file>
@@ -100,12 +101,13 @@
         <file>assets/multiple-thymio-one-dongle.svg</file>
         <file>assets/usb-cable-and-dongle.svg</file>
         <file>assets/one-thymio-one-dongle.svg</file>
-        <file>qml/wirelessconfigurator/Button.qml</file>
+        <file>qml/components/Button.qml</file>
         <file>assets/alert.svg</file>
         <file>qml/wirelessconfigurator/ChannelButton.qml</file>
         <file>qml/wirelessconfigurator/ChannelSelector.qml</file>
         <file>qml/wirelessconfigurator/NetworkIdInput.qml</file>
         <file>qml/wirelessconfigurator/WirelessWizardWarningDialog.qml</file>
-        <file>qml/RemoteConnectionDialog.qml</file>
+        <file>qml/remoteconnection/RemoteConnectionDialog.qml</file>
+		<file>qml/remoteconnection/TitleBar.qml</file>
     </qresource>
 </RCC>
diff --git a/aseba/launcher/src/qml/RemoteConnectionDialog.qml b/aseba/launcher/src/qml/RemoteConnectionDialog.qml
diff --git a/aseba/launcher/src/qml/SettingsMenu.qml b/aseba/launcher/src/qml/SettingsMenu.qml
@@ -37,7 +37,7 @@ Rectangle {
 
 
     function remoteConnectionDialog() {
-        var component = Qt.createComponent("qrc:/qml/RemoteConnectionDialog.qml");
+        var component = Qt.createComponent("qrc:/qml/remoteconnection/RemoteConnectionDialog.qml");
         var dialog = component.createObject(launcher);
 
        if (dialog === null) {

diff --git a/...r/src/qml/wirelessconfigurator/Button.qml → aseba/launcher/src/qml/components/Button.qml b/...r/src/qml/wirelessconfigurator/Button.qml → aseba/launcher/src/qml/components/Button.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 
 Rectangle {
-    property alias text: text.text
+    property alias text: text1.text
     property alias enabled: mouse_area.enabled
     signal clicked
     height: 40
@@ -10,7 +10,7 @@ Rectangle {
     color: mouse_area.containsMouse ? "#57c6ff" : "#0a9eeb"
     opacity: enabled ? 1 : 0.3
     Text {
-        id: text
+        id: text1
         font.family: "Roboto Bold"
         font.pointSize: 12
         color : "white"
@@ -27,4 +27,4 @@ Rectangle {
     Component.onCompleted: {
         mouse_area.clicked.connect(clicked)
     }
-}
+}