change icon sizesandbox/zheng_wenlong/warehouse

7 files changed, 190 insertions, 165 deletions

diff --git a/app/images/blank.svg b/app/images/blank.svg
index 10c0a89..d5e3472 100644
--- a/app/images/blank.svg
+++ b/app/images/blank.svg
@@ -1,133 +1,151 @@
 <?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)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:i="&amp;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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="320"
+   height="320"
+   viewBox="0 0 320 320.00001"
+   id="svg5033"
    version="1.1"
-   id="HVAC_Active"
-   x="0px"
-   y="0px"
-   viewBox="0 0 300 300"
-   style="enable-background:new 0 0 300 300;"
-   xml:space="preserve"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="blank_active.svg"><metadata
-     id="metadata3708"><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="defs3706" /><sodipodi:namedview
-     pagecolor="#ffffff"
+   sodipodi:docname="bg2.svg">
+  <defs
+     id="defs5035">
+    <linearGradient
+       gradientTransform="matrix(1.0123741,0,0,1.0052855,226.82647,753.70831)"
+       inkscape:collect="always"
+       xlink:href="#SVGID_36_"
+       id="linearGradient5005"
+       x1="-125.27629"
+       y1="217.50423"
+       x2="-4.2735882"
+       y2="57.848095"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="SVGID_36_"
+       gradientUnits="userSpaceOnUse"
+       x1="4.0481"
+       y1="287.94919"
+       x2="320.4859"
+       y2="-15.4029"
+       gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.0192,-3.0212)">
+      <stop
+         offset="0"
+         style="stop-color:#54d187;stop-opacity:0.90588236"
+         id="stop300" />
+      <stop
+         id="stop9348"
+         style="stop-color:#12c1bb;stop-opacity:0.65882355"
+         offset="0.51862437" />
+      <stop
+         offset="1"
+         style="stop-color:#055658;stop-opacity:0.38431373"
+         id="stop302" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9308"
+       id="linearGradient9314"
+       x1="414.01102"
+       y1="157.36543"
+       x2="484.72171"
+       y2="80.290802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-562,703.36214)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9308">
+      <stop
+         style="stop-color:#55d186;stop-opacity:0.90980393"
+         offset="0"
+         id="stop9310" />
+      <stop
+         id="stop9316"
+         offset="0.50955158"
+         style="stop-color:#12c0bc;stop-opacity:0.65490198" />
+      <stop
+         style="stop-color:#055457;stop-opacity:0.38039216"
+         offset="1"
+         id="stop9312" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffa4ff"
      bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
