diff options
Diffstat (limited to 'launcher')
30 files changed, 460 insertions, 58 deletions
diff --git a/launcher/qml/AnimationBar.qml b/launcher/qml/AnimationBar.qml new file mode 100644 index 0000000..0495c4d --- /dev/null +++ b/launcher/qml/AnimationBar.qml @@ -0,0 +1,85 @@ +import QtQuick 2.0 + +Image { + id: root + width: 1080 + height: 70 + source: './images/Screentransition_bar.png' + state: 'release' + property int index: 0 + + ListModel { + id: model + ListElement { + name: "0" + picturePath: './images/BG_undericon2.svg' + } + ListElement { + name: "1" + picturePath: './images/BG_undericon1.svg' + } + ListElement { + name: "2" + picturePath: './images/BG_undericon3.svg' + } + ListElement { + name: "3" + picturePath: './images/BG_undericon4.svg' + } + } + + Timer { + id: animationTimer + interval: 250 + running: false + repeat: true + onTriggered: { + if (index < model.count) { + aniImage.source = model.get(index).picturePath + index++; + if (index == model.count) + index = 0 + } + } + } + + Image { + id: aniImage + anchors.centerIn: parent + } + + function startAnimationTimer() { + animationTimer.restart() + console.log("animationTimer.start()") + } + + function stopAnimationTimer() { + animationTimer.stop() + console.log("animationTimer.stop()") + } + + states: [ + State { + name: 'release' + PropertyChanges { + target: root + y: 1704 + } + }, + State { + name: 'press' + PropertyChanges { + target: root + y: 1634 + } + } + ] + transitions: Transition { + NumberAnimation { + target: root + property: 'y' + easing.type: 'OutQuad' + duration: 450 + } + } +} diff --git a/launcher/qml/BottomShortcutArea.qml b/launcher/qml/BottomShortcutArea.qml new file mode 100644 index 0000000..c843971 --- /dev/null +++ b/launcher/qml/BottomShortcutArea.qml @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import QtQuick 2.0 +import QtQuick.Layouts 1.1 +import QtQuick.Controls 2.1 + +Image { + id: root + width: 1080 + height: 215 + source: './images/Screentransition_Background.png' + + Item { + id: meterDisplay + x: 0 + y: 0 + width: 295 + height: 215 + Image { + anchors.centerIn: parent + source: './images/shotcuticon_meter.svg' + } + } + Item { + id: hud + anchors.left: meterDisplay.right + anchors.top: meterDisplay.top + width: 295 + height: 215 + Image { + anchors.centerIn: parent + source: './images/shotcuticon_hud.svg' + } + } + Item { + id: rse + anchors.left: hud.right + anchors.top: hud.top + width: 295 + height: 215 + Image { + anchors.centerIn: parent + source: './images/shotcuticon_rse.svg' + } + } + Item { + id: uninstall + anchors.left: rse.right + anchors.top: rse.top + width: 185 + height: 215 + Image { + anchors.centerIn: parent + source: './images/shotcuticon_dustbox.svg' + } + } +} diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml index 4b1971a..9992ac3 100644 --- a/launcher/qml/Launcher.qml +++ b/launcher/qml/Launcher.qml @@ -25,6 +25,7 @@ ApplicationWindow { height: container.height * container.scale property int pid: -1 + property bool isLongPress: false Item { id: container @@ -34,6 +35,11 @@ ApplicationWindow { // scale: screenInfo.scale_factor() Image { + anchors.fill: parent + source: './images/background.png' + } + + Image { id: topshortcutArea x: 197 y: 0 @@ -45,42 +51,17 @@ ApplicationWindow { } } - Image { - id: meterDisplay + AnimationBar { + id: animationbar x: 0 y: 1704 - width: 270 - height: 215 - source: './images/meterdisplay.png' - } - Image { - id: hud - anchors.left: meterDisplay.right - anchors.top: meterDisplay.top - width: 270 - height: 215 - source: './images/hud.png' - } - Image { - id: rse - anchors.left: hud.right - anchors.top: hud.top - width: 270 - height: 215 - source: './images/rse.png' - } - Image { - id: uninstall - anchors.left: rse.right - anchors.top: rse.top - width: 270 - height: 215 - source: './images/uninstall.png' + state: 'release' } - Image { - anchors.fill: parent - source: './images/background.png' + BottomShortcutArea { + id: bottomshortcutarea + x: 0 + y: 1704 } GridView { @@ -135,6 +116,9 @@ ApplicationWindow { currentId = applicationModel.id(newIndex = index) currentName = applicationModel.name(loc.index) homescreenHandler.hideWindow("homescreen") + animationbar.state = 'press' + animationbar.startAnimationTimer() + isLongPress = true } onReleased: { if (currentId === '' && loc.index >= 0 ) { @@ -151,15 +135,15 @@ ApplicationWindow { applicationModel.move(newIndex, newIndex = oldIndex) } } else if (loc.mouseY >= 1488) { - if (loc.mouseX < 270 ) { + if (loc.mouseX < 295 ) { console.log("sendAppToMeter", currentId) homescreenHandler.sendAppToMeter(currentId) - } else if (loc.mouseX >= 270 && loc.mouseX < 540 ) { + } else if (loc.mouseX >= 295 && loc.mouseX < 590 ) { console.log("sendAppToHud", currentId) homescreenHandler.sendAppToHud(currentId) - } else if (loc.mouseX >= 540 && loc.mouseX < 810 ) { + } else if (loc.mouseX >= 590 && loc.mouseX < 885 ) { - } else if (loc.mouseX >= 810) { + } else if (loc.mouseX >= 885) { uninstallDialog.contents = 'Do you want to uninstall ' + currentName.toUpperCase() + '?' uninstallDialog.uninstallApp = currentId uninstallDialog.visible = true @@ -172,7 +156,12 @@ ApplicationWindow { currentName = '' currentId = '' - homescreenHandler.tapShortcut("homescreen") + if (isLongPress) { + homescreenHandler.tapShortcut("homescreen") + isLongPress = false + animationbar.state = 'release' + animationbar.stopAnimationTimer() + } } onPositionChanged: { if (loc.currentId === '') return diff --git a/launcher/qml/TopShortcutIcon.qml b/launcher/qml/TopShortcutIcon.qml index 7ece370..6e86298 100644 --- a/launcher/qml/TopShortcutIcon.qml +++ b/launcher/qml/TopShortcutIcon.qml @@ -54,16 +54,16 @@ MouseArea { cached: true } } - Label { - id: name - y: 160 - width: root.width - 10 - font.pixelSize: 15 - font.letterSpacing: 5 - // wrapMode: Text.WordWrap - anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - color: "white" - text: qsTr(root.name).toUpperCase() - } +// Label { +// id: name +// y: 160 +// width: root.width - 10 +// font.pixelSize: 15 +// font.letterSpacing: 5 +// // wrapMode: Text.WordWrap +// anchors.horizontalCenter: parent.horizontalCenter +// horizontalAlignment: Text.AlignHCenter +// color: "white" +// text: qsTr(root.name).toUpperCase() +// } } diff --git a/launcher/qml/UninstallDialog.qml b/launcher/qml/UninstallDialog.qml index 4229525..1169d9f 100644 --- a/launcher/qml/UninstallDialog.qml +++ b/launcher/qml/UninstallDialog.qml @@ -79,7 +79,7 @@ Item { spacing: 10 Image { id: dsp_mark - source: './images/uninstall.png' + source: './images/shotcuticon_dustbox.svg' Layout.maximumHeight: 120 Layout.maximumWidth: 120 } diff --git a/launcher/qml/images/BG_undericon1.svg b/launcher/qml/images/BG_undericon1.svg new file mode 100644 index 0000000..5625367 --- /dev/null +++ b/launcher/qml/images/BG_undericon1.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 54"><defs><linearGradient id="名称未設定グラデーション_23" x1="7.74" y1="35.55" x2="59.74" y2="35.55" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#39cdea"/><stop offset="0.18" stop-color="#52d6ee"/><stop offset="0.44" stop-color="#7de4f5"/><stop offset="0.67" stop-color="#9ceffb"/><stop offset="0.86" stop-color="#aff6fe"/><stop offset="1" stop-color="#b6f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_23-2" x1="7.69" y1="18.55" x2="59.69" y2="18.55" xlink:href="#名称未設定グラデーション_23"/></defs><title>アセット 4</title><g style="isolation:isolate"><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_2-2" data-name="レイヤー 2"><image width="67" height="54" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2041.png" style="mix-blend-mode:screen"/><image width="56" height="43" transform="translate(5.43 5.43)" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2042.png" style="mix-blend-mode:screen"/><polygon points="33.91 41.55 7.74 24.8 7.74 29.55 33.91 46.3 59.74 29.77 59.74 25.02 33.91 41.55" style="fill:url(#名称未設定グラデーション_23)"/><polygon points="33.86 24.55 7.69 7.8 7.69 12.55 33.86 29.3 59.69 12.77 59.69 8.02 33.86 24.55" style="fill:url(#名称未設定グラデーション_23-2)"/></g></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/BG_undericon2.svg b/launcher/qml/images/BG_undericon2.svg new file mode 100644 index 0000000..e665e48 --- /dev/null +++ b/launcher/qml/images/BG_undericon2.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 54"><defs><linearGradient id="名称未設定グラデーション_23" x1="7.78" y1="18.55" x2="59.78" y2="18.55" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#39cdea"/><stop offset="0.18" stop-color="#52d6ee"/><stop offset="0.44" stop-color="#7de4f5"/><stop offset="0.67" stop-color="#9ceffb"/><stop offset="0.86" stop-color="#aff6fe"/><stop offset="1" stop-color="#b6f8ff"/></linearGradient></defs><title>アセット 3</title><g style="isolation:isolate"><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_2-2" data-name="レイヤー 2"><image width="67" height="54" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2031.png" style="mix-blend-mode:screen"/><image width="56" height="43" transform="translate(5.43 5.43)" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2032.png" style="mix-blend-mode:screen"/><polygon points="34 41.55 7.83 24.8 7.83 29.55 34 46.3 59.83 29.77 59.83 25.02 34 41.55"/><polygon points="33.95 24.55 7.78 7.8 7.78 12.55 33.95 29.3 59.78 12.77 59.78 8.02 33.95 24.55" style="fill:url(#名称未設定グラデーション_23)"/></g></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/BG_undericon3.svg b/launcher/qml/images/BG_undericon3.svg new file mode 100644 index 0000000..d382c0e --- /dev/null +++ b/launcher/qml/images/BG_undericon3.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 54"><defs><linearGradient id="名称未設定グラデーション_23" x1="7.04" y1="35.55" x2="59.04" y2="35.55" gradientUnits="userSpaceOnUse"><stop offset="0.05" stop-color="#39cdea"/><stop offset="0.18" stop-color="#52d6ee"/><stop offset="0.44" stop-color="#7de4f5"/><stop offset="0.67" stop-color="#9ceffb"/><stop offset="0.86" stop-color="#aff6fe"/><stop offset="1" stop-color="#b6f8ff"/></linearGradient></defs><title>アセット 2</title><g style="isolation:isolate"><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_2-2" data-name="レイヤー 2"><image width="67" height="54" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2021.png" style="mix-blend-mode:screen"/><image width="56" height="43" transform="translate(5.43 5.43)" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2022.png" style="mix-blend-mode:screen"/><polygon points="33.2 41.55 7.04 24.8 7.04 29.55 33.2 46.3 59.03 29.77 59.03 25.02 33.2 41.55" style="fill:url(#名称未設定グラデーション_23)"/><polygon points="33.15 24.55 6.99 7.8 6.99 12.55 33.15 29.3 58.98 12.77 58.98 8.02 33.15 24.55"/></g></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/BG_undericon4.svg b/launcher/qml/images/BG_undericon4.svg new file mode 100644 index 0000000..82f3128 --- /dev/null +++ b/launcher/qml/images/BG_undericon4.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 67 54"><title>アセット 1</title><g style="isolation:isolate"><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_2-2" data-name="レイヤー 2"><image width="67" height="54" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2011.png" style="mix-blend-mode:screen"/><image width="56" height="43" transform="translate(5.43 5.43)" xlink:href="%E3%82%A2%E3%82%BB%E3%83%83%E3%83%88%2012.png" style="mix-blend-mode:screen"/><polygon points="33.56 41.55 7.39 24.8 7.39 29.55 33.56 46.3 59.39 29.77 59.39 25.02 33.56 41.55"/><polygon points="33.51 24.55 7.34 7.8 7.34 12.55 33.51 29.3 59.34 12.77 59.34 8.02 33.51 24.55"/></g></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/Screentransition_Background.png b/launcher/qml/images/Screentransition_Background.png Binary files differnew file mode 100644 index 0000000..40da79d --- /dev/null +++ b/launcher/qml/images/Screentransition_Background.png diff --git a/launcher/qml/images/Screentransition_bar.png b/launcher/qml/images/Screentransition_bar.png Binary files differnew file mode 100644 index 0000000..323217e --- /dev/null +++ b/launcher/qml/images/Screentransition_bar.png diff --git a/launcher/qml/images/TopShortcut/error.svg b/launcher/qml/images/TopShortcut/error.svg new file mode 100644 index 0000000..40bd0d6 --- /dev/null +++ b/launcher/qml/images/TopShortcut/error.svg @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Home" + x="0px" + y="0px" + viewBox="0 0 195 216.8" + style="enable-background:new 0 0 195 216.8;" + xml:space="preserve" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="sdl_usb.svg"><metadata + id="metadata61"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs + id="defs59" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1018" + id="namedview57" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="1.0885609" + inkscape:cx="18.255591" + inkscape:cy="102.46209" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="Home"><sodipodi:guide + position="52.936865,144.9161" + orientation="0,1" + id="guide4189" + inkscape:locked="false" /><sodipodi:guide + position="66.027543,153.29873" + orientation="1,0" + id="guide4191" + inkscape:locked="false" /><sodipodi:guide + position="34.449153,79.00339" + orientation="0,1" + id="guide4193" + inkscape:locked="false" /><sodipodi:guide + position="132.05509,117.35678" + orientation="1,0" + id="guide4195" + inkscape:locked="false" /><sodipodi:guide + position="98.9839,162.94449" + orientation="1,0" + id="guide4266" + inkscape:locked="false" /><sodipodi:guide + position="67.290679,111.95975" + orientation="0,1" + id="guide4268" + inkscape:locked="false" /></sodipodi:namedview><style + type="text/css" + id="style3"> + .st0{fill:#FFFFFF;} + .st1{font-family:'Roboto-Regular';} + .st2{font-size:11px;} + .st3{letter-spacing:2;} + .st4{fill:url(#SVGID_1_);} + .st5{fill:url(#SVGID_2_);} + .st6{fill:url(#SVGID_3_);} + .st7{fill:url(#SVGID_4_);} + .st8{fill:url(#SVGID_5_);} +</style><g + transform="matrix(0.73220686,0,0,0.73062098,-97.908664,-35.236849)" + id="g136"><title + id="title133">Layer 1</title><path + style="fill:#ffffff;fill-opacity:0;stroke:#00ffff;stroke-width:4.5" + inkscape:connector-curvature="0" + id="svg_2" + d="m 268.92716,136.56016 c -28.99096,0.0124 -52.48549,23.50697 -52.49792,52.50207 0,28.99511 23.50282,52.48964 52.49792,52.49793 28.99097,-0.008 52.4855,-23.50282 52.49379,-52.49378 -0.004,-28.99925 -23.49868,-52.50622 -52.49379,-52.50622 z m 40.05429,52.50207 c -0.0124,8.05397 -2.41661,15.53591 -6.5037,21.81991 l -55.37049,-55.36221 c 6.27985,-4.09538 13.76179,-6.50369 21.82405,-6.52027 22.11835,0.0456 40.01283,17.94422 40.05014,40.06257 z m -80.11686,0 c 0.0166,-8.05397 2.42075,-15.54419 6.52028,-21.82819 l 55.35805,55.36635 c -6.284,4.08708 -13.76179,6.49125 -21.8199,6.50369 -22.11421,-0.0207 -40.01283,-17.9235 -40.05843,-40.04185 z" /></g></svg> diff --git a/launcher/qml/images/TopShortcut/error_active.svg b/launcher/qml/images/TopShortcut/error_active.svg new file mode 100644 index 0000000..ddbc722 --- /dev/null +++ b/launcher/qml/images/TopShortcut/error_active.svg @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:i="&#38;#38;ns_ai;" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Home" + x="0px" + y="0px" + viewBox="0 0 195 216.8" + style="enable-background:new 0 0 195 216.8;" + xml:space="preserve" + sodipodi:docname="sdl_usb_active.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata + id="metadata3773"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs + id="defs3771" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="1002" + id="namedview3769" + showgrid="false" + inkscape:zoom="3.8560885" + inkscape:cx="97.5" + inkscape:cy="108.4" + inkscape:window-x="1912" + inkscape:window-y="48" + inkscape:window-maximized="1" + inkscape:current-layer="g3764" /> +<style + type="text/css" + id="style3750"> + .st0{fill:#0DF9FF;} + .st1{fill:url(#Active_2_1_);} + .st2{fill:#FFFFFF;} + .st3{font-family:'Roboto-Regular';} + .st4{font-size:11px;} + .st5{letter-spacing:2;} + .st6{fill:url(#SVGID_1_);} + .st7{fill:url(#SVGID_2_);} + .st8{fill:url(#SVGID_3_);} + .st9{fill:url(#SVGID_4_);} + .st10{fill:url(#SVGID_5_);} +</style> +<switch + id="switch3766"> + <g + i:extraneous="self" + id="g3764"> + <rect + id="Active_1" + y="214.3" + transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 195.8833 431.0468)" + class="st0" + width="195.9" + height="2.4" /> + <linearGradient + id="Active_2_1_" + gradientUnits="userSpaceOnUse" + x1="97.9416" + y1="236.9585" + x2="97.9416" + y2="-68.5304"> + <stop + offset="0" + style="stop-color:#0DF9FF" + id="stop3753" /> + <stop + offset="9.208472e-02" + style="stop-color:#0DF9FF;stop-opacity:0.853" + id="stop3755" /> + <stop + offset="0.6264" + style="stop-color:#0DF9FF;stop-opacity:0" + id="stop3757" /> + </linearGradient> + <rect + id="Active_2" + class="st1" + width="195.9" + height="214.3" /> + + <g + transform="matrix(0.73220686,0,0,0.73062098,-97.9088,-35.236884)" + id="g136"><title + id="title133">Layer 1</title><path + style="fill:#ffffff;fill-opacity:0;stroke:#00ffff;stroke-width:4.5;" + inkscape:connector-curvature="0" + id="svg_2" + d="m 268.92716,136.56016 c -28.99096,0.0124 -52.48549,23.50697 -52.49792,52.50207 0,28.99511 23.50282,52.48964 52.49792,52.49793 28.99097,-0.008 52.4855,-23.50282 52.49379,-52.49378 -0.004,-28.99925 -23.49868,-52.50622 -52.49379,-52.50622 z m 40.05429,52.50207 c -0.0124,8.05397 -2.41661,15.53591 -6.5037,21.81991 l -55.37049,-55.36221 c 6.27985,-4.09538 13.76179,-6.50369 21.82405,-6.52027 22.11835,0.0456 40.01283,17.94422 40.05014,40.06257 z m -80.11686,0 c 0.0166,-8.05397 2.42075,-15.54419 6.52028,-21.82819 l 55.35805,55.36635 c -6.284,4.08708 -13.76179,6.49125 -21.8199,6.50369 -22.11421,-0.0207 -40.01283,-17.9235 -40.05843,-40.04185 z" /></g></g> +</switch> +</svg> diff --git a/launcher/qml/images/TopShortcut/topshortcut.qrc b/launcher/qml/images/TopShortcut/topshortcut.qrc index d654bf2..8ca887b 100644 --- a/launcher/qml/images/TopShortcut/topshortcut.qrc +++ b/launcher/qml/images/TopShortcut/topshortcut.qrc @@ -12,5 +12,7 @@ <file>video_active.svg</file> <file>sdl_usb.svg</file> <file>sdl_usb_active.svg</file> + <file>error.svg</file> + <file>error_active.svg</file> </qresource> </RCC> diff --git a/launcher/qml/images/images.qrc b/launcher/qml/images/images.qrc index a24fd84..7fdcfb3 100644 --- a/launcher/qml/images/images.qrc +++ b/launcher/qml/images/images.qrc @@ -2,11 +2,17 @@ <qresource prefix="/images"> <file>AGL_HMI_Blue_Background_Car-01.png</file> <file>top_three_shortcut_background.png</file> - <file>meterdisplay.png</file> - <file>hud.png</file> <file>background.png</file> - <file>uninstall.png</file> - <file>rse.png</file> + <file>shotcuticon_hud.svg</file> + <file>shotcuticon_meter.svg</file> + <file>shotcuticon_rse.svg</file> + <file>shotcuticon_dustbox.svg</file> + <file>Screentransition_Background.png</file> + <file>Screentransition_bar.png</file> + <file>BG_undericon1.svg</file> + <file>BG_undericon2.svg</file> + <file>BG_undericon3.svg</file> + <file>BG_undericon4.svg</file> <file>DividingLine.svg</file> <file>connectivity_active.svg</file> <file>connectivity_inactive.svg</file> @@ -40,6 +46,14 @@ <file>sdl_inactive.svg</file> <file>blank_active.svg</file> <file>blank_inactive.svg</file> + <file>sdlbt_active.svg</file> + <file>sdlbt_inactive.svg</file> + <file>sdl_usb_active.svg</file> + <file>sdl_usb_inactive.svg</file> + <file>tbtnavi_active.svg</file> + <file>tbtnavi_inactive.svg</file> + <file>warehouse_active.svg</file> + <file>warehouse_inactive.svg</file> <file>plus_active.svg</file> <file>plus_inactive.svg</file> </qresource> diff --git a/launcher/qml/images/sdl_usb_active.svg b/launcher/qml/images/sdl_usb_active.svg new file mode 100644 index 0000000..7986982 --- /dev/null +++ b/launcher/qml/images/sdl_usb_active.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション" x1="-423.16" y1="144.45" x2="-282.71" y2="532.16" gradientTransform="matrix(1.33, 0, 0, -1.33, 654.65, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0df9ff"/><stop offset="0.09" stop-color="#0df9ff" stop-opacity="0.85"/><stop offset="0.63" stop-color="#0df9ff" stop-opacity="0"/></linearGradient><linearGradient id="名称未設定グラデーション_2" x1="-595.04" y1="-36.65" x2="-322.32" y2="345.17" gradientTransform="matrix(1.33, 0, 0, -1.33, 654.65, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0.3" stop-color="#fff" stop-opacity="0"/><stop offset="0.37" stop-color="#fafafa" stop-opacity="0.1"/><stop offset="0.46" stop-color="#ebebeb" stop-opacity="0.22"/><stop offset="0.55" stop-color="#d2d2d2" stop-opacity="0.36"/><stop offset="0.65" stop-color="#afafaf" stop-opacity="0.5"/><stop offset="0.76" stop-color="#828282" stop-opacity="0.66"/><stop offset="0.87" stop-color="#4b4b4b" stop-opacity="0.81"/><stop offset="0.98" stop-color="#0c0c0c" stop-opacity="0.97"/><stop offset="1"/></linearGradient><linearGradient id="名称未設定グラデーション_11" x1="144.97" y1="246.13" x2="144.97" y2="65.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-533.62" y1="119.81" x2="-217.19" y2="423.16" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 646.93, 514.83)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>アートボード 1 のコピー 4</title><g id="レイヤー_2" data-name="レイヤー 2"><ellipse id="circle3656" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="fill:url(#名称未設定グラデーション)"/></g><g id="レイヤー_4" data-name="レイヤー 4"><ellipse id="circle3677" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="opacity:0.400000005960465;isolation:isolate;fill:url(#名称未設定グラデーション_2)"/></g><g id="レイヤー_6" data-name="レイヤー 6"><path d="M119.35,188.05l-57.2-26.54V132.88L120.68,160l36.21-15.83L98.06,116.84l21-10.49L176.55,133v18.83a14.86,14.86,0,0,1,5-.88H182V95L119.35,66,56.71,95v70l62.64,29.06,48.41-22.46a14.63,14.63,0,0,1-1.15-5.47ZM62.15,98.52,119.35,72l57.2,26.54V127L119,100.31,85.54,117l58.12,27-22.92,10L62.15,126.88Zm154.77,41.53v16.32h5.44v13.71l-15.64,13.56V127.55h11.56l-14.6-29.92-12.6,29.92h10.2v72.61l-17-13.81V175a9.52,9.52,0,1,0-5.44,0v13.93l22.44,18.23v12a13.6,13.6,0,1,0,5.44,0V190.84l21.08-18.27v-16.2h5.44V140.05Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/sdl_usb_inactive.svg b/launcher/qml/images/sdl_usb_inactive.svg new file mode 100644 index 0000000..a21dbc3 --- /dev/null +++ b/launcher/qml/images/sdl_usb_inactive.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション_11" x1="144.97" y1="246.13" x2="144.97" y2="65.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-533.62" y1="119.81" x2="-217.19" y2="423.16" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 646.93, 514.83)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>sdlusb</title><g id="レイヤー_6" data-name="レイヤー 6"><path d="M119.35,188.05l-57.2-26.54V132.88L120.68,160l36.21-15.83L98.06,116.84l21-10.49L176.55,133v18.83a14.86,14.86,0,0,1,5-.88H182V95L119.35,66,56.71,95v70l62.64,29.06,48.41-22.46a14.63,14.63,0,0,1-1.15-5.47ZM62.15,98.52,119.35,72l57.2,26.54V127L119,100.31,85.54,117l58.12,27-22.92,10L62.15,126.88Zm154.77,41.53v16.32h5.44v13.71l-15.64,13.56V127.55h11.56l-14.6-29.92-12.6,29.92h10.2v72.61l-17-13.81V175a9.52,9.52,0,1,0-5.44,0v13.93l22.44,18.23v12a13.6,13.6,0,1,0,5.44,0V190.84l21.08-18.27v-16.2h5.44V140.05Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/sdlbt_active.svg b/launcher/qml/images/sdlbt_active.svg new file mode 100644 index 0000000..c7a91fe --- /dev/null +++ b/launcher/qml/images/sdlbt_active.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション" x1="-336.98" y1="144.45" x2="-196.52" y2="532.16" gradientTransform="matrix(1.33, 0, 0, -1.33, 539.95, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0df9ff"/><stop offset="0.09" stop-color="#0df9ff" stop-opacity="0.85"/><stop offset="0.63" stop-color="#0df9ff" stop-opacity="0"/></linearGradient><linearGradient id="名称未設定グラデーション_2" x1="-508.85" y1="-36.65" x2="-236.13" y2="345.17" gradientTransform="matrix(1.33, 0, 0, -1.33, 539.95, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0.3" stop-color="#fff" stop-opacity="0"/><stop offset="0.37" stop-color="#fafafa" stop-opacity="0.1"/><stop offset="0.46" stop-color="#ebebeb" stop-opacity="0.22"/><stop offset="0.55" stop-color="#d2d2d2" stop-opacity="0.36"/><stop offset="0.65" stop-color="#afafaf" stop-opacity="0.5"/><stop offset="0.76" stop-color="#828282" stop-opacity="0.66"/><stop offset="0.87" stop-color="#4b4b4b" stop-opacity="0.81"/><stop offset="0.98" stop-color="#0c0c0c" stop-opacity="0.97"/><stop offset="1"/></linearGradient><linearGradient id="名称未設定グラデーション_11" x1="146.5" y1="241.64" x2="146.5" y2="65.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-447.43" y1="118.39" x2="-130.99" y2="421.74" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 532.24, 512.31)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>アートボード 1 のコピー 3</title><g id="レイヤー_2" data-name="レイヤー 2"><ellipse id="circle3656" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="fill:url(#名称未設定グラデーション)"/></g><g id="レイヤー_4" data-name="レイヤー 4"><ellipse id="circle3677" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="opacity:0.400000005960465;isolation:isolate;fill:url(#名称未設定グラデーション_2)"/></g><g id="レイヤー_6" data-name="レイヤー 6"><path d="M178.8,162.46l-55.17,25.59-57.2-26.54V132.88L125,160l36.21-15.83-58.83-27.36,21-10.49L180.83,133v8.52l5.44,5.39V95L123.63,66,61,95v70l62.64,29.06,59.3-27.51ZM66.43,98.52,123.63,72l57.2,26.54V127l-57.6-26.68L89.82,117l58.12,27-22.92,10L66.43,126.88ZM232,145.21l-34.1-41.84v62.68l-24.78-24.52-3.82,3.86,27.39,27.12L169.3,199.62l3.82,3.87L197.9,179v62.67L232,199.81l-27.58-27.3Zm-28.66-26.55,21.32,26.16-21.32,21.11Zm21.32,81.54-21.32,26.16V179.09Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/sdlbt_inactive.svg b/launcher/qml/images/sdlbt_inactive.svg new file mode 100644 index 0000000..59b1b8f --- /dev/null +++ b/launcher/qml/images/sdlbt_inactive.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション_11" x1="146.5" y1="241.64" x2="146.5" y2="65.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-447.43" y1="118.39" x2="-130.99" y2="421.74" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 532.24, 512.31)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>sdlbt</title><g id="レイヤー_6" data-name="レイヤー 6"><path d="M178.8,162.46l-55.17,25.59-57.2-26.54V132.88L125,160l36.21-15.83-58.83-27.36,21-10.49L180.83,133v8.52l5.44,5.39V95L123.63,66,61,95v70l62.64,29.06,59.3-27.51ZM66.43,98.52,123.63,72l57.2,26.54V127l-57.6-26.68L89.82,117l58.12,27-22.92,10L66.43,126.88ZM232,145.21l-34.1-41.84v62.68l-24.78-24.52-3.82,3.86,27.39,27.12L169.3,199.62l3.82,3.87L197.9,179v62.67L232,199.81l-27.58-27.3Zm-28.66-26.55,21.32,26.16-21.32,21.11Zm21.32,81.54-21.32,26.16V179.09Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/shotcuticon_dustbox.svg b/launcher/qml/images/shotcuticon_dustbox.svg new file mode 100644 index 0000000..d1679ee --- /dev/null +++ b/launcher/qml/images/shotcuticon_dustbox.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96.06 123.05"><title>アセット 9</title><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_1-2" data-name="レイヤー 1"><path d="M74.5,13H2.5a2.5,2.5,0,0,1,0-5h72a2.5,2.5,0,0,1,0,5Z" style="fill:#a7a7a7"/><path d="M52.14,13a1.5,1.5,0,0,1-1.5-1.5v-7A1.45,1.45,0,0,0,49.19,3H26.81a1.45,1.45,0,0,0-1.45,1.45v7a1.5,1.5,0,1,1-3,0v-7A4.46,4.46,0,0,1,26.81,0H49.19a4.46,4.46,0,0,1,4.45,4.45v7A1.5,1.5,0,0,1,52.14,13Z" style="fill:#a7a7a7"/><path d="M40.72,100H44c0-.33,0-.66,0-1A28,28,0,0,1,53.76,77.7V32.49a2,2,0,0,1,4,0V74.83a27.93,27.93,0,0,1,13.75-3.89L76,21.63A1.49,1.49,0,0,0,74.5,20H2.5A1.49,1.49,0,0,0,1,21.63l7,77A1.49,1.49,0,0,0,9.5,100H19.79a2.34,2.34,0,0,1,0-.38V32.49a2,2,0,1,1,4,0V99.61a2.33,2.33,0,0,1,0,.38H36.79a2.34,2.34,0,0,1,0-.38V32.49a2,2,0,1,1,4,0V99.61A2.33,2.33,0,0,1,40.72,100Z" style="fill:#a7a7a7"/><path d="M72,74.93A24.06,24.06,0,1,0,96.06,99,24.06,24.06,0,0,0,72,74.93Zm12.46,36.41a2.51,2.51,0,0,1-3.54,0l-8.8-8.81-8.81,8.81a2.51,2.51,0,0,1-3.54,0,2.52,2.52,0,0,1,0-3.54L68.58,99l-8.81-8.81a2.5,2.5,0,0,1,3.54-3.53l8.81,8.8,8.8-8.81a2.5,2.5,0,0,1,3.54,3.54L75.65,99l8.81,8.8A2.5,2.5,0,0,1,84.46,111.34Z" style="fill:#a7a7a7"/></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/shotcuticon_hud.svg b/launcher/qml/images/shotcuticon_hud.svg new file mode 100644 index 0000000..05be35c --- /dev/null +++ b/launcher/qml/images/shotcuticon_hud.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 199.2 102.75"><title>アセット 6</title><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_5" data-name="レイヤー 5"><path d="M199.2,102.75h-1.66c-20.47,0-33.72-1.86-46.52-3.67-13.06-1.84-26.56-3.74-48-3.74-24.42,0-40.89,2-56.82,4-14,1.75-27.3,3.39-44.58,3.39H0l.17-1.65C1.74,85.92,3.34,69.71,4.88,54S8,22.13,9.59,6.94A7.72,7.72,0,0,1,17.29,0H181.67a8,8,0,0,1,8,7.18ZM103.06,92.34c21.61,0,35.22,1.92,48.37,3.77,12.93,1.82,25.16,3.54,44.45,3.64L186.65,7.48a5,5,0,0,0-5-4.48H17.29a4.72,4.72,0,0,0-4.71,4.25C11,22.43,9.41,38.64,7.87,54.32,6.38,69.43,4.84,85,3.33,99.75c16.29-.1,29.05-1.69,42.54-3.36C61.89,94.4,78.45,92.34,103.06,92.34Z" style="fill:#a7a7a7"/><rect x="97.47" y="1.26" width="3.74" height="6.26" style="fill:#a7a7a7"/><path d="M114.49,17.11H84.71a3.4,3.4,0,0,1-3.4-3.39V9.93a3.4,3.4,0,0,1,3.4-3.4h29.78a3.4,3.4,0,0,1,3.4,3.4v3.79A3.4,3.4,0,0,1,114.49,17.11ZM84.71,9.53a.4.4,0,0,0-.4.4v3.79a.39.39,0,0,0,.4.39h29.78a.39.39,0,0,0,.4-.39V9.93a.4.4,0,0,0-.4-.4Z" style="fill:#a7a7a7"/><rect x="101.92" y="10.18" width="10.07" height="3" transform="translate(23.07 79.06) rotate(-45)" style="fill:#a7a7a7"/><rect x="94.57" y="10.18" width="10.07" height="3" transform="translate(20.91 73.85) rotate(-45)" style="fill:#a7a7a7"/><polygon points="95.74 44.7 92.74 44.7 92.74 35.63 100.29 35.63 100.29 38.63 95.74 38.63 95.74 44.7" style="fill:#b0b1b0"/><polygon points="98.94 41.77 106.97 37.13 98.94 32.49 98.94 41.77" style="fill:#b0b1b0"/><path d="M114.58,53.34H84.63V25h30Zm-26.95-3h24V28h-24Z" style="fill:#b0b1b0"/><polygon points="57.98 87.23 55.22 86.04 67.32 58.01 27.6 58.01 27.6 55.01 71.88 55.01 57.98 87.23" style="fill:#a7a7a7"/><polygon points="141.22 87.23 127.32 55.01 171.6 55.01 171.6 58.01 131.88 58.01 143.98 86.04 141.22 87.23" style="fill:#a7a7a7"/><path d="M101.1,82.84h-3v-6h3Zm0-10h-3v-6h3Zm0-10h-3v-6h3Z" style="fill:#a7a7a7"/><rect x="32.14" y="37.34" width="49.85" height="3" style="fill:#a7a7a7"/><rect x="117.32" y="37.34" width="49.85" height="3" style="fill:#a7a7a7"/></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/shotcuticon_meter.svg b/launcher/qml/images/shotcuticon_meter.svg new file mode 100644 index 0000000..4e4abd9 --- /dev/null +++ b/launcher/qml/images/shotcuticon_meter.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 205 95"><title>アセット 8</title><g id="レイヤー_2" data-name="レイヤー 2"><g id="レイヤー_5" data-name="レイヤー 5"><path d="M76.91,66l-4.14-2.55c.16-.25.31-.5.45-.76l4.21,2.43C77.26,65.42,77.08,65.71,76.91,66Zm-60.29-.54-.49-.89L20.65,62l.43.76Zm57-31.09-.43-.77,4.21-2.43.49.88ZM21,33.67l-4.21-2.43.52-.87,4.14,2.54C21.32,33.16,21.17,33.41,21,33.67ZM48,18.58l-.88,0h-.07V13.71h1.09Z" style="fill:#00e0ff"/><path d="M47,12A36.47,36.47,0,0,0,10.58,48.41,40.85,40.85,0,0,0,15.8,67.77l.07,0,7.25-4.44L22.38,62c-.14-.24-.28-.48-.41-.72l-.73-1.34-4.69,2.67a37.21,37.21,0,0,1-3-14.2,33.29,33.29,0,0,1,3.66-15.19l4.34,2.49.75-1.29.42-.72.79-1.28-4.28-2.63A33.43,33.43,0,0,1,45.56,15v3.56l.07,1.5h1.5l.84,0,1.5,0,.14-5A35.46,35.46,0,0,1,76,30.26l-4.84,2.8.76,1.3c.14.24.27.48.4.72L73,36.4l5-2.73A31.8,31.8,0,0,1,81.8,48.54a29.59,29.59,0,0,1-4.37,14.85l-4.75-2.74-.76,1.29c-.13.24-.28.48-.42.72l-.79,1.27L77.3,68l0,0c.27-.24.81-.77.82-.79,3.72-3.69,6.64-11.91,6.64-18.7C84.8,28.71,67.5,12,47,12Z" style="fill:#a7a7a7"/><path d="M47.69,52a4.63,4.63,0,1,1,4.63-4.63A4.63,4.63,0,0,1,47.69,52Zm0-6.26a1.63,1.63,0,1,0,1.63,1.63A1.63,1.63,0,0,0,47.69,45.73Z" style="fill:#a7a7a7"/><rect x="25.54" y="53.24" width="19.52" height="3" transform="matrix(0.86, -0.52, 0.52, 0.86, -23.19, 26.07)" style="fill:#a7a7a7"/><path d="M184.69,66l-4.13-2.55.45-.76,4.2,2.43C185,65.42,184.87,65.71,184.69,66Z" style="fill:#00e0ff"/><path d="M124.41,65.46c-.17-.3-.34-.59-.5-.89L128.44,62c.14.25.28.51.43.76Z" style="fill:#00e0ff"/><path d="M181.41,34.37c-.13-.26-.28-.51-.42-.77l4.2-2.43c.17.29.33.59.49.88Z" style="fill:#00e0ff"/><path d="M128.81,33.67l-4.21-2.43c.17-.29.35-.58.53-.87l4.13,2.54Z" style="fill:#00e0ff"/><path d="M154.8,12a36.48,36.48,0,0,0-36.44,36.44,40.75,40.75,0,0,0,5.23,19.36l.06,0,7.25-4.44L130.16,62c-.14-.24-.27-.48-.4-.72L129,59.94l-4.69,2.67a37.21,37.21,0,0,1-3-14.2A33.29,33.29,0,0,1,125,33.22l4.34,2.49.75-1.29c.14-.24.28-.48.43-.72l.78-1.28L127,29.79A33.43,33.43,0,0,1,153.34,15v3.56l.08,1.5h1.5l.83,0,1.5,0,.14-5a35.44,35.44,0,0,1,26.38,15.18l-4.83,2.8.75,1.3.41.72.71,1.32,5-2.73a31.8,31.8,0,0,1,3.74,14.87,29.49,29.49,0,0,1-4.37,14.85l-4.75-2.74-.75,1.29c-.14.24-.28.48-.43.72l-.79,1.27,6.6,4.07,0,0c.27-.24.82-.77.82-.79,3.73-3.69,6.64-11.91,6.64-18.7C192.58,28.71,175.28,12,154.8,12Z" style="fill:#a7a7a7"/><path d="M155.47,52a4.63,4.63,0,1,1,4.63-4.63A4.63,4.63,0,0,1,155.47,52Zm0-6.26a1.63,1.63,0,1,0,1.63,1.63A1.63,1.63,0,0,0,155.47,45.73Z" style="fill:#a7a7a7"/><rect x="133.33" y="53.24" width="19.52" height="3" transform="matrix(0.86, -0.52, 0.52, 0.86, -7.73, 81.68)" style="fill:#a7a7a7"/><path d="M158.5,95H47.5a47.5,47.5,0,0,1,0-95H160V.08a47.48,47.48,0,0,1,31.42,80.66A47.21,47.21,0,0,1,160,94.92V95ZM47.5,3a44.5,44.5,0,0,0,0,89H157.84l.63,0A44.74,44.74,0,0,0,202,47.5,44.73,44.73,0,0,0,158.47,3L157.3,3Z" style="fill:#a7a7a7"/></g></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/shotcuticon_rse.svg b/launcher/qml/images/shotcuticon_rse.svg new file mode 100644 index 0000000..57d962f --- /dev/null +++ b/launcher/qml/images/shotcuticon_rse.svg @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" + y="0px" viewBox="0 0 157.6 118.7" style="enable-background:new 0 0 157.6 118.7;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#A7A7A7;} +</style> +<title>アセット 7</title> +<g> + <g id="レイヤー_5"> + <path class="st0" d="M143.9,89.1H13.7c-3.9,0-7-3.2-7-7.1c0,0,0,0,0,0V16.8c0-4.4,8.6-8.4,25.7-11.9c16-3.2,32.2-4.8,48.4-4.9 + c15.5,0.2,30.8,2.1,45.9,5.6c16,3.7,24.1,7.5,24.1,11.2v65.2C150.9,85.8,147.8,89,143.9,89.1z M80.8,3c-16,0.1-32,1.7-47.8,4.9 + c-19.1,3.9-23.3,7.8-23.3,8.9v65.2c-0.1,2.2,1.7,4.1,4,4.2c0,0,0,0,0,0h130.2c2.2,0,4-1.9,4-4.1c0,0,0,0,0,0V16.8 + c-0.3-1.1-6.2-4.7-22.6-8.5C110.7,5,95.8,3.2,80.8,3z"/> + <path class="st0" d="M141.1,80.8H16.5V21.2h124.6V80.8z M19.5,77.8h118.6V24.2H19.5L19.5,77.8z"/> + <rect x="72.7" y="34.4" transform="matrix(0.6934 -0.7206 0.7206 0.6934 1.9352 76.3602)" class="st0" width="36" height="3"/> + + <rect x="58.4" y="56.7" transform="matrix(0.6934 -0.7206 0.7206 0.6934 -15.1139 80.9448)" class="st0" width="58.2" height="3"/> + <rect x="32.8" y="87.9" class="st0" width="3" height="16.2"/> + <rect x="39.3" y="87.9" class="st0" width="3" height="16.2"/> + <rect x="116.7" y="87.9" class="st0" width="3" height="16.2"/> + <rect x="123.1" y="87.9" class="st0" width="3" height="16.2"/> + </g> +</g> +<path class="st0" d="M3.1,117.2l0.8-7.2v-0.2c0,0,0,0,0,0c-0.1-2.7,2-4.9,4.7-5H149c0,0,0,0,0,0c2.7,0.1,4.8,2.3,4.7,5l0.7,7.4h3 + l-0.8-7.5c0-4.3-3.4-7.8-7.7-7.9H8.6c-4.3,0.1-7.7,3.6-7.7,7.9l-0.8,7.5H3.1z"/> +</svg> diff --git a/launcher/qml/images/tbtnavi_active.svg b/launcher/qml/images/tbtnavi_active.svg new file mode 100644 index 0000000..f30eebd --- /dev/null +++ b/launcher/qml/images/tbtnavi_active.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション" x1="-252.86" y1="144.45" x2="-112.41" y2="532.16" gradientTransform="matrix(1.33, 0, 0, -1.33, 428.01, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0df9ff"/><stop offset="0.09" stop-color="#0df9ff" stop-opacity="0.85"/><stop offset="0.63" stop-color="#0df9ff" stop-opacity="0"/></linearGradient><linearGradient id="名称未設定グラデーション_2" x1="-424.74" y1="-36.65" x2="-152.01" y2="345.17" gradientTransform="matrix(1.33, 0, 0, -1.33, 428.01, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0.3" stop-color="#fff" stop-opacity="0"/><stop offset="0.37" stop-color="#fafafa" stop-opacity="0.1"/><stop offset="0.46" stop-color="#ebebeb" stop-opacity="0.22"/><stop offset="0.55" stop-color="#d2d2d2" stop-opacity="0.36"/><stop offset="0.65" stop-color="#afafaf" stop-opacity="0.5"/><stop offset="0.76" stop-color="#828282" stop-opacity="0.66"/><stop offset="0.87" stop-color="#4b4b4b" stop-opacity="0.81"/><stop offset="0.98" stop-color="#0c0c0c" stop-opacity="0.97"/><stop offset="1"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="146.56" y1="259.73" x2="146.56" y2="65.91" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient><linearGradient id="名称未設定グラデーション_3-2" x1="-363.3" y1="117" x2="-46.86" y2="420.35" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 420.29, 509.85)" xlink:href="#名称未設定グラデーション_3"/></defs><title>アートボード 1 のコピー 2</title><g id="レイヤー_2" data-name="レイヤー 2"><ellipse id="circle3656" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="fill:url(#名称未設定グラデーション)"/></g><g id="レイヤー_4" data-name="レイヤー 4"><ellipse id="circle3677" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="opacity:0.400000005960465;isolation:isolate;fill:url(#名称未設定グラデーション_2)"/></g><g id="レイヤー_6" data-name="レイヤー 6"><path d="M151.09,134.19,103,112.48l-2.27,4.94,44.91,20.33v73.63h5.44Zm-39.95-29.91-27,2.53,15.69,22.12ZM147,148.21m90.35-13.8L88.81,65.91l-2.17,5,148.55,68.5ZM185,196.09l38.62,17.71,2.23-5-46.29-21.16v59.81H185ZM111.65,157,58.18,130.89l-2.43,4.88,50.46,24.58v87.14h5.44Zm15,102.75" style="fill:url(#名称未設定グラデーション_3)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3-2)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/tbtnavi_inactive.svg b/launcher/qml/images/tbtnavi_inactive.svg new file mode 100644 index 0000000..2710708 --- /dev/null +++ b/launcher/qml/images/tbtnavi_inactive.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション_3" x1="146.56" y1="259.73" x2="146.56" y2="65.91" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient><linearGradient id="名称未設定グラデーション_3-2" x1="-363.3" y1="117" x2="-46.86" y2="420.35" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 420.29, 509.85)" xlink:href="#名称未設定グラデーション_3"/></defs><title>tbt</title><g id="レイヤー_6" data-name="レイヤー 6"><path d="M151.09,134.19,103,112.48l-2.27,4.94,44.91,20.33v73.63h5.44Zm-39.95-29.91-27,2.53,15.69,22.12ZM147,148.21m90.35-13.8L88.81,65.91l-2.17,5,148.55,68.5ZM185,196.09l38.62,17.71,2.23-5-46.29-21.16v59.81H185ZM111.65,157,58.18,130.89l-2.43,4.88,50.46,24.58v87.14h5.44Zm15,102.75" style="fill:url(#名称未設定グラデーション_3)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3-2)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/top_three_shortcut_background.png b/launcher/qml/images/top_three_shortcut_background.png Binary files differindex fb5e180..9bf0bfc 100644 --- a/launcher/qml/images/top_three_shortcut_background.png +++ b/launcher/qml/images/top_three_shortcut_background.png diff --git a/launcher/qml/images/warehouse_active.svg b/launcher/qml/images/warehouse_active.svg new file mode 100644 index 0000000..c293c73 --- /dev/null +++ b/launcher/qml/images/warehouse_active.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション" x1="-170.4" y1="144.45" x2="-29.95" y2="532.16" gradientTransform="matrix(1.33, 0, 0, -1.33, 318.27, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0df9ff"/><stop offset="0.09" stop-color="#0df9ff" stop-opacity="0.85"/><stop offset="0.63" stop-color="#0df9ff" stop-opacity="0"/></linearGradient><linearGradient id="名称未設定グラデーション_2" x1="-342.28" y1="-36.65" x2="-69.55" y2="345.17" gradientTransform="matrix(1.33, 0, 0, -1.33, 318.27, 503.07)" gradientUnits="userSpaceOnUse"><stop offset="0.3" stop-color="#fff" stop-opacity="0"/><stop offset="0.37" stop-color="#fafafa" stop-opacity="0.1"/><stop offset="0.46" stop-color="#ebebeb" stop-opacity="0.22"/><stop offset="0.55" stop-color="#d2d2d2" stop-opacity="0.36"/><stop offset="0.65" stop-color="#afafaf" stop-opacity="0.5"/><stop offset="0.76" stop-color="#828282" stop-opacity="0.66"/><stop offset="0.87" stop-color="#4b4b4b" stop-opacity="0.81"/><stop offset="0.98" stop-color="#0c0c0c" stop-opacity="0.97"/><stop offset="1"/></linearGradient><linearGradient id="名称未設定グラデーション_11" x1="146.83" y1="215.69" x2="146.83" y2="65.47" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-280.84" y1="115.63" x2="35.6" y2="418.99" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 310.56, 507.44)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>アートボード 1 のコピー</title><g id="レイヤー_2" data-name="レイヤー 2"><ellipse id="circle3656" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="fill:url(#名称未設定グラデーション)"/></g><g id="レイヤー_4" data-name="レイヤー 4"><ellipse id="circle3677" cx="149.73" cy="149.93" rx="135.61" ry="135.67" style="opacity:0.400000005960465;isolation:isolate;fill:url(#名称未設定グラデーション_2)"/></g><g id="レイヤー_6" data-name="レイヤー 6"><path d="M198.54,215.69l-79-.1a60.23,60.23,0,0,1-16.57-2.41,15.66,15.66,0,0,1-6.75-4.24,10.25,10.25,0,0,1-3.27-7.15V143.45h30.42v53.06c0,2.73.84,4.62,4.88,4.94h3.55a31.05,31.05,0,0,1-1.31-4.55l-.07-.59q0-2.22.1-50.15v-2.71h30.32V198c0,1.21,0,3.23,5.06,3.48h2.27v-58h30.42Zm-100.2-66.8v52.9a5.13,5.13,0,0,0,1.74,3.37,10.15,10.15,0,0,0,4.38,2.8,54.72,54.72,0,0,0,15,2.19l73.61.09V148.89H173.56v58h-7.85c-9.36-.44-10.36-6.38-10.36-8.91V148.89H135.9q-.09,43.1-.09,47.12c1.1,4.76,2.19,5.51,2.2,5.51a.73.73,0,0,0-.29-.07v5.44H127.9c-6.46-.48-10-4.17-10-10.38V148.89Zm124.5-16.07h-152l77.1-67.35ZM85.32,127.38H208.65L147.87,72.74Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/images/warehouse_inactive.svg b/launcher/qml/images/warehouse_inactive.svg new file mode 100644 index 0000000..9612aea --- /dev/null +++ b/launcher/qml/images/warehouse_inactive.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 300 300"><defs><linearGradient id="名称未設定グラデーション_11" x1="146.83" y1="215.69" x2="146.83" y2="65.47" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00b9e1"/><stop offset="1" stop-color="#79f8ff"/></linearGradient><linearGradient id="名称未設定グラデーション_3" x1="-280.84" y1="115.63" x2="35.6" y2="418.99" gradientTransform="matrix(1.33, 0.01, 0.01, -1.33, 310.56, 507.44)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00addc"/><stop offset="1" stop-color="#6bfbff"/></linearGradient></defs><title>werehouse</title><g id="レイヤー_6" data-name="レイヤー 6"><path d="M198.54,215.69l-79-.1a60.23,60.23,0,0,1-16.57-2.41,15.66,15.66,0,0,1-6.75-4.24,10.25,10.25,0,0,1-3.27-7.15V143.45h30.42v53.06c0,2.73.84,4.62,4.88,4.94h3.55a31.05,31.05,0,0,1-1.31-4.55l-.07-.59q0-2.22.1-50.15v-2.71h30.32V198c0,1.21,0,3.23,5.06,3.48h2.27v-58h30.42Zm-100.2-66.8v52.9a5.13,5.13,0,0,0,1.74,3.37,10.15,10.15,0,0,0,4.38,2.8,54.72,54.72,0,0,0,15,2.19l73.61.09V148.89H173.56v58h-7.85c-9.36-.44-10.36-6.38-10.36-8.91V148.89H135.9q-.09,43.1-.09,47.12c1.1,4.76,2.19,5.51,2.2,5.51a.73.73,0,0,0-.29-.07v5.44H127.9c-6.46-.48-10-4.17-10-10.38V148.89Zm124.5-16.07h-152l77.1-67.35ZM85.32,127.38H208.65L147.87,72.74Z" style="fill:url(#名称未設定グラデーション_11)"/></g><g id="レイヤー_3" data-name="レイヤー 3"><path id="path3686" d="M150,290h-.8C72,289.6,9.6,226.49,10,149.27,10.53,72.31,73.21,10,150,10h.8C228,10.4,290.4,73.51,290,150.73h0C289.47,227.69,226.79,290,150,290Zm0-275.07c-74.12,0-134.67,60.18-135.07,134.34-.4,74.42,59.88,135.4,134.27,135.8h.8c74.12,0,134.67-60.18,135.07-134.34.4-74.42-59.88-135.4-134.27-135.8Z" style="fill:url(#名称未設定グラデーション_3)"/></g></svg>
\ No newline at end of file diff --git a/launcher/qml/qml.qrc b/launcher/qml/qml.qrc index f440a6e..4ff7b4b 100644 --- a/launcher/qml/qml.qrc +++ b/launcher/qml/qml.qrc @@ -5,5 +5,7 @@ <file>TopShortcutArea.qml</file> <file>TopShortcutIcon.qml</file> <file>UninstallDialog.qml</file> + <file>BottomShortcutArea.qml</file> + <file>AnimationBar.qml</file> </qresource> </RCC> diff --git a/launcher/src/shortcutappmodel.cpp b/launcher/src/shortcutappmodel.cpp index 0fd76b6..9ec8547 100644 --- a/launcher/src/shortcutappmodel.cpp +++ b/launcher/src/shortcutappmodel.cpp @@ -51,8 +51,8 @@ void ShortcutAppModel::init() { RegisterApp temp; for(int i = 0; i < 3; i++) { - temp.id = "video@0.1"; - temp.name = "video"; + temp.id = "error@0.1"; + temp.name = "error"; temp.icon = getIconPath(temp.id); if (temp.icon == "") { temp.isBlank = true; @@ -108,8 +108,8 @@ void ShortcutAppModel::shortcutUpdate(QStringList shortcut_list) HMI_DEBUG("Launcher", "ShortcutAppModel::shortcutUpdate id1=%s", shortcut_list.at(1).toStdString().c_str()); RegisterApp temp; for(int i = 0; i < d->data.size(); i++) { - temp.id = shortcut_list.at(2 * i); - temp.name = shortcut_list.at(2 * i + 1); + temp.id = shortcut_list.at(2 * i) == "" ? "error@0.1" : shortcut_list.at(2 * i); + temp.name = shortcut_list.at(2 * i + 1) == "" ? "error" : shortcut_list.at(2 * i + 1); temp.icon = getIconPath(temp.id); if (temp.icon == "") { temp.isBlank = true; |