diff --git a/GLideNUI/Icon.png b/GLideNUI/Icon.png new file mode 100644 index 00000000..00b9e0f0 Binary files /dev/null and b/GLideNUI/Icon.png differ diff --git a/GLidenUI/GLideNUI.cpp b/GLidenUI/GLideNUI.cpp index 5c8bdd14..2a129ab5 100644 --- a/GLidenUI/GLideNUI.cpp +++ b/GLidenUI/GLideNUI.cpp @@ -10,9 +10,14 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) #endif +inline void initMyResource() { Q_INIT_RESOURCE(icon); } +inline void cleanMyResource() { Q_CLEANUP_RESOURCE(icon); } + static int openConfigDialog() { + cleanMyResource(); + initMyResource(); loadSettings(); int argc = 0; diff --git a/GLidenUI/GLideNUI.pro b/GLidenUI/GLideNUI.pro index 393b9e6f..e7364d49 100644 --- a/GLidenUI/GLideNUI.pro +++ b/GLidenUI/GLideNUI.pro @@ -25,7 +25,8 @@ HEADERS += \ FullscreenResolutions.h \ Settings.h -RESOURCES += +RESOURCES += \ + icon.qrc FORMS += \ configDialog.ui diff --git a/GLidenUI/GLideNUI.vcxproj b/GLidenUI/GLideNUI.vcxproj index 5b2a95cd..f3a4a4a0 100644 --- a/GLidenUI/GLideNUI.vcxproj +++ b/GLidenUI/GLideNUI.vcxproj @@ -130,6 +130,12 @@ true + + + + + + true @@ -138,7 +144,6 @@ - setlocal if errorlevel 1 goto VCEnd @@ -162,6 +167,7 @@ endlocal + @@ -176,6 +182,23 @@ endlocal .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + + + true + true + + + Document + %(FullPath);.\Icon.png;%(AdditionalInputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + %(FullPath);.\Icon.png;%(AdditionalInputs) + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + Rcc%27ing %(Identity)... + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + + diff --git a/GLidenUI/GLideNUI.vcxproj.filters b/GLidenUI/GLideNUI.vcxproj.filters index 72673f69..ed68ba83 100644 --- a/GLidenUI/GLideNUI.vcxproj.filters +++ b/GLidenUI/GLideNUI.vcxproj.filters @@ -27,6 +27,16 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + + + {D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E} + qrc;* + false + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx @@ -36,12 +46,12 @@ cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - {3c4de5d9-fbc9-428b-a76a-4316cc47ab18} + {d9d08fb0-53a8-4724-b4ab-fb1e2ea99dfd} cpp;moc False - {56b4f220-aa69-4516-a37c-1f65e75c30da} + {af9d1355-f301-48fa-b05c-f2943e14f77d} cpp;moc False @@ -50,23 +60,26 @@ Source Files + + Source Files + Source Files + + Source Files + + + Source Files + Generated Files\Debug Generated Files\Release - - Source Files - - - Source Files - - - Source Files + + Generated Files @@ -79,18 +92,26 @@ Header Files + + Header Files + Form Files + + + Resource Files + + + Resource Files + + Generated Files - - Header Files - \ No newline at end of file diff --git a/GLidenUI/configDialog.ui b/GLidenUI/configDialog.ui index c61a05c9..f449d1e9 100644 --- a/GLidenUI/configDialog.ui +++ b/GLidenUI/configDialog.ui @@ -22,6 +22,10 @@ GLideN64 settings + + + :/Icon.png:/Icon.png + true @@ -970,7 +974,9 @@ - + + + buttonBox