diff options
author | Tobias Markmann <tm@ayena.de> | 2016-07-07 12:55:35 (GMT) |
---|---|---|
committer | Kevin Smith <kevin.smith@isode.com> | 2016-07-12 10:33:59 (GMT) |
commit | d84395df8452696250ee5e20006369f49b99c860 (patch) | |
tree | 2f2069e3fa93449fc27c9a7bc9863ba83074ba01 /Swift/QtUI | |
parent | 7eb404999bb9a522b260f97d624d0f6e524b1bad (diff) | |
download | swift-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 (limited to 'Swift/QtUI')
-rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 5 | ||||
-rw-r--r-- | Swift/QtUI/Swift.qrc | 2 |
2 files changed, 3 insertions, 4 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> |