Mercurial > hg > syntilista

changeset 203:5c3e3967bdf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Qt resource aliases.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 15 Nov 2017 11:08:48 +0200
parents 4e25db3327a7
children fd115ca75ce8 3d21d789b40b
files src/main.cpp src/mainwindow.ui src/resources.qrc
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp	Wed Nov 15 10:34:55 2017 +0200
+++ b/src/main.cpp	Wed Nov 15 11:08:48 2017 +0200
@@ -373,13 +373,13 @@
     resize(settings.uiSize);
 
     // Setup application icon and window title
-    setWindowIcon(QIcon(QPixmap(":/img/icon-64.png")));
+    setWindowIcon(QIcon(QPixmap(":/icon")));
     setWindowTitle(tr("%1 versio %3").
         arg(tr(APP_NAME)).
         arg(tr(APP_VERSION)));
 
     // Setup large logo in the main window
-    QPixmap logoImage(":/img/logo.png");
+    QPixmap logoImage(":/logo");
     ui->button_LogoImage->setPixmap(logoImage);
     ui->button_LogoImage->setAlignment(Qt::AlignCenter);
 
@@ -1663,7 +1663,7 @@
 {
     ui->setupUi(this);
 
-    ui->label_Logo->setPixmap(QPixmap(":/img/icon-64.png"));
+    ui->label_Logo->setPixmap(QPixmap(QStringLiteral(":/icon")));
     ui->label_Logo->setAlignment(Qt::AlignCenter);
 
     ui->label_About->setOpenExternalLinks(true);
--- a/src/mainwindow.ui	Wed Nov 15 10:34:55 2017 +0200
+++ b/src/mainwindow.ui	Wed Nov 15 11:08:48 2017 +0200
@@ -290,7 +290,7 @@
           </property>
           <property name="icon">
            <iconset resource="resources.qrc">
-            <normaloff>:/img/icon-64.png</normaloff>:/img/icon-64.png</iconset>
+            <normaloff>:/icon</normaloff>:/icon</iconset>
           </property>
           <property name="iconSize">
            <size>
--- a/src/resources.qrc	Wed Nov 15 10:34:55 2017 +0200
+++ b/src/resources.qrc	Wed Nov 15 11:08:48 2017 +0200
@@ -1,6 +1,6 @@
 <RCC>
   <qresource>
-    <file>../img/logo.png</file>
-    <file>../img/icon-64.png</file>
+    <file alias="logo">../img/logo.png</file>
+    <file alias="icon">../img/icon-64.png</file>
   </qresource>
 </RCC>