From d19ef0f45aea72756b2b1e658fdb1f8321e761cb Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Thu, 4 Jul 2019 13:30:02 +0900 Subject: [PATCH] add new design --- launcher/qml/AnimationBar.qml | 85 ++++++++++++++++ launcher/qml/BottomShortcutArea.qml | 73 ++++++++++++++ launcher/qml/Launcher.qml | 63 +++++------- launcher/qml/TopShortcutIcon.qml | 24 ++--- launcher/qml/UninstallDialog.qml | 2 +- launcher/qml/images/BG_undericon1.svg | 1 + launcher/qml/images/BG_undericon2.svg | 1 + launcher/qml/images/BG_undericon3.svg | 1 + launcher/qml/images/BG_undericon4.svg | 1 + .../qml/images/Screentransition_Background.png | Bin 0 -> 3625 bytes launcher/qml/images/Screentransition_bar.png | Bin 0 -> 4294 bytes launcher/qml/images/TopShortcut/error.svg | 88 +++++++++++++++++ launcher/qml/images/TopShortcut/error_active.svg | 107 +++++++++++++++++++++ launcher/qml/images/TopShortcut/topshortcut.qrc | 2 + launcher/qml/images/images.qrc | 22 ++++- launcher/qml/images/sdl_usb_active.svg | 1 + launcher/qml/images/sdl_usb_inactive.svg | 1 + launcher/qml/images/sdlbt_active.svg | 1 + launcher/qml/images/sdlbt_inactive.svg | 1 + launcher/qml/images/shotcuticon_dustbox.svg | 1 + launcher/qml/images/shotcuticon_hud.svg | 1 + launcher/qml/images/shotcuticon_meter.svg | 1 + launcher/qml/images/shotcuticon_rse.svg | 27 ++++++ launcher/qml/images/tbtnavi_active.svg | 1 + launcher/qml/images/tbtnavi_inactive.svg | 1 + .../qml/images/top_three_shortcut_background.png | Bin 1452 -> 10745 bytes launcher/qml/images/warehouse_active.svg | 1 + launcher/qml/images/warehouse_inactive.svg | 1 + launcher/qml/qml.qrc | 2 + launcher/src/shortcutappmodel.cpp | 8 +- 30 files changed, 460 insertions(+), 58 deletions(-) create mode 100644 launcher/qml/AnimationBar.qml create mode 100644 launcher/qml/BottomShortcutArea.qml create mode 100644 launcher/qml/images/BG_undericon1.svg create mode 100644 launcher/qml/images/BG_undericon2.svg create mode 100644 launcher/qml/images/BG_undericon3.svg create mode 100644 launcher/qml/images/BG_undericon4.svg create mode 100644 launcher/qml/images/Screentransition_Background.png create mode 100644 launcher/qml/images/Screentransition_bar.png create mode 100644 launcher/qml/images/TopShortcut/error.svg create mode 100644 launcher/qml/images/TopShortcut/error_active.svg create mode 100644 launcher/qml/images/sdl_usb_active.svg create mode 100644 launcher/qml/images/sdl_usb_inactive.svg create mode 100644 launcher/qml/images/sdlbt_active.svg create mode 100644 launcher/qml/images/sdlbt_inactive.svg create mode 100644 launcher/qml/images/shotcuticon_dustbox.svg create mode 100644 launcher/qml/images/shotcuticon_hud.svg create mode 100644 launcher/qml/images/shotcuticon_meter.svg create mode 100644 launcher/qml/images/shotcuticon_rse.svg create mode 100644 launcher/qml/images/tbtnavi_active.svg create mode 100644 launcher/qml/images/tbtnavi_inactive.svg create mode 100644 launcher/qml/images/warehouse_active.svg create mode 100644 launcher/qml/images/warehouse_inactive.svg 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 @@ -33,6 +34,11 @@ ApplicationWindow { height: 1920 // scale: screenInfo.scale_factor() + Image { + anchors.fill: parent + source: './images/background.png' + } + Image { id: topshortcutArea x: 197 @@ -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 @@ +アセット 4 \ 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 @@ +アセット 3 \ 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 @@ +アセット 2 \ 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 @@ +アセット 1 \ No newline at end of file diff --git a/launcher/qml/images/Screentransition_Background.png b/launcher/qml/images/Screentransition_Background.png new file mode 100644 index 0000000000000000000000000000000000000000..40da79dd9bbd6561dee25ff0ac38994dd1cde292 GIT binary patch literal 3625 zcmeHKe^3GYSf_hS8Hn0G&xa_5Y(h2i9&*-LaOxb9UNv# zTRZKa-pt*-eee70^ZEXGcUy{A7Ce+bKOI4khl&avB?vN`gX^9LXTi@PUe^l0<^~JD zA3~6fhmCg{@^Wi7g3S3)aj(_ax>g91>NktB>H+46KM17}WLa(`C`ucEj(UJk3D``- z2f9tDBHK)5jEisu?Vw62Y|y~!hLvuqVS~iWrramdWf1`y@B>{$BmU|@NQl@>3A+MZ z8{4=EO^E0lY^FTJA-dL8jM`NVpp2QtB$8%OD{m%QistzxsD&UooZxVh!bn!23Bh7P zCtoJ$O_RMsiDUVsFZg6LRq1+A!0~W6Yz|XqRrBE_&+|B8!7UaHN?@V-fG$R`K-vV?Swrof^Rs~xITYnUu@*i7)mEGx1=dwEip zc?Oec*@MxH$Aj?_@L&uf5i(DEIgzKP?98N}M-dhWN0B_i@g(Ww^DI<8Ptr7LwG+!J zcKMWUQ6Qv?0SQd`R-kW@k-Q?{2#lctjnQ6~hQ1{Z13X9a6zP!|){@W{>>3btRdcIq z^;D%6Pcebo?M7wt=wmKXQUV4&kKdsM9HI_vCPM-vSj=K|6IOwt1%i5l;01z6in>%; z@z(#dC?}8>fnmNP3L8fjb@4w6%aY(#HNOaJNb!q4fCmFU6PikqU{|YE4LXL=L5ipM zi|qDdP4z0(@E}xDkdGEQ?JUW&FnBX*v`I3n4xlM@Kwhq?el$_%f-(cgUW&5-(Mn?y zC0QZI77-I^4~ucU)x$G1%L17+P3p^c)JJkoz#W*U>ChO0m91VYhf!7*V6sf}7;m9z zj06PDNRo%4EvyMog;=PBVAkpI4VO~+TN;L1GIVJ(a&<|GuX!6d4bApj`ekzMeHzC!lheZwK`Cv=j zWmP3Lr7AJt1914_39QDH`tK3lUGXO!&V=YIb@_irgd32O>B5u6Hl4}D*&Ra~rZlky zC%>^wT{-X}b!mYBBuj%=Qfcht2)yY&FLLC$Bdu5Z^0XXh_Rj_b=iZv*tU=Nr`R0=7 z`3XeKaHl!*f4^zm_ig3U`d7~G=o>#(zs>oL_FeBeuIEz2e~vbd9WT3bZv0l|wWR~x zxt*0C?QI{qRQk*(6aL4vl?Xj!n@o4PBF9TubMrUvDqWJTm;A^9sZJ*mB$GRHJ)b^nRx(T;+lBpE=1Y&iYr_Wz zedX8wIJcrLcJx^M^y%8+L$O$M)~t*VSiPsG=b4`N=AW-Pk+~-N!gbvWgQj)hJE`|< ztw@X5G8flmts5dwWM6z^a8K>xnvX(j;tjcrSiik&>p^+;YXjZa_3g3Fp&iZVezX_Yq}Z?<<0^we!SeD;WG=j!{uymh|jUl?Vr5(Ed15<^@1oea*BH|V`Tn=^AH4WE>1&`3-^}yc(_*t_nP5AT-*4d`x%t3z2V-rQceU3Tf98suD;<0C*Khg<)zNb$ literal 0 HcmV?d00001 diff --git a/launcher/qml/images/Screentransition_bar.png b/launcher/qml/images/Screentransition_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..323217eb5f361e411534c81c6d020371674749d2 GIT binary patch literal 4294 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 lp72v1`tnw>{sXksIfwuN literal 0 HcmV?d00001 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 @@ + + + +image/svg+xmlLayer 1 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 @@ + + + +image/svg+xml + + + + + + + + + + + + Layer 1 + + 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 @@ video_active.svg sdl_usb.svg sdl_usb_active.svg + error.svg + error_active.svg 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 @@ AGL_HMI_Blue_Background_Car-01.png top_three_shortcut_background.png - meterdisplay.png - hud.png background.png - uninstall.png - rse.png + shotcuticon_hud.svg + shotcuticon_meter.svg + shotcuticon_rse.svg + shotcuticon_dustbox.svg + Screentransition_Background.png + Screentransition_bar.png + BG_undericon1.svg + BG_undericon2.svg + BG_undericon3.svg + BG_undericon4.svg DividingLine.svg connectivity_active.svg connectivity_inactive.svg @@ -40,6 +46,14 @@ sdl_inactive.svg blank_active.svg blank_inactive.svg + sdlbt_active.svg + sdlbt_inactive.svg + sdl_usb_active.svg + sdl_usb_inactive.svg + tbtnavi_active.svg + tbtnavi_inactive.svg + warehouse_active.svg + warehouse_inactive.svg plus_active.svg plus_inactive.svg 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 @@ +アートボード 1 のコピー 4 \ 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 @@ +sdlusb \ 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 @@ +アートボード 1 のコピー 3 \ 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 @@ +sdlbt \ 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 @@ +アセット 9 \ 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 @@ +アセット 6 \ 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 @@ +アセット 8 \ 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 @@ + + + + +アセット 7 + + + + + + + + + + + + + + + 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 @@ +アートボード 1 のコピー 2 \ 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 @@ +tbt \ 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 index fb5e180742a11f7b07d7ad41a7bd29f960af2e06..9bf0bfc388f1b3ace7002fc625acb1489d25b580 100644 GIT binary patch literal 10745 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 MtZ$)Ltb>jEKlP%0ZvX%Q literal 1452 zcmeAS@N?(olHy`uVBq!ia0y~yVDbU7uXC^g$rn+4Squz}Et$^F0iMpz3I#>^X_+~x z3=A3*YbV-z9Cna78h_c#RZI4bg3_dgR*?dtg;TV|4mxFOZ+Vqa^itd;(<3NGhV^<= zvwU|byLfu6Yz(X82j(M3uXb z-hM5%ctHma#}-2+!(jh3vCSW3;=h0R_*L)N<~`^CTK<~abdq7dht2Vl!%FuQ=H1*< za_;vL!LVr}kBT1^HtTu(IZ=A^srfn8cGh{4hMQhiKH}II@hWL&cjV20&gGqpyH*A6 zn@}A2aL>`mwbvql&->H5uxZ<*hgN43RW`J!1PLfE?&DguL11yH@==#r-yX~TQ#?Lj zX}ZrkE(uGqfM%|fADjOle4lsr(Um2$MY@=6^|$>s2>M@Hz-HI%&+V01C2~c>21sKW5=!7n1zdB$C9yz`WAa#WAGf*4t~|Ud(|a zt`~pL3k`7)d9yS+OBkHxKaBib*bpBdJ8H)|4uRi_y{P5$y z)eeu371r;GiQ&;-@1LE0Vb|SvkDvU>5nR3f>NTk?d7C58?+(h6mu!F5Ad}T%@8IHc zEMQX`kWTw@m4|_$UKp6Nnm8F83>Xn8DN4&t;ucLK6VIK9#fp 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 @@ +アートボード 1 のコピー \ 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 @@ +werehouse \ 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 @@ TopShortcutArea.qml TopShortcutIcon.qml UninstallDialog.qml + BottomShortcutArea.qml + AnimationBar.qml 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; -- 2.16.6