Merge pull request #933 from dsm/current

add app icon using cmake and rc file.
ra3xdh · Sep 5, 2024 · 2bb83b5 · 2bb83b5
2 parents 22d5238 + 6a26ae9
commit 2bb83b5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
@@ -257,15 +257,17 @@ IF(APPLE)
     #SET(RESOURCES_SRCS ${RESOURCES_SRCS} ${LANG_SRCS})
 ENDIF(APPLE)
 
-
+set(app_icon_resource_windows "${CMAKE_CURRENT_SOURCE_DIR}/qucs_icon.rc")
 #
 #  CMake's way of creating an executable
 #
 ADD_EXECUTABLE( ${QUCS_NAME} MACOSX_BUNDLE WIN32
   ${QUCS_HDRS}
   ${QUCS_SRCS}
   ${QUCS_MOC_SRCS}
-  ${RESOURCES_SRCS} )
+  ${RESOURCES_SRCS}
+  ${app_icon_resource_windows}
+ )
 
 #
 # Tell CMake which libraries we need to link our executable against.

diff --git a/qucs/dialogs/aboutdialog.cpp b/qucs/dialogs/aboutdialog.cpp
@@ -124,7 +124,7 @@ AboutDialog::AboutDialog(QWidget *parent)
   //all->setSpacing(0);
 
   QLabel *iconLabel = new QLabel();
-  iconLabel->setPixmap(QPixmap(QString(":/bitmaps/hicolor/128x128/apps/qucs.png")));
+  iconLabel->setPixmap(QPixmap(QString(":/bitmaps/hicolor/scalable/apps/qucs.svg")));
 
   QWidget *hbox = new QWidget();
   QHBoxLayout *hl = new QHBoxLayout(hbox);

diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
@@ -265,7 +265,7 @@ void QucsApp::initView()
   // set application icon
   // APPLE sets the QApplication icon with Info.plist
 #ifndef __APPLE__
-  setWindowIcon (QPixmap(":/bitmaps/big.qucs.xpm"));
+  setWindowIcon (QPixmap(QString(":/bitmaps/hicolor/scalable/apps/qucs.svg")));
 #else
   // setUnifiedTitleAndToolBarOnMac(true);
   setStyleSheet("QToolButton { padding: 0px; }");

diff --git a/qucs/qucs.qrc b/qucs/qucs.qrc
@@ -7,6 +7,7 @@
         <file>bitmaps/tiny.button.qucs.xpm</file>
         <file>bitmaps/tiny.qucs.xpm</file>
         <file>bitmaps/hicolor/128x128/apps/qucs.png</file>
+        <file>bitmaps/hicolor/scalable/apps/qucs.svg</file>
         <file>bitmaps/svg/filenew.svg</file>
         <file>bitmaps/svg/textnew.svg</file>
         <file>bitmaps/svg/symnew.svg</file>

diff --git a/qucs/qucs_icon.rc b/qucs/qucs_icon.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "bitmaps/qucs.ico"