Use icon for more things

This commit is contained in:
Anton Thomasson 2019-12-12 21:59:58 +01:00
parent 6640260b4f
commit 056dba6e7e
8 changed files with 367 additions and 70 deletions

View file

@ -25,7 +25,7 @@ DISTFILES += qml/harbour-seaprint.qml \
qml/cover/CoverPage.qml \ qml/cover/CoverPage.qml \
qml/pages/*.qml \ qml/pages/*.qml \
qml/pages/*.js \ qml/pages/*.js \
qml/pages/printer.svg \ *svg \
rpm/harbour-seaprint.changes.in \ rpm/harbour-seaprint.changes.in \
rpm/harbour-seaprint.changes.run.in \ rpm/harbour-seaprint.changes.run.in \
rpm/harbour-seaprint.spec \ rpm/harbour-seaprint.spec \

View file

@ -2,6 +2,14 @@ import QtQuick 2.0
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
CoverBackground { CoverBackground {
Icon {
anchors.centerIn: parent
height: parent.width * 0.9
width: parent.width * 0.9
opacity: 0.2
source: "../pages/icon-seaprint-nobg.svg"
}
Label { Label {
id: label id: label
anchors.centerIn: parent anchors.centerIn: parent

View file

@ -99,9 +99,9 @@ Page {
height: Theme.itemSizeLarge height: Theme.itemSizeLarge
width: Theme.itemSizeLarge width: Theme.itemSizeLarge
source: printer.attrs["printer-icons"] ? printer.attrs["printer-icons"].value[0] : "printer.svg" source: printer.attrs["printer-icons"] ? printer.attrs["printer-icons"].value[0] : "icon-seaprint-nobg.svg"
// Some printers serve their icons over https with invalid certs... // Some printers serve their icons over https with invalid certs...
onStatusChanged: if (status == Image.Error) source = "printer.svg" onStatusChanged: if (status == Image.Error) source = "icon-seaprint-nobg.svg"
} }
Column { Column {

View file

@ -0,0 +1,269 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 24.0.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"
x="0px"
y="0px"
viewBox="0 0 86 86"
style="enable-background:new 0 0 86 86;"
xml:space="preserve"
id="svg82"
sodipodi:docname="icon-seaprint-nobg.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
id="metadata88"><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><defs
id="defs86" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1408"
inkscape:window-height="1167"
id="namedview84"
showgrid="false"
inkscape:zoom="2.744186"
inkscape:cx="43"
inkscape:cy="43"
inkscape:window-x="1899"
inkscape:window-y="502"
inkscape:window-maximized="0"
inkscape:current-layer="svg82" />
<style
type="text/css"
id="style2">
.st0{fill:url(#SVGID_1_);}
.st1{display:none;}
.st2{display:inline;fill:url(#SVGID_2_);}
.st3{fill:url(#SVGID_3_);}
.st4{fill:url(#SVGID_4_);}
.st5{fill:url(#SVGID_5_);}
.st6{fill:#4EE6D0;}
.st7{opacity:0.9;fill:url(#SVGID_6_);}
.st8{opacity:0.9;fill:url(#SVGID_7_);}
.st9{opacity:0.9;fill:url(#SVGID_8_);}
.st10{opacity:0.9;fill:url(#SVGID_9_);}
.st11{fill:url(#SVGID_10_);}
</style>
<g
id="Слой_3"
class="st1">
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="75"
y1="43"
x2="11"
y2="43">
<stop
offset="0"
style="stop-color:#CCCCCC"
id="stop12" />
<stop
offset="1"
style="stop-color:#F2F2F2"
id="stop14" />
</linearGradient>
<rect
x="11"
y="11"
class="st2"
width="64"
height="64"
id="rect17" />
</g>
<g
id="Слой_2">
<g
id="Layer_1">
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="11"
y1="31"
x2="75"
y2="31">
<stop
offset="0"
style="stop-color:#3FD1BB"
id="stop20" />
<stop
offset="0.9951"
style="stop-color:#2CB8B7"
id="stop22" />
</linearGradient>
<path
class="st3"
d="M73,51H13c-1.1,0-2-0.9-2-2V13c0-1.1,0.9-2,2-2h60c1.1,0,2,0.9,2,2v36C75,50.1,74.1,51,73,51z"
id="path25" />
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="67"
y1="59.0355"
x2="19"
y2="59.0355">
<stop
offset="0"
style="stop-color:#CCCCCC"
id="stop27" />
<stop
offset="1"
style="stop-color:#F2F2F2"
id="stop29" />
</linearGradient>
<path
class="st4"
d="M65,75H21c-1.1,0-2-0.9-2-2V43.1h48V73C67,74.1,66.1,75,65,75z"
id="path32" />
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="67"
y1="66.7766"
x2="19"
y2="66.7766"
gradientTransform="matrix(-1 0 0 -1 86 102)">
<stop
offset="0"
style="stop-color:#2E9C8C"
id="stop34" />
<stop
offset="0.9951"
style="stop-color:#549E9D"
id="stop36" />
</linearGradient>
<path
class="st5"
d="M21,27.2h44c1.1,0,2,0.9,2,2v14H19v-14C19,28.1,19.9,27.2,21,27.2z"
id="path39" />
<circle
class="st6"
cx="65"
cy="16.2"
r="2"
id="circle41" />
</g>
<g
id="Слой_5">
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="32.7937"
y1="60.2417"
x2="53.2062"
y2="39.8293">
<stop
offset="0"
style="stop-color:#3D3D3D"
id="stop44" />
<stop
offset="1"
style="stop-color:#262626"
id="stop46" />
</linearGradient>
<path
class="st7"
d="M62,51H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.4-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,50.6,62.5,51,62,51z"
id="path49" />
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="32.7937"
y1="66.2418"
x2="53.2062"
y2="45.8293">
<stop
offset="0"
style="stop-color:#3D3D3D"
id="stop51" />
<stop
offset="1"
style="stop-color:#262626"
id="stop53" />
</linearGradient>
<path
class="st8"
d="M62,57H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.4-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,56.6,62.5,57,62,57z"
id="path56" />
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="32.7937"
y1="72.2418"
x2="53.2062"
y2="51.8293">
<stop
offset="0"
style="stop-color:#3D3D3D"
id="stop58" />
<stop
offset="1"
style="stop-color:#262626"
id="stop60" />
</linearGradient>
<path
class="st9"
d="M62,63H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.5-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,62.6,62.5,63,62,63z"
id="path63" />
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="32.7937"
y1="78.2418"
x2="53.2062"
y2="57.8293">
<stop
offset="0"
style="stop-color:#3D3D3D"
id="stop65" />
<stop
offset="1"
style="stop-color:#262626"
id="stop67" />
</linearGradient>
<path
class="st10"
d="M62,69H24c-0.5,0-1-0.4-1-1l0,0c0-0.6,0.5-1,1-1h38c0.5,0,1,0.4,1,1l0,0C63,68.6,62.5,69,62,69z"
id="path70" />
</g>
</g>
<g
id="Слой_4"
class="st1">
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="67"
y1="27.2872"
x2="19"
y2="27.2872">
<stop
offset="0"
style="stop-color:#CCCCCC"
id="stop74" />
<stop
offset="1"
style="stop-color:#F2F2F2"
id="stop76" />
</linearGradient>
<path
class="st11"
d="M65,59.2H21c-1.1,0-2-0.9-2-2V-2.6c0-1.1,0.9-2,2-2h44c1.1,0,2,0.9,2,2v59.9C67,58.3,66.1,59.2,65,59.2z"
id="path79" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.9 KiB

View file

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 86 86" style="enable-background:new 0 0 86 86;" xml:space="preserve">
<style type="text/css">
.st0{fill:url(#SVGID_1_);}
.st1{display:none;}
.st2{display:inline;fill:url(#SVGID_2_);}
.st3{fill:url(#SVGID_3_);}
.st4{fill:url(#SVGID_4_);}
.st5{fill:url(#SVGID_5_);}
.st6{fill:#4EE6D0;}
.st7{opacity:0.9;fill:url(#SVGID_6_);}
.st8{opacity:0.9;fill:url(#SVGID_7_);}
.st9{opacity:0.9;fill:url(#SVGID_8_);}
.st10{opacity:0.9;fill:url(#SVGID_9_);}
.st11{fill:url(#SVGID_10_);}
</style>
<g id="Слой_1">
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.3" y1="43" x2="85.7" y2="43">
<stop offset="0" style="stop-color:#00B499"/>
<stop offset="0.9951" style="stop-color:#1F8180"/>
</linearGradient>
<path class="st0" d="M85.7,84.3c0,0.8-0.6,1.4-1.4,1.4H1.7c-0.8,0-1.4-0.6-1.4-1.4V1.7c0-0.8,0.6-1.4,1.4-1.4h82.6
c0.8,0,1.4,0.6,1.4,1.4L85.7,84.3L85.7,84.3z"/>
</g>
<g id="Слой_3" class="st1">
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="75" y1="43" x2="11" y2="43">
<stop offset="0" style="stop-color:#CCCCCC"/>
<stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<rect x="11" y="11" class="st2" width="64" height="64"/>
</g>
<g id="Слой_2">
<g id="Layer_1">
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11" y1="31" x2="75" y2="31">
<stop offset="0" style="stop-color:#3FD1BB"/>
<stop offset="0.9951" style="stop-color:#2CB8B7"/>
</linearGradient>
<path class="st3" d="M73,51H13c-1.1,0-2-0.9-2-2V13c0-1.1,0.9-2,2-2h60c1.1,0,2,0.9,2,2v36C75,50.1,74.1,51,73,51z"/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="67" y1="59.0355" x2="19" y2="59.0355">
<stop offset="0" style="stop-color:#CCCCCC"/>
<stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<path class="st4" d="M65,75H21c-1.1,0-2-0.9-2-2V43.1h48V73C67,74.1,66.1,75,65,75z"/>
<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="67" y1="66.7766" x2="19" y2="66.7766" gradientTransform="matrix(-1 0 0 -1 86 102)">
<stop offset="0" style="stop-color:#2E9C8C"/>
<stop offset="0.9951" style="stop-color:#549E9D"/>
</linearGradient>
<path class="st5" d="M21,27.2h44c1.1,0,2,0.9,2,2v14H19v-14C19,28.1,19.9,27.2,21,27.2z"/>
<circle class="st6" cx="65" cy="16.2" r="2"/>
</g>
<g id="Слой_5">
<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="32.7937" y1="60.2417" x2="53.2062" y2="39.8293">
<stop offset="0" style="stop-color:#3D3D3D"/>
<stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path class="st7" d="M62,51H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.4-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,50.6,62.5,51,62,51z"/>
<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="32.7937" y1="66.2418" x2="53.2062" y2="45.8293">
<stop offset="0" style="stop-color:#3D3D3D"/>
<stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path class="st8" d="M62,57H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.4-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,56.6,62.5,57,62,57z"/>
<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="32.7937" y1="72.2418" x2="53.2062" y2="51.8293">
<stop offset="0" style="stop-color:#3D3D3D"/>
<stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path class="st9" d="M62,63H24c-0.5,0-1-0.5-1-1l0,0c0-0.5,0.5-1,1-1h38c0.5,0,1,0.5,1,1l0,0C63,62.6,62.5,63,62,63z"/>
<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="32.7937" y1="78.2418" x2="53.2062" y2="57.8293">
<stop offset="0" style="stop-color:#3D3D3D"/>
<stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path class="st10" d="M62,69H24c-0.5,0-1-0.4-1-1l0,0c0-0.6,0.5-1,1-1h38c0.5,0,1,0.4,1,1l0,0C63,68.6,62.5,69,62,69z"/>
</g>
</g>
<g id="Слой_4" class="st1">
<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="67" y1="27.2872" x2="19" y2="27.2872">
<stop offset="0" style="stop-color:#CCCCCC"/>
<stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<path class="st11" d="M65,59.2H21c-1.1,0-2-0.9-2-2V-2.6c0-1.1,0.9-2,2-2h44c1.1,0,2,0.9,2,2v59.9C67,58.3,66.1,59.2,65,59.2z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="487.381px" height="487.381px" viewBox="0 0 487.381 487.381" style="enable-background:new 0 0 487.381 487.381;"
xml:space="preserve">
<g>
<g>
<path d="M400.1,100.918h-9.871V11.646C390.229,5.215,385.014,0,378.582,0H108.804c-6.436,0-11.646,5.215-11.646,11.646v89.271
h-9.877c-38.523,0-69.871,31.344-69.871,69.871v144.258c0,38.528,31.348,69.87,69.871,69.87h9.877v90.818
c0,6.432,5.21,11.646,11.646,11.646h269.778c6.432,0,11.646-5.215,11.646-11.646v-90.818h9.871
c38.523,0,69.871-31.342,69.871-69.87V170.789C469.971,132.261,438.623,100.918,400.1,100.918z M120.449,23.291h246.489v77.627
H120.449V23.291z M366.938,464.092H120.449V320.465h246.489V464.092z M446.682,315.046c0,25.687-20.896,46.581-46.582,46.581
h-9.871v-41.162h25.186c6.436,0,11.645-5.214,11.645-11.646c0-6.43-5.209-11.645-11.645-11.645h-36.832H108.804H75.421
c-6.431,0-11.646,5.215-11.646,11.645c0,6.433,5.215,11.646,11.646,11.646h21.737v41.162h-9.877
c-25.685,0-46.581-20.896-46.581-46.581V170.789c0-25.685,20.896-46.58,46.581-46.58h21.522H378.58h21.52
c25.684,0,46.58,20.896,46.58,46.58v144.257H446.682z"/>
<path d="M378.582,170.646c-8.771,0-15.893,7.119-15.893,15.893s7.119,15.893,15.893,15.893c8.775,0,15.895-7.118,15.895-15.893
C394.475,177.765,387.357,170.646,378.582,170.646z"/>
<path d="M147.618,360.734h192.146c6.432,0,11.646-5.213,11.646-11.646c0-6.43-5.215-11.645-11.646-11.645H147.618
c-6.431,0-11.646,5.215-11.646,11.645C135.972,355.521,141.187,360.734,147.618,360.734z"/>
<path d="M147.618,403.926h192.146c6.432,0,11.646-5.217,11.646-11.646c0-6.432-5.215-11.645-11.646-11.645H147.618
c-6.431,0-11.646,5.213-11.646,11.645S141.187,403.926,147.618,403.926z"/>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

View file

@ -70,8 +70,8 @@
<context> <context>
<name>CoverPage</name> <name>CoverPage</name>
<message> <message>
<source>My Cover</source> <source>Seaprint</source>
<translation>Mein Cover</translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -123,10 +123,6 @@
<source>Cancelling job</source> <source>Cancelling job</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PrinterPage</name> <name>PrinterPage</name>

View file

@ -70,7 +70,7 @@
<context> <context>
<name>CoverPage</name> <name>CoverPage</name>
<message> <message>
<source>My Cover</source> <source>Seaprint</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -123,10 +123,6 @@
<source>Cancelling job</source> <source>Cancelling job</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PrinterPage</name> <name>PrinterPage</name>