+     borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1002"
-     inkscape:window-height="778"
-     id="namedview3704"
+     inkscape:zoom="2"
+     inkscape:cx="49.388499"
+     inkscape:cy="181.12516"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:zoom="0.78666667"
-     inkscape:cx="-90.254237"
-     inkscape:cy="150"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="HVAC_Active" /><style
-     type="text/css"
-     id="style3659">
-    .st0{fill:url(#SVGID_1_);}
-    .st1{opacity:0.4;fill:url(#SVGID_2_);}
-    .st2{fill:url(#SVGID_3_);}
-  </style><switch
-     id="switch3661"
-     transform="matrix(1.3314132,0,0,1.3314132,5.608242,5.2107165)"><g
-       i:extraneous="self"
-       id="g3663"><linearGradient
-         id="SVGID_1_"
-         gradientUnits="userSpaceOnUse"
-         x1="65.307999"
-         y1="229.46629"
-         x2="205.7616"
-         y2="-158.244"><stop
-           offset="0"
-           style="stop-color:#0DF9FF"
-           id="stop3666" /><stop
-           offset="9.208472e-02"
-           style="stop-color:#0DF9FF;stop-opacity:0.853"
-           id="stop3668" /><stop
-           offset="0.6264"
-           style="stop-color:#0DF9FF;stop-opacity:0"
-           id="stop3670" /></linearGradient><circle
-         class="st0"
-         cx="109.1"
-         cy="108.7"
-         r="101.9"
-         id="circle3672"
-         style="fill:url(#SVGID_1_)" /><linearGradient
-         id="SVGID_2_"
-         gradientUnits="userSpaceOnUse"
-         x1="-106.5709"
-         y1="410.58551"
-         x2="166.1564"
-         y2="28.7673"><stop
-           offset="0.2978"
-           style="stop-color:#FFFFFF;stop-opacity:0"
-           id="stop3675" /><stop
-           offset="0.3685"
-           style="stop-color:#FAFAFA;stop-opacity:0.1007"
-           id="stop3677" /><stop
-           offset="0.4554"
-           style="stop-color:#EBEBEB;stop-opacity:0.2245"
-           id="stop3679" /><stop
-           offset="0.5508"
-           style="stop-color:#D2D2D2;stop-opacity:0.3603"
-           id="stop3681" /><stop
-           offset="0.6523"
-           style="stop-color:#AFAFAF;stop-opacity:0.5048"
-           id="stop3683" /><stop
-           offset="0.7585"
-           style="stop-color:#828282;stop-opacity:0.6562"
-           id="stop3685" /><stop
-           offset="0.8689"
-           style="stop-color:#4B4B4B;stop-opacity:0.8133"
-           id="stop3687" /><stop
-           offset="0.9806"
-           style="stop-color:#0C0C0C;stop-opacity:0.9724"
-           id="stop3689" /><stop
-           offset="1"
-           style="stop-color:#000000"
-           id="stop3691" /></linearGradient><circle
-         class="st1"
-         cx="109.1"
-         cy="108.7"
-         r="101.9"
-         id="circle3693"
-         style="opacity:0.4;fill:url(#SVGID_2_)" /><g
-         id="g3695"><linearGradient
-           id="SVGID_3_"
-           gradientUnits="userSpaceOnUse"
-           x1="-47.346401"
-           y1="263.00369"
-           x2="269.0914"
-           y2="-40.3484"
-           gradientTransform="matrix(1,0.00546456,-0.00546456,1,-2.3177,-2.7461)"><stop
-             offset="0"
-             style="stop-color:#00ADDC"
-             id="stop3698" /><stop
-             offset="1"
-             style="stop-color:#6BFBFF"
-             id="stop3700" /></linearGradient><path
-           class="st2"
-           d="m 108.5,213.9 c -0.2,0 -0.4,0 -0.6,0 C 49.9,213.5 3,166.1 3.3,108.1 3.6,50.4 50.7,3.6 108.4,3.6 c 0.2,0 0.4,0 0.6,0 58,0.3 104.9,47.7 104.6,105.7 l 0,0 c -0.3,57.8 -47.4,104.6 -105.1,104.6 z M 108.4,7.2 C 52.7,7.2 7.3,52.4 7,108.2 c -0.3,55.9 45,101.7 100.9,102 0.2,0 0.4,0 0.6,0 C 164.2,210.2 209.7,165 210,109.3 210.3,53.4 165,7.6 109.1,7.3 108.8,7.2 108.6,7.2 108.4,7.2 Z"
-           id="path3702"
-           style="fill:url(#SVGID_3_)"
-           inkscape:connector-curvature="0" /></g></g></switch></svg>
\ No newline at end of file
+     inkscape:window-width="1615"
+     inkscape:window-height="917"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="160,377.00001"
+       orientation="1,0"
+       id="guide5666" />
+    <sodipodi:guide
+       position="60,448.00001"
+       orientation="1,0"
+       id="guide5668" />
+    <sodipodi:guide
+       position="260,414.00001"
+       orientation="1,0"
+       id="guide5670" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5038">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-732.36216)">
+    <path
+       style="fill:#00ffbd;fill-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 160.42857,785.99962 A 104.88141,105.22039 0 0 0 55.54771,891.21837 104.88141,105.22039 0 0 0 160.42857,996.43908 104.88141,105.22039 0 0 0 265.30943,891.21837 104.88141,105.22039 0 0 0 160.42857,785.99962 Z m -0.33984,3.38867 A 101.83055,101.66108 0 0 1 261.92076,891.0504 101.83055,101.66108 0 0 1 160.08873,992.71056 101.83055,101.66108 0 0 1 58.25865,891.0504 101.83055,101.66108 0 0 1 160.08873,789.38829 Z"
+       id="path4374"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="opacity:0.77;fill:url(#linearGradient5005);fill-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;fill-rule:nonzero"
+       id="path4417"
+       cx="160.24997"
+       cy="891.04053"
+       rx="102.26696"
+       ry="101.89165" />
+    <rect
+       style="opacity:1;fill:url(#linearGradient9314);fill-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect9306"
+       width="72"
+       height="78"
+       x="-149"
+       y="783.36218" />
+  </g>
+</svg>
diff --git a/app/pages/DImage.qml b/app/pages/DImage.qml
new file mode 100644
index 0000000..a727be7
--- /dev/null
+++ b/app/pages/DImage.qml
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2018 The Qt Company Ltd.
+ *
+ * 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.6
+import QtQuick.Controls 2.0
+
+Image {
+    id: imageicon
+    property string icon: ""
+    property string name: ""
+
+    anchors.fill: parent
+    source: icon != ""?icon : 'qrc:/images/blank.svg'
+    property string initial: name.substring(0,1).toUpperCase()
+
+    Label {
+        style: Text.Outline
+        styleColor: "#66FF99"
+        color: 'transparent'
+        font.pixelSize: parent.height * 0.4
+        anchors.centerIn: parent
+        text: parent.initial
+        visible: icon == ""
+    }
+}
diff --git a/app/pages/DetailPage.qml b/app/pages/DetailPage.qml
index 45e5202..c1eca33 100644
--- a/app/pages/DetailPage.qml
+++ b/app/pages/DetailPage.qml
@@ -57,21 +57,10 @@ import QtQuick.Controls 2.0
             Layout.preferredWidth: 200
             Layout.preferredHeight: 200
 
-			Image {
-				id: imageicon
-                anchors.fill: parent
-            	source: model.icon != ""?model.icon : 'qrc:/images/blank.svg'
-				property string initial: model.name.substring(0,1).toUpperCase()
-
-				Label {
-					style: Text.Outline
-					styleColor: "#00ADDC"
-					color: 'transparent'
-					font.pixelSize: parent.height * 0.5
-					anchors.centerIn: parent
-					text: parent.initial
-					visible: model.icon == ""
-				}
+            DImage {
+                id: imageicon
+                icon: model.icon
+                name: model.name
             }
         }
 
diff --git a/app/pages/ListPage.qml b/app/pages/ListPage.qml
index c9116d4..a25535e 100644
--- a/app/pages/ListPage.qml
+++ b/app/pages/ListPage.qml
@@ -77,21 +77,10 @@ Page {
 						}
 					}
 
-                    Image {
-						id: imageicon
-                        anchors.fill: parent
-                        source: model.icon != ""?model.icon : 'qrc:/images/blank.svg'
-						property string initial: model.name.substring(0,1).toUpperCase()
-
-						Label {
-							style: Text.Outline
-							styleColor: "#00ADDC"
-							color: 'transparent'
-							font.pixelSize: parent.height * 0.5
-							anchors.centerIn: parent
-							text: parent.initial
-							visible: model.icon == ""
-						}
+                    DImage {
+                        id: imageicon
+                        icon: model.icon
+                        name: model.name
                     }
                 }
 
diff --git a/app/pages/ManagementPage.qml b/app/pages/ManagementPage.qml
index e445c63..b622706 100644
--- a/app/pages/ManagementPage.qml
+++ b/app/pages/ManagementPage.qml
@@ -48,21 +48,10 @@ Page {
                     Layout.preferredWidth: 100
                     Layout.preferredHeight: 100
                     
-					Image {
-						id: imageicon
-                        anchors.fill: parent
-                        source: model.icon != ""?'file://' + model.icon : 'qrc:/images/blank.svg'
-						property string initial: model.name.substring(0,1).toUpperCase()
-
-						Label {
-							style: Text.Outline
-							styleColor: "#00ADDC"
-							color: 'transparent'
-							font.pixelSize: parent.height * 0.5
-							anchors.centerIn: parent
-							text: parent.initial
-							visible: model.icon == ""
-						}
+                    DImage {
+                        id: imageicon
+                        icon: model.icon != ""?'file://' + model.icon : ''
+                        name: model.name
                     }
                 }
                 ColumnLayout {
diff --git a/app/resources.qrc b/app/resources.qrc
index bcf707b..3a0aaa8 100644
--- a/app/resources.qrc
+++ b/app/resources.qrc
@@ -6,5 +6,6 @@
         <file>pages/ManagementPage.qml</file>
         <file>pages/DownloadBar.qml</file>
         <file>pages/DetailPage.qml</file>
+        <file>pages/DImage.qml</file>
     </qresource>
 </RCC>
\ No newline at end of file
diff --git a/app/src/config.h b/app/src/config.h
index e3aefc1..1196872 100644
--- a/app/src/config.h
+++ b/app/src/config.h
@@ -19,12 +19,13 @@
 
 // server url config
 //#define SERVER_DOMAIN_IP "192.168.20.161" 
-#define SERVER_DOMAIN_IP "202.7.19.45" 
+//#define SERVER_DOMAIN_IP "202.7.19.45"
+#define SERVER_DOMAIN_IP "warehouse.tmc-tokai.jp"
 
 //#define SERVER_DOMAIN "192.168.20.161/webservice"
-#define SERVER_DOMAIN "202.7.19.45/webservice"
+//#define SERVER_DOMAIN "202.7.19.45/webservice"
+#define SERVER_DOMAIN "warehouse.tmc-tokai.jp/webservice"
 
-//#define SERVER_DOMAIN "warehouse.tmc-tokai.jp/webservice"
 #define SERVER_BASE_URL "/api/v1/app"
 #define SERVER_API_LIST "/collection"