From 61414cd1c6836eb98f1e99d485313aed5e0fe7c7 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Thu, 5 Feb 2015 23:27:01 +0600 Subject: [PATCH] Add config dialog icon. --- GLideNUI/Icon.png | Bin 0 -> 6398 bytes GLidenUI/GLideNUI.cpp | 5 ++++ GLidenUI/GLideNUI.pro | 3 +- GLidenUI/GLideNUI.vcxproj | 25 +++++++++++++++- GLidenUI/GLideNUI.vcxproj.filters | 47 +++++++++++++++++++++--------- GLidenUI/configDialog.ui | 8 ++++- 6 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 GLideNUI/Icon.png diff --git a/GLideNUI/Icon.png b/GLideNUI/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..00b9e0f0630c6cd85cecaf33f108a2b91916bedb GIT binary patch literal 6398 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 M07*qoM6N<$g8Ao3NB{r; literal 0 HcmV?d00001 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