Add Mac OS X icon

Harinlen · Jun 2, 2015 · 4b04533 · 4b04533
1 parent 8af6a9b
commit 4b04533
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Robot.pro b/Robot.pro
@@ -7,9 +7,14 @@ CONFIG += c++11
 #Win32 configure.
 win32
 {
-    RC_FILE += win.rc
     DISTFILES += \
         win.rc
+    RC_FILE += win.rc
+}
+
+macx
+{
+    ICON = icon.icns
 }
 
 SOURCES += \
@@ -48,7 +53,8 @@ HEADERS += \
     groundrealtimepreviewer.h \
     groundglobal.h \
     polygoneditor.h \
-    robotmanagewidget.h
+    robotmanagewidget.h \
+    about.h
 
 RESOURCES += \
     res.qrc
diff --git a/about.cpp b/about.cpp
@@ -31,12 +31,15 @@ void About::showAbout(QWidget *parent)
 About::About(QWidget *parent) :
     QDialog(parent)
 {
+    //Set the main layout.
     QBoxLayout *mainLayout=new QBoxLayout(QBoxLayout::TopToBottom,
                                           this);
     setLayout(mainLayout);
 
     QLabel *icon=new QLabel(this);
-    icon->setPixmap(QPixmap(""));
+    icon->setPixmap(QPixmap("://res/icon.png"));
+    icon->setFixedSize(256, 256);
+    icon->setScaledContents(true);
     mainLayout->addWidget(icon, 1, Qt::AlignHCenter);
     mainLayout->addWidget(new QLabel(tr("Robot Emulator"), this),
                           0,

diff --git a/icon.icns b/icon.icns