Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-07-07 12:55:35 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-07-12 10:33:59 (GMT)
commitd84395df8452696250ee5e20006369f49b99c860 (patch)
tree2f2069e3fa93449fc27c9a7bc9863ba83074ba01
parent7eb404999bb9a522b260f97d624d0f6e524b1bad (diff)
downloadswift-d84395df8452696250ee5e20006369f49b99c860.zip
swift-d84395df8452696250ee5e20006369f49b99c860.tar.bz2
Improved logo-shaded-text.svg and its use in login window
The old version cut off the blurred shade at the top and bottom. The new version has a square page and does not cut off the blurred shade of the Swift logo used in the image. Furthermore rendered the SVG to a 192x192 PNG, the exact dimensions used in the UI, using the `inkscape -e logo-shaded-text.png -w 192 -h 192 -z logo-shaded-text.svg` command. This change also works around QTBUG-46846. Test-Information: Verified that the login window of the UI looks nearly the same as before. It is a bit smaller since the blurred shade is not cut off anymore. Change-Id: Iee56d2a892572f45db7f93a2429455fd9d603eb6
Diffstat
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp5
-rw-r--r--Swift/QtUI/Swift.qrc2
-rw-r--r--Swift/resources/logo/logo-shaded-text.256.pngbin18541 -> 0 bytes
-rw-r--r--Swift/resources/logo/logo-shaded-text.pngbin0 -> 11177 bytes
-rw-r--r--Swift/resources/logo/logo-shaded-text.svg65
5 files changed, 42 insertions, 30 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index bc859e9..6e9510d 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -82,9 +82,8 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set
layout->addStretch(2);
QLabel* logo = new QLabel(this);
- logo->setPixmap(QPixmap(":/logo-shaded-text.256.png"));
- logo->setScaledContents(true);
- logo->setFixedSize(192,192);
+ QIcon swiftWithTextLogo = QIcon(":/logo-shaded-text.png");
+ logo->setPixmap(swiftWithTextLogo.pixmap(QSize(192,192)));
QWidget *logoWidget = new QWidget(this);
QHBoxLayout *logoLayout = new QHBoxLayout();
diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc
index 829f6c8..1572d93 100644
--- a/Swift/QtUI/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc
@@ -4,7 +4,7 @@
<file alias="logo-icon-16.png">../resources/logo/logo-icon-16.png</file>
<file alias="logo-icon-16-win.png">../resources/logo/logo-icon-16-win.png</file>
<file alias="logo-chat-16.png">../resources/logo/logo-chat-16.png</file>
- <file alias="logo-shaded-text.256.png">../resources/logo/logo-shaded-text.256.png</file>
+ <file alias="logo-shaded-text.png">../resources/logo/logo-shaded-text.png</file>
<file alias="icons/online.png">../resources/icons/online.png</file>
<file alias="icons/connecting.mng">../resources/icons/connecting.mng</file>
<file alias="icons/away.png">../resources/icons/away.png</file>
diff --git a/Swift/resources/logo/logo-shaded-text.256.png b/Swift/resources/logo/logo-shaded-text.256.png
deleted file mode 100644
index 5605ad0..0000000
--- a/Swift/resources/logo/logo-shaded-text.256.png
+++ /dev/null
Binary files differ
diff --git a/Swift/resources/logo/logo-shaded-text.png b/Swift/resources/logo/logo-shaded-text.png
new file mode 100644
index 0000000..8bc3bef
--- /dev/null
+++ b/Swift/resources/logo/logo-shaded-text.png
Binary files differ
diff --git a/Swift/resources/logo/logo-shaded-text.svg b/Swift/resources/logo/logo-shaded-text.svg
index 68192e9..deb8340 100644
--- a/Swift/resources/logo/logo-shaded-text.svg
+++ b/Swift/resources/logo/logo-shaded-text.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -8,17 +9,18 @@
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"
- width="744.09003"
- height="744"
+ width="175.8864mm"
+ height="175.8864mm"
id="svg2459"
sodipodi:version="0.32"
- inkscape:version="0.46"
- sodipodi:docname="logo-text.svg"
+ inkscape:version="0.91+devel+osxmenu r12922"
+ sodipodi:docname="logo-shaded-text.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-xdpi="18.796354"
inkscape:export-ydpi="18.796354"
version="1.0"
- inkscape:export-filename="/Users/remko/src/swift/resources/logo/blog.png">
+ inkscape:export-filename="/Users/remko/src/swift/resources/logo/blog.png"
+ viewBox="0 0 664.77 664.76749">
<defs
id="defs2461">
<linearGradient
@@ -45,10 +47,10 @@
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ inkscape:vp_x="0 : 526.18107 : 1"
+ inkscape:vp_y="0 : 999.99996 : 0"
+ inkscape:vp_z="744.09725 : 526.18107 : 1"
+ inkscape:persp3d-origin="372.04862 : 350.78737 : 1"
id="perspective2390" />
<filter
inkscape:collect="always"
@@ -70,15 +72,22 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.0074671"
- inkscape:cx="375"
- inkscape:cy="367.42652"
+ inkscape:cx="254.12047"
+ inkscape:cy="374.35139"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="1169"
- inkscape:window-height="990"
- inkscape:window-x="695"
- inkscape:window-y="75" />
+ inkscape:window-width="1680"
+ inkscape:window-height="1001"
+ inkscape:window-x="0"
+ inkscape:window-y="23"
+ inkscape:window-maximized="0"
+ borderlayer="false"
+ units="mm"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
<metadata
id="metadata2464">
<rdf:RDF>
@@ -87,33 +96,37 @@
<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">
+ id="layer1"
+ transform="translate(12.742622,-46.453819)">
<path
style="opacity:0.35820899;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.82541478px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3237)"
- d="M 115.78906,165.28485 C 350.10074,221.97501 309.63531,304.49349 212.19531,373.84735 C 164.88631,390.51853 105.57186,410.97398 28.664058,434.5661 C 65.101978,429.72741 98.209468,426.47848 128.03906,424.8161 C 98.134688,440.73611 68.227048,455.00104 42.414058,466.8786 C 101.67266,450.07359 152.5607,435.94556 196.60156,424.0036 C 357.97622,430.8864 369.87302,508.77947 220.75781,659.0036 C 445.02711,532.63072 503.94812,439.58103 370.66406,379.59735 C 439.14989,363.96856 465.05721,361.86643 479.53906,363.2536 C 444.72231,339.57148 420.60352,327.54967 393.66406,325.3161 C 452.90693,238.96094 326.66051,184.93904 115.78906,165.28485 z M 396.16406,338.9411 C 400.59386,338.94111 404.19531,342.54255 404.19531,346.97235 C 404.1953,351.40217 400.59387,354.97235 396.16406,354.97235 C 391.73423,354.97236 388.13281,351.40217 388.13281,346.97235 C 388.1328,342.54255 391.73424,338.9411 396.16406,338.9411 z"
+ d="m 115.78906,165.28485 c 234.31168,56.69016 193.84625,139.20864 96.40625,208.5625 -47.309,16.67118 -106.62345,37.12663 -183.531252,60.71875 36.43792,-4.83869 69.54541,-8.08762 99.375002,-9.75 -29.904372,15.92001 -59.812012,30.18494 -85.625002,42.0625 59.258602,-16.80501 110.146642,-30.93304 154.187502,-42.875 161.37466,6.8828 173.27146,84.77587 24.15625,235 224.2693,-126.37288 283.19031,-219.42257 149.90625,-279.40625 68.48583,-15.62879 94.39315,-17.73092 108.875,-16.34375 -34.81675,-23.68212 -58.93554,-35.70393 -85.875,-37.9375 59.24287,-86.35516 -67.00355,-140.37706 -277.875,-160.03125 z m 280.375,173.65625 c 4.4298,10e-6 8.03125,3.60145 8.03125,8.03125 -1e-5,4.42982 -3.60144,8 -8.03125,8 -4.42983,10e-6 -8.03125,-3.57018 -8.03125,-8 -1e-5,-4.4298 3.60143,-8.03125 8.03125,-8.03125 z"
id="path2441"
- transform="matrix(1.2286617,0,0,1.2286617,7.4362342,-159.13251)" />
+ transform="matrix(1.2286617,0,0,1.2286617,7.4362425,-127.54827)"
+ inkscape:connector-curvature="0" />
<path
style="opacity:0.35820899;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00333011px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 193.43655,38.683901 C 481.36377,106.86408 431.64137,206.12084 311.88952,289.5279 C 253.76866,309.57308 180.85932,334.14392 86.387308,362.50752 C 131.16565,356.68778 171.8703,352.78146 208.52634,350.78268 C 171.78326,369.92726 135.03618,387.08152 103.32012,401.36485 C 176.12602,381.15723 238.61951,364.20345 292.72972,349.8432 C 491.00731,358.12042 505.62549,451.75302 322.41016,632.40439 C 597.96661,480.43489 670.40043,368.53822 506.63621,296.40496 C 590.78377,277.6106 622.61572,275.12026 640.40936,276.7884 C 597.63051,248.30952 567.9961,233.81513 534.89597,231.12916 C 607.68329,127.28416 452.52952,62.318851 193.43655,38.683901 z M 537.9677,247.51387 C 543.41055,247.51388 547.79717,251.84478 547.79717,257.17184 C 547.79718,262.49891 543.41054,266.8298 537.9677,266.8298 C 532.52484,266.8298 528.09981,262.49891 528.09981,257.17184 C 528.09981,251.84478 532.52483,247.51387 537.9677,247.51387 z"
- id="path2469" />
+ d="m 193.43656,70.268137 c 287.92722,68.180183 238.20482,167.436943 118.45297,250.844003 -58.12086,20.04518 -131.0302,44.61602 -225.502214,72.97962 44.778344,-5.81974 85.482994,-9.72606 122.139034,-11.72484 -36.74308,19.14458 -73.49016,36.29884 -105.20622,50.58217 72.8059,-20.20762 135.29939,-37.1614 189.4096,-51.52165 198.27759,8.27722 212.89577,101.90982 29.68044,282.56119 C 597.96662,512.01913 670.40044,400.12246 506.63622,327.9892 590.78378,309.19484 622.61573,306.7045 640.40937,308.37264 597.63052,279.89376 567.99611,265.39937 534.89598,262.7134 607.6833,158.8684 452.52953,93.903087 193.43656,70.268137 Z M 537.96771,279.09811 c 5.44285,10e-6 9.82947,4.33091 9.82947,9.65797 10e-6,5.32707 -4.38663,9.65796 -9.82947,9.65796 -5.44286,0 -9.86789,-4.33089 -9.86789,-9.65796 0,-5.32706 4.42502,-9.65797 9.86789,-9.65797 z"
+ id="path2469"
+ inkscape:connector-curvature="0" />
<text
xml:space="preserve"
- style="font-size:160.47987366px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bodoni SvtyTwo OS ITC TT;-inkscape-font-specification:Bodoni SvtyTwo OS ITC TT"
- x="22.41254"
- y="527.68341"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:160.48001099px;line-height:125%;font-family:'Bodoni 72 Oldstyle';-inkscape-font-specification:'Bodoni 72 Oldstyle, Normal';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="22.412548"
+ y="557.24536"
id="text4727"
sodipodi:linespacing="125%"
- transform="scale(0.9359712,1.0684089)"><tspan
+ transform="scale(0.93597122,1.0684089)"><tspan
sodipodi:role="line"
id="tspan4729"
- x="22.41254"
- y="527.68341">Swift</tspan></text>
+ x="22.412548"
+ y="557.24536">Swift</tspan></text>
</g>
</svg>