summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2019-01-15 00:34:24 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2019-01-25 13:18:27 +0000
commitb8931820d660457889ee8bbe7ab072ee5ab63adb (patch)
tree9ba4ff1d725001868ea793bf522187952ed0c06e
parent2290db250851f00bdec071a5431a8f763d232efb (diff)
linguist: Replace splash screen image with 128px application icon
The "splash screen"/"about linguist" image consisted of a custom-made image with an embedded application icon. Due to the high frequency of changing Qt logos and application icons, this became a maintenance burden. This patch replaces that custom-made image with the 128px application icon. Change-Id: I990d57f7866abcafdb67a21173357b0ad5c6a01e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/linguist/linguist/images/splash.pngbin11417 -> 0 bytes
-rw-r--r--src/linguist/linguist/linguist.qrc2
-rw-r--r--src/linguist/linguist/main.cpp2
-rw-r--r--src/linguist/linguist/mainwindow.cpp2
4 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/linguist/images/splash.png b/src/linguist/linguist/images/splash.png
deleted file mode 100644
index 5824fb76c..000000000
--- a/src/linguist/linguist/images/splash.png
+++ /dev/null
Binary files differ
diff --git a/src/linguist/linguist/linguist.qrc b/src/linguist/linguist/linguist.qrc
index 19a060d25..d3b6dcfc0 100644
--- a/src/linguist/linguist/linguist.qrc
+++ b/src/linguist/linguist/linguist.qrc
@@ -29,7 +29,6 @@
<file>images/s_check_off.png</file>
<file>images/s_check_on.png</file>
<file>images/s_check_warning.png</file>
- <file>images/splash.png</file>
<file>images/up.png</file>
<file>images/down.png</file>
<file>images/editdelete.png</file>
@@ -57,5 +56,6 @@
<file>images/win/undo.png</file>
<file>images/win/validateplacemarkers.png</file>
<file>images/win/whatsthis.png</file>
+ <file>images/icons/linguist-128-32.png</file>
</qresource>
</RCC>
diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp
index 3b92dfe1b..0b549b6e0 100644
--- a/src/linguist/linguist/main.cpp
+++ b/src/linguist/linguist/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
QSplashScreen *splash = 0;
int screenId = QApplication::desktop()->screenNumber(tmp.geometry().center());
splash = new QSplashScreen(QApplication::desktop()->screen(screenId),
- QPixmap(QLatin1String(":/images/splash.png")));
+ QPixmap(QLatin1String(":/images/icons/linguist-128-32.png")));
if (QApplication::desktop()->isVirtualDesktop()) {
QRect srect(0, 0, splash->width(), splash->height());
splash->move(QApplication::desktop()->availableGeometry(screenId).center() - srect.center());
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 6095c17de..fa064beb7 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1357,7 +1357,7 @@ void MainWindow::about()
QString version = tr("Version %1");
version = version.arg(QLatin1String(QT_VERSION_STR));
- box.setText(tr("<center><img src=\":/images/splash.png\"/></img><p>%1</p></center>"
+ box.setText(tr("<center><img src=\":/images/icons/linguist-128-32.png\"/></img><p>%1</p></center>"
"<p>Qt Linguist is a tool for adding translations to Qt "
"applications.</p>"
"<p>Copyright (C) %2 The Qt Company Ltd."