Add window icon.

Harinlen · Jun 2, 2015 · 30769bd · 30769bd
1 parent be650f0
commit 30769bd
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 2 deletions.
diff --git a/Robot.pro b/Robot.pro
@@ -4,6 +4,12 @@ QT += core gui widgets
 #Enabled c++ 11 syntax.
 CONFIG += c++11
 
+#Win32 configure.
+win32
+{
+    RC_FILE += win.rc
+}
+
 SOURCES += \
     main.cpp \
     mainwindow.cpp \
@@ -40,3 +46,9 @@ HEADERS += \
     groundglobal.h \
     polygoneditor.h \
     robotmanagewidget.h
+
+RESOURCES += \
+    res.qrc
+
+DISTFILES += \
+    win.rc
diff --git a/icon.ico b/icon.ico
diff --git a/main.cpp b/main.cpp
@@ -23,7 +23,7 @@
  * \brief Initial the main window of the application.
  * \param argc Argument count.
  * \param argv Argument values.
- * \return
+ * \return The result of the message loop.
  */
 int main(int argc, char *argv[])
 {

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -34,7 +34,8 @@ MainWindow::MainWindow(QWidget *parent) :
     m_robotManagement(new RobotManagement(this)),
     m_groundGenerator(new GenerateGround(this))
 {
-    //Set the minimum size.
+    //Set properties.
+    setWindowIcon(QIcon("://res/icon.png"));
     setMinimumSize(500, 309);
     //Initial the scroll area.
     QScrollArea *groundArea=new QScrollArea(this);

diff --git a/paneldock.cpp b/paneldock.cpp
@@ -68,5 +68,6 @@ void PanelDock::showEvent(QShowEvent *event)
 
 void PanelDock::retranslate()
 {
+    setWindowTitle(tr("Timeline"));
     m_dockVisible->setText(tr("Control Dock"));
 }
diff --git a/res.qrc b/res.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>res/icon.png</file>
+    </qresource>
+</RCC>
diff --git a/res/icon.png b/res/icon.png
diff --git a/win.rc b/win.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico"