Merge branch 'feature/nice-fix' of github.com:dmpas/tool1cd into feat…

…ure/nice-fix
soofex · Apr 12, 2018 · 6fb89dc · 6fb89dc
2 parents 044cb26 + 979120d
commit 6fb89dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/gtool1cd/CMakeLists.txt b/src/gtool1cd/CMakeLists.txt
@@ -3,6 +3,7 @@ project(gtool1cd)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 find_package(Qt5Widgets REQUIRED)
@@ -56,7 +57,7 @@ set(SOURCE_FILES main.cpp mainwindow.cpp starter.cpp littlelogwindow.cpp cache.c
 	skobkatextwindow.cpp export_table_to_xml_dialog.cpp configurations_window.cpp
 	${MODEL_SOURCES} ${QHEXEDIT_SOURCES} BlobViewer/blob_viewer.cpp container_form.cpp)
 
-set (RESOURCES gtool1cd.rc)
+set (RESOURCES gtool1cd.rc gtool1cd.qrc)
 
 add_executable(gtool1cd WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${UI_FILES} ${RESOURCES})
 

diff --git a/src/gtool1cd/gtool1cd.qrc b/src/gtool1cd/gtool1cd.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/Images">
+        <file alias="MainIcon">res/cTool_1CD_Icon.ico</file>
+    </qresource>
+</RCC>
diff --git a/src/gtool1cd/main.cpp b/src/gtool1cd/main.cpp
@@ -19,8 +19,11 @@ tr_syn = new TMultiReadExclusiveWriteSynchronizer();
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
+	QIcon mainIcon(":/Images/MainIcon");
+	a.setWindowIcon(mainIcon);
 
 	StarterWindow w;
+	w.setWindowIcon(mainIcon);
 	w.setCache(new Cache());
 	w.show();