diff --git a/aseba/launcher/src/apps/other/desc.de.html b/aseba/launcher/src/apps/other/desc.de.html new file mode 100644 index 000000000..28ed2b590 --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.de.html @@ -0,0 +1,63 @@ + + + + + + + + + +

Mit Thymio Suite können Sie sich mit anderen Tools verbinden

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/desc.en.html b/aseba/launcher/src/apps/other/desc.en.html new file mode 100644 index 000000000..006a1078b --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.en.html @@ -0,0 +1,63 @@ + + + + + + + + + +

With Thymio Suite you can connect with other tools

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/desc.fr.html b/aseba/launcher/src/apps/other/desc.fr.html new file mode 100644 index 000000000..b9bbb9036 --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.fr.html @@ -0,0 +1,63 @@ + + + + + + + + + +

Avec Thymio Suite, vous pouvez vous connecter à d'autres outils

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/desc.it.html b/aseba/launcher/src/apps/other/desc.it.html new file mode 100644 index 000000000..98eb37434 --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.it.html @@ -0,0 +1,63 @@ + + + + + + + + + +

Con Thymio Suite è possibile connettersi con altri strumenti

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/desc.pl.html b/aseba/launcher/src/apps/other/desc.pl.html new file mode 100644 index 000000000..4787a38e5 --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.pl.html @@ -0,0 +1,63 @@ + + + + + + + + + +

With Thymio Suite you can connect with other tools

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/desc.zh-CN.html b/aseba/launcher/src/apps/other/desc.zh-CN.html new file mode 100644 index 000000000..f5fccfc4f --- /dev/null +++ b/aseba/launcher/src/apps/other/desc.zh-CN.html @@ -0,0 +1,63 @@ + + + + + + + + + +

With Thymio Suite you can connect with other tools

+ +

Find tips and more information clicking on the help (?) button.

+

Visit www.thymio.org. +

+ + + + diff --git a/aseba/launcher/src/apps/other/description.jpg b/aseba/launcher/src/apps/other/description.jpg new file mode 100644 index 000000000..6909423c2 Binary files /dev/null and b/aseba/launcher/src/apps/other/description.jpg differ diff --git a/aseba/launcher/src/apps/other/launcher-icon-other.svg b/aseba/launcher/src/apps/other/launcher-icon-other.svg new file mode 100644 index 000000000..3a3a0fd6d --- /dev/null +++ b/aseba/launcher/src/apps/other/launcher-icon-other.svg @@ -0,0 +1,79 @@ + +image/svg+xml + + + + diff --git a/aseba/launcher/src/apps/other/studio-animated-icon.webp b/aseba/launcher/src/apps/other/studio-animated-icon.webp new file mode 100644 index 000000000..e16f7111e Binary files /dev/null and b/aseba/launcher/src/apps/other/studio-animated-icon.webp differ diff --git a/aseba/launcher/src/qml.qrc b/aseba/launcher/src/qml.qrc index f672d3790..a244de95a 100644 --- a/aseba/launcher/src/qml.qrc +++ b/aseba/launcher/src/qml.qrc @@ -21,7 +21,6 @@ apps/blockly/blockly-animated-icon.webp apps/studio/studio-animated-icon.webp apps/vpl/vpl-animated-icon.webp - apps/vpl3/vpl3-animated-icon.webp main.cpp apps/scratch/scratch-animated-icon.webp @@ -38,7 +37,7 @@ assets/battery_mid.svg assets/battery_low.svg assets/dummy_node.svg - assets/remote_access.svg + assets/remote_access.svg qml/BatteryIndicator.qml assets/selected_thymio.svg assets/selected_simulated_thymio.svg @@ -86,7 +85,7 @@ apps/scratch/desc.de.html apps/blockly/desc.de.html apps/studio/desc.de.html - apps/vpl/desc.pl.html + apps/vpl/desc.pl.html apps/vpl3/desc.pl.html apps/scratch/desc.pl.html apps/blockly/desc.pl.html @@ -108,6 +107,15 @@ qml/wirelessconfigurator/NetworkIdInput.qml qml/wirelessconfigurator/WirelessWizardWarningDialog.qml qml/remoteconnection/RemoteConnectionDialog.qml - qml/remoteconnection/TitleBar.qml + qml/remoteconnection/TitleBar.qml + apps/other/desc.de.html + apps/other/desc.en.html + apps/other/desc.fr.html + apps/other/desc.it.html + apps/other/desc.pl.html + apps/other/desc.zh-CN.html + apps/other/description.jpg + apps/other/launcher-icon-other.svg + apps/other/studio-animated-icon.webp diff --git a/aseba/launcher/src/qml/Applications.qml b/aseba/launcher/src/qml/Applications.qml index eb7307134..f32f4e566 100644 --- a/aseba/launcher/src/qml/Applications.qml +++ b/aseba/launcher/src/qml/Applications.qml @@ -167,6 +167,21 @@ ListModel { helpUrl: "https://www.thymio.org/%1/program/aseba/", isIosSupported:false, isAndroidSupported:false + }, + + { + appId:"other", + name: "Other...", + animatedIcon:"qrc:/apps/other/launcher-icon-other.svg", + icon: "qrc:/apps/other/launcher-icon-other.svg", + descriptionImage: "qrc:/apps/other/description.jpg", + descriptionTextFile: "qrc:/apps/other/desc.%1.html", + supportsGroups: true, + supportsWatchMode: false, + supportsNonThymioDevices: true, + helpUrl: "https://www.thymio.org/%1/program/aseba/", + isIosSupported:false, + isAndroidSupported:false } ] diff --git a/aseba/launcher/src/qml/ThymioSelectionView.qml b/aseba/launcher/src/qml/ThymioSelectionView.qml index d3f8fcfe5..e662a59e8 100644 --- a/aseba/launcher/src/qml/ThymioSelectionView.qml +++ b/aseba/launcher/src/qml/ThymioSelectionView.qml @@ -34,6 +34,13 @@ Item { return false } + function isAppNotOther(){ + if(launcher.selectedApp.appId == "other") + return false; + else + return true; + } + function launchSelectedAppWithSelectedDevice() { const device = selection_view.selectedDevice const selectedAppLauncher = launcher.selectedAppLauncher; @@ -278,7 +285,7 @@ Item { anchors.bottom: parent.bottom anchors.topMargin: Style.window_margin anchors.bottomMargin: 30 - + visible:isAppNotOther() color: mouse_area.containsMouse ? "#57c6ff" : "#0a9eeb" opacity: isSelectedDeviceReady() ? 1.0 : 0.3 Text {