Add new application icon and fix some style issues

Show the grey icon for blank pages in the carousel
and add color icon to the center of the view for
blank pages until navigation starts.

diff --git a/mockups/03_Tabs_New.png b/mockups/03_Tabs_New.png
new file mode 100644 (file)
index 0000000..08ef407
Binary files /dev/null and b/mockups/03_Tabs_New.png differ

diff --git a/src/qml/BrowserWindow.qml b/src/qml/BrowserWindow.qml
index d819e15732a89d16dde40f7e5a23e888bf0b796a..c6a616729424a483c4db5cad141dce76e2a60954 100644 (file)
--- a/src/qml/BrowserWindow.qml
+++ b/src/qml/BrowserWindow.qml
@@ -66,6 +66,7 @@ Item {
     property string toolBarSeparatorColor: settingsView.privateBrowsingEnabled ? "#929495" : "#a3d1ed"
     property string toolBarFillColor: settingsView.privateBrowsingEnabled ? "#46484a" : uiSeparatorColor
     property string buttonPressedColor: settingsView.privateBrowsingEnabled ? "#3b3c3e" : "#3f91c4"
+    property string emptyBackgroundColor: "#e4e4e4"
     property string uiHighlightColor: "#fddd5c"
     property string inactivePagerColor: "#bcbdbe"
     property string textFieldStrokeColor: "#3882ae"
@@ -183,12 +184,12 @@ Item {
                 return false
             return true
         }
-        height: parent.height
 
         anchors {
             top: navigation.bottom
             left: parent.left
             right: parent.right
+            bottom: inputPanel.top
         }
 
         Component.onCompleted: {
@@ -289,7 +290,7 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            color: "#e4e4e4"
+            color: emptyBackgroundColor
         }
 
         SearchProxyModel {

diff --git a/src/qml/HomeScreen.qml b/src/qml/HomeScreen.qml
index 4842fc3e8b122534261f93d0175f733233f114b1..69710a32100cffc72d9c540d70c8c7aed414a53a 100644 (file)
--- a/src/qml/HomeScreen.qml
+++ b/src/qml/HomeScreen.qml
@@ -64,6 +64,7 @@ Rectangle {
             navigation.refresh()
             messageBox.state = "full"
             state = "enabled"
+            homeScreen.forceActiveFocus()
             return
         }
         var element = { "title": title, "url": url, "iconUrl": iconUrl, "fallbackColor": fallbackColor }
@@ -550,7 +551,7 @@ Rectangle {
                 }
                 PropertyChanges {
                     target: messageBox
-                    color: "#e4e4e4"
+                    color: emptyBackgroundColor
                     visible: true
                 }
                 PropertyChanges {

diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
index a46380180fc1ea667a99e6b770d9d59400d55f79..6fe92471ff52b15eae21a2502225b6bd18256057 100644 (file)
--- a/src/qml/NavigationBar.qml
+++ b/src/qml/NavigationBar.qml
@@ -400,7 +400,7 @@ ToolBar {
         style: ProgressBarStyle {
             background: Rectangle {
                 height: 3
-                color: "#e4e4e4"
+                color: emptyBackgroundColor
             }
             progress: Rectangle {
                 color: settingsView.privateBrowsingEnabled ? "#46a2da" : "#317198"

diff --git a/src/qml/PageView.qml b/src/qml/PageView.qml
index 471abd874f70d0bbfcb037f7d25495aea278a8d0..d03bf8f3e8599779a88d348a763c2f4c1e332afb 100644 (file)
--- a/src/qml/PageView.qml
+++ b/src/qml/PageView.qml
@@ -245,6 +245,42 @@ Rectangle {
                 }
             }
 
+            Rectangle {
+                opacity: {
+                    if (inputPanel.state === "visible")
+                        return 0.0
+                    if (webEngineView.url == "" || webEngineView.url == "about:blank")
+                        return 1.0
+                    return 0.0
+                }
+                anchors.fill: parent
+                visible: opacity != 0.0
+                color: "white"
+                Image {
+                    id: placeholder
+                    anchors {
+                        verticalCenterOffset: -toolBarSize
+                        centerIn: parent
+                    }
+                    source: "qrc:///icon"
+                }
+                Text {
+                    anchors {
+                        top: placeholder.bottom
+                        topMargin: 20
+                        horizontalCenter: placeholder.horizontalCenter
+                    }
+                    font.family: defaultFontFamily
+                    font.pixelSize: 28
+                    color: uiColor
+                    text: "Qt Browser"
+                }
+
+                Behavior on opacity {
+                    NumberAnimation { duration: animationDuration }
+                }
+            }
+
             Rectangle {
                 id: findBar
                 anchors {
@@ -362,6 +398,7 @@ Rectangle {
         if (listModel.count === tabViewMaxTabs) {
             homeScreen.messageBox.state = "tabsfull"
             homeScreen.state = "enabled"
+            homeScreen.forceActiveFocus()
             return null
         }
 

diff --git a/src/qml/assets/icons/AppLogoColor.png b/src/qml/assets/icons/AppLogoColor.png
new file mode 100644 (file)
index 0000000..2a49717
Binary files /dev/null and b/src/qml/assets/icons/AppLogoColor.png differ

diff --git a/src/qml/assets/icons/AppLogoGrey.png b/src/qml/assets/icons/AppLogoGrey.png
new file mode 100644 (file)
index 0000000..b2baae5
Binary files /dev/null and b/src/qml/assets/icons/AppLogoGrey.png differ

diff --git a/src/qml/assets/icons/LightWebBrowser_Icons.svg b/src/qml/assets/icons/LightWebBrowser_Icons.svg
index 4a58ea846439945b9d8c2a8468f45e8483bf23aa..fce4b4045ed59001b9f7989fc5965fb8b04c07b9 100644 (file)
--- a/src/qml/assets/icons/LightWebBrowser_Icons.svg
+++ b/src/qml/assets/icons/LightWebBrowser_Icons.svg
@@ -1,173 +1,242 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        width="1024px" height="768px" viewBox="0 0 1024 768" enable-background="new 0 0 1024 768" xml:space="preserve">
-<g id="Layer_1_1_">
-       <rect x="512" width="512" height="768"/>
-</g>
-<g id="Layer_2">
-       <g>
-               <g>
-                       <path fill="#FFFFFF" d="M567.6,75.1c-0.3,0-0.5-0.1-0.7-0.3L552,60l14.8-14.8c0.4-0.4,1-0.4,1.4,0s0.4,1,0,1.4L554.8,60
-                               l13.4,13.4c0.4,0.4,0.4,1,0,1.4C568.1,75,567.8,75.1,567.6,75.1z"/>
-               </g>
-               <g>
-                       <rect x="522" y="20" fill="none" width="80" height="80"/>
-               </g>
+        width="1024px" height="768px" viewBox="0 0 1024 768" style="enable-background:new 0 0 1024 768;" xml:space="preserve">
+<style type="text/css">
+       .st0{fill:none;}
+       .st1{fill:#FFFFFF;}
+       .st2{fill:#BDBEBF;}
+       .st3{opacity:0.25;}
+       .st4{fill:#3882AE;}
+       .st5{fill:#46A2DA;}
+       .st6{opacity:0.8;}
+       .st7{fill:#FDDD5C;}
+       .st8{fill:#80C342;}
+       .st9{fill:#D6D6D6;}
+</style>
+<g>
+       <rect class="st0" width="1024" height="768"/>
+       <g id="Layer_1_1_">
+               <rect x="512" width="512" height="768"/>
        </g>
-       <g>
-               <g>
-                       <path fill="#FFFFFF" d="M638.4,75.1c0.3,0,0.5-0.1,0.7-0.3L654,60l-14.8-14.8c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4L651.2,60
-                               l-13.4,13.4c-0.4,0.4-0.4,1,0,1.4C637.9,75,638.2,75.1,638.4,75.1z"/>
-               </g>
-               <g>
-                       <rect x="604" y="20" fill="none" width="80" height="80"/>
-               </g>
-       </g>
-       <g>
-               <path fill="#FFFFFF" d="M726,47.5l13,9.5v16h-26V57L726,47.5 M726,45l-15,11v19h30V56L726,45L726,45z"/>
+       <g id="Layer_2">
                <g>
                        <g>
-                               <rect x="686" y="20" fill="none" width="80" height="80"/>
+                               <path class="st1" d="M569.6,71.1c-0.3,0-0.5-0.1-0.7-0.3L554,56l14.8-14.8c0.4-0.4,1-0.4,1.4,0s0.4,1,0,1.4L556.8,56l13.4,13.4
+                                       c0.4,0.4,0.4,1,0,1.4C570.1,71,569.8,71.1,569.6,71.1z"/>
                        </g>
-               </g>
-       </g>
-       <g>
-               <g>
                        <g>
-                               <rect x="768" y="20" fill="none" width="80" height="80"/>
+                               <rect x="524" y="16" class="st0" width="80" height="80"/>
                        </g>
                </g>
                <g>
-                       <path fill="#FFFFFF" d="M822,74h-28V52h28V74z M796,72h24V54h-24V72z"/>
-                       <polygon fill="#FFFFFF" points="810,46 810,52 812,52 812,48 826,48 826,62 822,62 822,64 828,64 828,46                   "/>
-                       <polygon fill="#FFFFFF" points="794,62 790,62 790,48 804,48 804,52 806,52 806,46 788,46 788,64 794,64                   "/>
+                       <g>
+                               <path class="st1" d="M640.4,71.1c0.3,0,0.5-0.1,0.7-0.3L656,56l-14.8-14.8c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4L653.2,56
+                                       l-13.4,13.4c-0.4,0.4-0.4,1,0,1.4C639.9,71,640.2,71.1,640.4,71.1z"/>
+                       </g>
+                       <g>
+                               <rect x="606" y="16" class="st0" width="80" height="80"/>
+                       </g>
                </g>
-       </g>
-       <g>
                <g>
-                       <path fill="#FFFFFF" d="M899.9,76c-0.2,0-0.4,0-0.5-0.1l-9.4-5.8l-9.4,5.8c-0.3,0.2-0.8,0.2-1.1,0s-0.5-0.7-0.4-1.1l2.7-10.5
-                               l-8.5-7c-0.3-0.3-0.4-0.7-0.3-1.1c0.1-0.4,0.5-0.7,0.9-0.7l11-0.8l4.1-10.1c0.2-0.4,0.5-0.6,0.9-0.6s0.8,0.2,0.9,0.6l4.1,10.1
-                               l11,0.8c0.4,0,0.8,0.3,0.9,0.7c0.1,0.4,0,0.8-0.3,1.1l-8.5,7l2.7,10.5c0.1,0.4,0,0.8-0.4,1.1C900.3,75.9,900.1,76,899.9,76z
-                                M890,67.9c0.2,0,0.4,0,0.5,0.1l7.8,4.8l-2.2-8.8c-0.1-0.4,0-0.8,0.3-1l7-5.8l-9.1-0.6c-0.4,0-0.7-0.3-0.9-0.6l-3.4-8.4l-3.4,8.4
-                               c-0.1,0.4-0.5,0.6-0.9,0.6l-9.1,0.6l7,5.8c0.3,0.2,0.4,0.6,0.3,1l-2.2,8.8l7.8-4.8C889.6,67.9,889.8,67.9,890,67.9z"/>
+                       <path class="st1" d="M728,43.5l13,9.5v16h-26V53L728,43.5 M728,41l-15,11v19h30V52L728,41L728,41z"/>
+                       <g>
+                               <g>
+                                       <rect x="688" y="16" class="st0" width="80" height="80"/>
+                               </g>
+                       </g>
                </g>
                <g>
-                       <rect x="850" y="20" fill="none" width="80" height="80"/>
+                       <g>
+                               <g>
+                                       <rect x="770" y="16" class="st0" width="80" height="80"/>
+                               </g>
+                       </g>
+                       <g>
+                               <path class="st1" d="M824,70h-28V48h28V70z M798,68h24V50h-24V68z"/>
+                               <polygon class="st1" points="812,42 812,48 814,48 814,44 828,44 828,58 824,58 824,60 830,60 830,42                              "/>
+                               <polygon class="st1" points="796,58 792,58 792,44 806,44 806,48 808,48 808,42 790,42 790,60 796,60                              "/>
+                       </g>
                </g>
-       </g>
-       <g>
                <g>
-                       <circle fill="#FFFFFF" cx="972" cy="48" r="3"/>
-                       <circle fill="#FFFFFF" cx="972" cy="60" r="3"/>
-                       <circle fill="#FFFFFF" cx="972" cy="72" r="3"/>
+                       <g>
+                               <path class="st1" d="M901.9,72c-0.2,0-0.4,0-0.5-0.1l-9.4-5.8l-9.4,5.8c-0.3,0.2-0.8,0.2-1.1,0c-0.3-0.2-0.5-0.7-0.4-1.1
+                                       l2.7-10.5l-8.5-7c-0.3-0.3-0.4-0.7-0.3-1.1s0.5-0.7,0.9-0.7l11-0.8l4.1-10.1c0.2-0.4,0.5-0.6,0.9-0.6s0.8,0.2,0.9,0.6l4.1,10.1
+                                       l11,0.8c0.4,0,0.8,0.3,0.9,0.7c0.1,0.4,0,0.8-0.3,1.1l-8.5,7l2.7,10.5c0.1,0.4,0,0.8-0.4,1.1C902.3,71.9,902.1,72,901.9,72z
+                                        M892,63.9c0.2,0,0.4,0,0.5,0.1l7.8,4.8l-2.2-8.8c-0.1-0.4,0-0.8,0.3-1l7-5.8l-9.1-0.6c-0.4,0-0.7-0.3-0.9-0.6l-3.4-8.4
+                                       l-3.4,8.4c-0.1,0.4-0.5,0.6-0.9,0.6l-9.1,0.6l7,5.8c0.3,0.2,0.4,0.6,0.3,1l-2.2,8.8l7.8-4.8C891.6,63.9,891.8,63.9,892,63.9z"/>
+                       </g>
+                       <g>
+                               <rect x="852" y="16" class="st0" width="80" height="80"/>
+                       </g>
                </g>
                <g>
-                       <rect x="932" y="20" fill="none" width="80" height="80"/>
+                       <g>
+                               <circle class="st1" cx="974" cy="44" r="3"/>
+                               <circle class="st1" cx="974" cy="56" r="3"/>
+                               <circle class="st1" cx="974" cy="68" r="3"/>
+                       </g>
+                       <g>
+                               <rect x="934" y="16" class="st0" width="80" height="80"/>
+                       </g>
                </g>
-       </g>
-       <g>
                <g>
-                       <rect x="40" y="20" fill="none" width="80" height="80"/>
+                       <g>
+                               <rect x="42" y="16" class="st0" width="80" height="80"/>
+                       </g>
+                       <g>
+                               <path class="st2" d="M78.5,43.5c5,0,9,4,9,9s-4,9-9,9s-9-4-9-9S73.5,43.5,78.5,43.5 M78.5,41C72.1,41,67,46.1,67,52.5
+                                       C67,58.9,72.1,64,78.5,64S90,58.9,90,52.5C90,46.1,84.9,41,78.5,41L78.5,41z"/>
+                               <path class="st2" d="M96.8,67.9c0.3,0.3,0.3,0.8,0,1.2L95,70.8c-0.3,0.3-0.8,0.3-1.2,0l-9.1-9.1c-0.3-0.3-0.3-0.8,0-1.2l1.7-1.7
+                                       c0.3-0.3,0.8-0.3,1.2,0L96.8,67.9z"/>
+                       </g>
                </g>
                <g>
-                       <path fill="#BDBEBF" d="M76.5,47.5c5,0,9,4,9,9s-4,9-9,9s-9-4-9-9S71.5,47.5,76.5,47.5 M76.5,45C70.1,45,65,50.1,65,56.5
-                               S70.1,68,76.5,68S88,62.9,88,56.5S82.9,45,76.5,45L76.5,45z"/>
-                       <path fill="#BDBEBF" d="M94.8,71.9c0.3,0.3,0.3,0.8,0,1.2L93,74.8c-0.3,0.3-0.8,0.3-1.2,0l-9.1-9.1c-0.3-0.3-0.3-0.8,0-1.2
-                               l1.7-1.7c0.3-0.3,0.8-0.3,1.2,0L94.8,71.9z"/>
+                       <g>
+                               <g>
+                                       <path class="st2" d="M259,41c-8.3,0-15,6.7-15,15s6.7,15,15,15s15-6.7,15-15S267.3,41,259,41z M266.8,62.4l-1.4,1.4l-6.4-6.4
+                                               l-6.4,6.4l-1.4-1.4l6.4-6.4l-6.4-6.4l1.4-1.4l6.4,6.4l6.4-6.4l1.4,1.4l-6.4,6.4L266.8,62.4z"/>
+                               </g>
+                       </g>
+                       <rect x="232" y="29" class="st0" width="54" height="54"/>
                </g>
-       </g>
-       <g>
                <g>
+                       <rect x="326" y="29" class="st0" width="54" height="54"/>
                        <g>
-                               <path fill="#BDBEBF" d="M187,45c-8.3,0-15,6.7-15,15s6.7,15,15,15s15-6.7,15-15S195.3,45,187,45z M194.8,66.4l-1.4,1.4l-6.4-6.4
-                                       l-6.4,6.4l-1.4-1.4l6.4-6.4l-6.4-6.4l1.4-1.4l6.4,6.4l6.4-6.4l1.4,1.4l-6.4,6.4L194.8,66.4z"/>
+                               <path class="st2" d="M363.9,61.1C362,65.2,357.8,68,353,68c-6.6,0-12-5.4-12-12c0-6.6,5.4-12,12-12c4,0,7.5,2,9.7,5h2.4
+                                       c-2.4-4.2-6.9-7-12.1-7c-7.7,0-14,6.3-14,14s6.3,14,14,14c5.6,0,10.4-3.3,12.7-8.1L363.9,61.1z"/>
+                               <polygon class="st2" points="367.4,52 357.5,52 367.4,42.2                               "/>
                        </g>
                </g>
-               <rect x="160" y="33" fill="none" width="54" height="54"/>
-       </g>
-       <g>
-               <rect x="254" y="33" fill="none" width="54" height="54"/>
                <g>
-                       <path fill="#BDBEBF" d="M291.9,65.1C290,69.2,285.8,72,281,72c-6.6,0-12-5.4-12-12s5.4-12,12-12c4,0,7.5,2,9.7,5h2.4
-                               c-2.4-4.2-6.9-7-12.1-7c-7.7,0-14,6.3-14,14s6.3,14,14,14c5.6,0,10.4-3.3,12.7-8.1L291.9,65.1z"/>
-                       <polygon fill="#BDBEBF" points="295.4,56 285.5,56 295.4,46.2                    "/>
+                       <rect x="420" y="29" class="st0" width="54" height="54"/>
+                       <g>
+                               <g class="st3">
+                                       <circle cx="447" cy="57" r="25"/>
+                               </g>
+                               <g>
+                                       <path class="st1" d="M447,79.5c-13.5,0-24.5-11-24.5-24.5s11-24.5,24.5-24.5s24.5,11,24.5,24.5S460.5,79.5,447,79.5z"/>
+                                       <path class="st4" d="M447,31c13.2,0,24,10.8,24,24s-10.8,24-24,24s-24-10.8-24-24S433.8,31,447,31 M447,30
+                                               c-13.8,0-25,11.2-25,25s11.2,25,25,25s25-11.2,25-25S460.8,30,447,30L447,30z"/>
+                               </g>
+                               <g>
+                                       
+                                               <rect x="433" y="54" transform="matrix(0.7071 0.7071 -0.7071 0.7071 169.8026 -299.9675)" class="st4" width="28" height="2"/>
+                                       
+                                               <rect x="433" y="54" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 801.9339 -222.1632)" class="st4" width="28" height="2"/>
+                               </g>
+                       </g>
                </g>
-       </g>
-       <g>
-               <rect x="348" y="33" fill="none" width="54" height="54"/>
                <g>
-                       <g opacity="0.25">
-                               <circle cx="375" cy="61" r="25"/>
-                       </g>
                        <g>
-                               <path fill="#FFFFFF" d="M375,83.5c-13.5,0-24.5-11-24.5-24.5s11-24.5,24.5-24.5s24.5,11,24.5,24.5S388.5,83.5,375,83.5z"/>
-                               <path fill="#3882AE" d="M375,35c13.2,0,24,10.8,24,24s-10.8,24-24,24s-24-10.8-24-24S361.8,35,375,35 M375,34
-                                       c-13.8,0-25,11.2-25,25s11.2,25,25,25s25-11.2,25-25S388.8,34,375,34L375,34z"/>
+                               <rect x="563" y="162" class="st1" width="2" height="28"/>
+                               <rect x="550" y="175" class="st1" width="28" height="2"/>
                        </g>
                        <g>
-
-                                       <rect x="361" y="58" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 598.4443 365.8777)" fill="#3882AE" width="28" height="2"/>
-                               <rect x="361" y="58" transform="matrix(0.7071 -0.7071 0.7071 0.7071 68.118 282.4472)" fill="#3882AE" width="28" height="2"/>
+                               <rect x="524" y="136" class="st0" width="80" height="80"/>
                        </g>
                </g>
-       </g>
-       <g>
                <g>
-                       <rect x="561" y="166" fill="#FFFFFF" width="2" height="28"/>
-                       <rect x="548" y="179" fill="#FFFFFF" width="28" height="2"/>
+                       <g>
+                               <g>
+                                       <path class="st1" d="M73,193c-2.8,0-5-2.2-5-5v-46c0-2.8,2.2-5,5-5h66c2.8,0,5,2.2,5,5v46c0,2.8-2.2,5-5,5H73z"/>
+                                       <path class="st5" d="M139,138c2.2,0,4,1.8,4,4v46c0,2.2-1.8,4-4,4H73c-2.2,0-4-1.8-4-4v-46c0-2.2,1.8-4,4-4H139 M139,136H73
+                                               c-3.3,0-6,2.7-6,6v46c0,3.3,2.7,6,6,6h66c3.3,0,6-2.7,6-6v-46C145,138.7,142.3,136,139,136L139,136z"/>
+                               </g>
+                               <polygon class="st1" points="109,187 93,187 93,194 108,211 108,194                              "/>
+                               <rect x="107" y="192" class="st5" width="2" height="20"/>
+                               <polygon class="st5" points="107,209 107,212 91,192 93,192                              "/>
+                       </g>
+                       <g>
+                               <g>
+                                       <path class="st5" d="M109.6,165.2c0-3.5,0.5-6.7,1.5-9.7s2.5-5.6,4.4-7.9h2.2c-1.9,2.4-3.4,5.1-4.4,8.1s-1.5,6.2-1.5,9.5
+                                               c0,6.3,2,12.1,5.9,17.3h-2.2c-1.9-2.2-3.4-4.8-4.4-7.8S109.6,168.6,109.6,165.2z"/>
+                               </g>
+                               <g>
+                                       <g>
+                                               <path class="st5" d="M123.5,156c-1.1-1.8-3.2-2.8-5.7-2.8c-1.3,0-2.7,0.3-3.9,0.8c-0.2,0.6-0.5,1.1-0.7,1.7
+                                                       c-0.1,0.4-0.2,0.7-0.3,1.1c0,0,0.1,0,0.1-0.1c1.5-1,3.2-1.5,4.8-1.5c1.8,0,3.3,0.7,4.1,1.9c1.5,2.4,0,6.1-3.4,8.2
+                                                       c-1.5,1-3.2,1.5-4.8,1.5c-0.7,0-1.4-0.1-1.9-0.3c0,0.7,0.1,1.4,0.2,2c0.5,0.1,1.1,0.2,1.7,0.2c2,0,4.1-0.6,5.9-1.8
+                                                       C123.8,164.2,125.6,159.3,123.5,156z"/>
+                                       </g>
+                                       <path class="st5" d="M118.6,159.3c-0.2-0.5-0.8-0.7-1.3-0.4l-5.4,2.7c-0.1,0.7-0.1,1.5-0.2,2.2l6.4-3.3
+                                               C118.7,160.4,118.9,159.8,118.6,159.3z"/>
+                               </g>
+                               <g>
+                                       <rect x="88" y="176" transform="matrix(0.7071 0.7071 -0.7071 0.7071 152.9725 -15.3456)" class="st5" width="14" height="2"/>
+                                       
+                                               <rect x="88" y="176" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 287.3204 234.9828)" class="st5" width="14" height="2"/>
+                               </g>
+                               <g>
+                                       <rect x="88" y="152" transform="matrix(0.7071 0.7071 -0.7071 0.7071 136.003 -22.3749)" class="st5" width="14" height="2"/>
+                                       
+                                               <rect x="88" y="152" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 270.3508 194.0141)" class="st5" width="14" height="2"/>
+                               </g>
+                       </g>
                </g>
                <g>
-                       <rect x="522" y="140" fill="none" width="80" height="80"/>
+                       <g class="st6">
+                               <rect x="185" y="136" class="st5" width="70" height="70"/>
+                       </g>
+                       <g>
+                               <path class="st1" d="M204.9,177.6c0-0.3,0.1-0.5,0.3-0.7L220,162l14.8,14.8c0.4,0.4,0.4,1,0,1.4s-1,0.4-1.4,0L220,164.8
+                                       l-13.4,13.4c-0.4,0.4-1,0.4-1.4,0C205,178.1,204.9,177.8,204.9,177.6z"/>
+                       </g>
                </g>
-       </g>
-       <g>
                <g>
                        <g>
-                               <path fill="#FFFFFF" d="M71,197c-2.8,0-5-2.2-5-5v-46c0-2.8,2.2-5,5-5h66c2.8,0,5,2.2,5,5v46c0,2.8-2.2,5-5,5H71z"/>
-                               <path fill="#46A2DA" d="M137,142c2.2,0,4,1.8,4,4v46c0,2.2-1.8,4-4,4H71c-2.2,0-4-1.8-4-4v-46c0-2.2,1.8-4,4-4H137 M137,140H71
-                                       c-3.3,0-6,2.7-6,6v46c0,3.3,2.7,6,6,6h66c3.3,0,6-2.7,6-6v-46C143,142.7,140.3,140,137,140L137,140z"/>
+                               <path class="st7" d="M655.9,192c-0.2,0-0.4,0-0.5-0.1l-9.4-5.8l-9.4,5.8c-0.3,0.2-0.8,0.2-1.1,0c-0.3-0.2-0.5-0.7-0.4-1.1
+                                       l2.7-10.5l-8.5-7c-0.3-0.3-0.4-0.7-0.3-1.1c0.1-0.4,0.5-0.7,0.9-0.7l11-0.8l4.1-10.1c0.2-0.4,0.5-0.6,0.9-0.6s0.8,0.2,0.9,0.6
+                                       l4.1,10.1l11,0.8c0.4,0,0.8,0.3,0.9,0.7s0,0.8-0.3,1.1l-8.5,7l2.7,10.5c0.1,0.4,0,0.8-0.4,1.1C656.3,191.9,656.1,192,655.9,192z
+                                       "/>
+                       </g>
+                       <g>
+                               <rect x="606" y="136" class="st0" width="80" height="80"/>
                        </g>
-                       <polygon fill="#FFFFFF" points="107,191 91,191 91,198 106,215 106,198                   "/>
-                       <rect x="105" y="196" fill="#46A2DA" width="2" height="20"/>
-                       <polygon fill="#46A2DA" points="105,213 105,216 89,196 91,196                   "/>
                </g>
                <g>
                        <g>
-                               <path fill="#46A2DA" d="M107.6,169.2c0-3.5,0.5-6.7,1.5-9.7s2.5-5.6,4.4-7.9h2.2c-1.9,2.4-3.4,5.1-4.4,8.1s-1.5,6.2-1.5,9.5
-                                       c0,6.3,2,12.1,5.9,17.3h-2.2c-1.9-2.2-3.4-4.8-4.4-7.8S107.6,172.6,107.6,169.2z"/>
+                               <path class="st2" d="M173.9,72c-0.2,0-0.4,0-0.5-0.1l-9.4-5.8l-9.4,5.8c-0.3,0.2-0.8,0.2-1.1,0s-0.5-0.7-0.4-1.1l2.7-10.5
+                                       l-8.5-7c-0.3-0.3-0.4-0.7-0.3-1.1c0.1-0.4,0.5-0.7,0.9-0.7l11-0.8l4.1-10.1c0.2-0.4,0.5-0.6,0.9-0.6s0.8,0.2,0.9,0.6l4.1,10.1
+                                       l11,0.8c0.4,0,0.8,0.3,0.9,0.7c0.1,0.4,0,0.8-0.3,1.1l-8.5,7l2.7,10.5c0.1,0.4,0,0.8-0.4,1.1C174.3,71.9,174.1,72,173.9,72z
+                                        M164,63.9c0.2,0,0.4,0,0.5,0.1l7.8,4.8l-2.2-8.8c-0.1-0.4,0-0.8,0.3-1l7-5.8l-9.1-0.6c-0.4,0-0.7-0.3-0.9-0.6l-3.4-8.4
+                                       l-3.4,8.4c-0.1,0.4-0.5,0.6-0.9,0.6l-9.1,0.6l7,5.8c0.3,0.2,0.4,0.6,0.3,1l-2.2,8.8l7.8-4.8C163.6,63.9,163.8,63.9,164,63.9z"/>
                        </g>
                        <g>
-                               <g>
-                                       <path fill="#46A2DA" d="M121.5,160c-1.1-1.8-3.2-2.8-5.7-2.8c-1.3,0-2.7,0.3-3.9,0.8c-0.2,0.6-0.5,1.1-0.7,1.7
-                                               c-0.1,0.4-0.2,0.7-0.3,1.1c0,0,0.1,0,0.1-0.1c1.5-1,3.2-1.5,4.8-1.5c1.8,0,3.3,0.7,4.1,1.9c1.5,2.4,0,6.1-3.4,8.2
-                                               c-1.5,1-3.2,1.5-4.8,1.5c-0.7,0-1.4-0.1-1.9-0.3c0,0.7,0.1,1.4,0.2,2c0.5,0.1,1.1,0.2,1.7,0.2c2,0,4.1-0.6,5.9-1.8
-                                               C121.8,168.2,123.6,163.3,121.5,160z"/>
-                               </g>
-                               <path fill="#46A2DA" d="M116.6,163.3c-0.2-0.5-0.8-0.7-1.3-0.4l-5.4,2.7c-0.1,0.7-0.1,1.5-0.2,2.2l6.4-3.3
-                                       C116.7,164.4,116.9,163.8,116.6,163.3z"/>
+                               <rect x="124" y="16" class="st0" width="80" height="80"/>
                        </g>
+               </g>
+               <g>
+                       <circle class="st0" cx="107" cy="317" r="47"/>
                        <g>
-
-                                       <rect x="86" y="180" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 30.777 374.7444)" fill="#46A2DA" width="14" height="2"/>
-
-                                       <rect x="86" y="180" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -100.7471 118.7761)" fill="#46A2DA" width="14" height="2"/>
+                               <path class="st5" d="M107,363c-11.8,0-23.6-4.5-32.5-13.5c-17.9-17.9-17.9-47.1,0-65.1c17.9-17.9,47.1-17.9,65.1,0
+                                       c17.9,17.9,17.9,47.1,0,65.1l0,0C130.6,358.5,118.8,363,107,363z"/>
                        </g>
+                       <path class="st8" d="M153,317c0-25.4-20.6-46-46-46c-12.7,0-24.2,5.1-32.5,13.5l65.1,65.1C147.9,341.2,153,329.7,153,317z"/>
                        <g>
-
-                                       <rect x="86" y="156" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 47.7471 333.7741)" fill="#46A2DA" width="14" height="2"/>
-
-                                       <rect x="86" y="156" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -83.7765 111.7465)" fill="#46A2DA" width="14" height="2"/>
+                               <path class="st5" d="M107,335c-4.8,0-9.3-1.9-12.7-5.3c-7-7-7-18.4,0-25.5c3.4-3.4,7.9-5.3,12.7-5.3s9.3,1.9,12.7,5.3
+                                       c7,7,7,18.4,0,25.5C116.3,333.1,111.8,335,107,335z"/>
+                               <path class="st1" d="M122.2,329.9c6.7-7.9,6.3-19.6-1.1-27.1c-3.9-3.9-9-5.9-14.1-5.9s-10.2,2-14.1,5.9
+                                       c-7.8,7.8-7.8,20.5,0,28.3c3.9,3.9,9,5.9,14.1,5.9c4.4,0,8.8-1.4,12.4-4.3l18.5,18.5c1-0.9,1.9-1.8,2.8-2.8L122.2,329.9z
+                                        M95.7,328.3c-6.2-6.2-6.2-16.4,0-22.6c3-3,7-4.7,11.3-4.7s8.3,1.7,11.3,4.7c6.2,6.2,6.2,16.4,0,22.6c-3,3-7,4.7-11.3,4.7
+                                       S98.7,331.3,95.7,328.3z"/>
                        </g>
                </g>
-       </g>
-       <g>
-               <g opacity="0.8">
-                       <rect x="183" y="140" fill="#46A2DA" width="70" height="70"/>
-               </g>
                <g>
-                       <path fill="#FFFFFF" d="M202.9,181.6c0-0.3,0.1-0.5,0.3-0.7L218,166l14.8,14.8c0.4,0.4,0.4,1,0,1.4s-1,0.4-1.4,0L218,168.8
-                               l-13.4,13.4c-0.4,0.4-1,0.4-1.4,0C203,182.1,202.9,181.8,202.9,181.6z"/>
+                       <circle class="st0" cx="232" cy="317" r="47"/>
+                       <g>
+                               <path class="st2" d="M232,363c-11.8,0-23.6-4.5-32.5-13.5c-17.9-17.9-17.9-47.1,0-65.1c17.9-17.9,47.1-17.9,65.1,0
+                                       c17.9,17.9,17.9,47.1,0,65.1l0,0C255.6,358.5,243.8,363,232,363z"/>
+                       </g>
+                       <path class="st9" d="M278,317c0-25.4-20.6-46-46-46c-12.7,0-24.2,5.1-32.5,13.5l65.1,65.1C272.9,341.2,278,329.7,278,317z"/>
+                       <g>
+                               <path class="st2" d="M232,335c-4.8,0-9.3-1.9-12.7-5.3c-7-7-7-18.4,0-25.5c3.4-3.4,7.9-5.3,12.7-5.3s9.3,1.9,12.7,5.3
+                                       c7,7,7,18.4,0,25.5C241.3,333.1,236.8,335,232,335z"/>
+                               <path class="st1" d="M247.2,329.9c6.7-7.9,6.3-19.6-1.1-27.1c-3.9-3.9-9-5.9-14.1-5.9s-10.2,2-14.1,5.9
+                                       c-7.8,7.8-7.8,20.5,0,28.3c3.9,3.9,9,5.9,14.1,5.9c4.4,0,8.8-1.4,12.4-4.3l18.5,18.5c1-0.9,1.9-1.8,2.8-2.8L247.2,329.9z
+                                        M220.7,328.3c-6.2-6.2-6.2-16.4,0-22.6c3-3,7-4.7,11.3-4.7s8.3,1.7,11.3,4.7c6.2,6.2,6.2,16.4,0,22.6c-3,3-7,4.7-11.3,4.7
+                                       S223.7,331.3,220.7,328.3z"/>
+                       </g>
                </g>
        </g>
 </g>

diff --git a/src/qml/assets/icons/about_blank.png b/src/qml/assets/icons/about_blank.png
index ae0f8b1ded156976d4282f3aaeb470ca2ddc170e..6901b0ba0f4edbc172804e8c3a094aab58800cb2 100644 (file)
Binary files a/src/qml/assets/icons/about_blank.png and b/src/qml/assets/icons/about_blank.png differ

diff --git a/src/qml/assets/icons/icon.png b/src/qml/assets/icons/icon.png
deleted file mode 100644 (file)
index 365bf1b..0000000
Binary files a/src/qml/assets/icons/icon.png and /dev/null differ

diff --git a/src/resources.qrc b/src/resources.qrc
index 7f33a7faeb2748110dbe80efab729369e750bb73..1081a1bfa6d4040ddafa4c69d8692b8a033452bb 100644 (file)
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -17,7 +17,6 @@
         <file alias="refresh">qml/assets/icons/Btn_Reload.png</file>
         <file alias="stop">qml/assets/icons/Btn_Clear.png</file>
         <file alias="touchpoint">qml/assets/icons/touchpoint.png</file>
-        <file alias="icon">qml/assets/icons/icon.png</file>
         <file alias="delete">qml/assets/icons/Btn_Delete.png</file>
         <file alias="star">qml/assets/icons/Btn_Bookmarks.png</file>
         <file alias="star_checked">qml/assets/icons/Btn_Bookmark_Checked.png</file>
@@ -28,5 +27,7 @@
         <file alias="up">qml/assets/icons/Btn_Up.png</file>
         <file alias="search">qml/assets/icons/Btn_Search.png</file>
         <file alias="error">qml/assets/icons/Error_Icon.png</file>
+        <file alias="icon">qml/assets/icons/AppLogoColor.png</file>
+        <file alias="icon_grey">qml/assets/icons/AppLogoGrey.png</file>
     </qresource>
 </RCC>