MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Add config dialog icon.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-02-05 23:27:01 +06:00
parent ced838fed2
commit 61414cd1c6
6 changed files with 72 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
GLideNUI/Icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

5
GLidenUI/GLideNUI.cpp
View File

@ -10,9 +10,14 @@
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#endif #endif
inline void initMyResource() { Q_INIT_RESOURCE(icon); }
inline void cleanMyResource() { Q_CLEANUP_RESOURCE(icon); }
static static
int openConfigDialog() int openConfigDialog()
{ {
cleanMyResource();
initMyResource();
loadSettings(); loadSettings();
int argc = 0; int argc = 0;

3
GLidenUI/GLideNUI.pro
View File

@ -25,7 +25,8 @@ HEADERS += \
FullscreenResolutions.h \ FullscreenResolutions.h \
Settings.h Settings.h
RESOURCES += RESOURCES += \
icon.qrc
FORMS += \ FORMS += \
configDialog.ui configDialog.ui

25
GLidenUI/GLideNUI.vcxproj
View File

@ -130,6 +130,12 @@
<ClCompile Include="GeneratedFiles\Debug\moc_ConfigDialog.cpp"> <ClCompile Include="GeneratedFiles\Debug\moc_ConfigDialog.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\qrc_icon.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_ConfigDialog.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_ConfigDialog.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
@ -138,7 +144,6 @@
<ClCompile Include="Settings.cpp" /> <ClCompile Include="Settings.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Settings.h" />
<CustomBuild Include="ConfigDialog.h"> <CustomBuild Include="ConfigDialog.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
if errorlevel 1 goto VCEnd if errorlevel 1 goto VCEnd
@ -162,6 +167,7 @@ endlocal
<ClInclude Include="FullscreenResolutions.h" /> <ClInclude Include="FullscreenResolutions.h" />
<ClInclude Include="GeneratedFiles\ui_configDialog.h" /> <ClInclude Include="GeneratedFiles\ui_configDialog.h" />
<ClInclude Include="GLideNUI.h" /> <ClInclude Include="GLideNUI.h" />
<ClInclude Include="Settings.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="configDialog.ui"> <CustomBuild Include="configDialog.ui">
@ -176,6 +182,23 @@ endlocal
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Icon.png">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</None>
<CustomBuild Include="icon.qrc">
<FileType>Document</FileType>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\Icon.png;%(AdditionalInputs)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\Icon.png;%(AdditionalInputs)</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" /> <ImportGroup Label="ExtensionTargets" />
<ProjectExtensions> <ProjectExtensions>

47
GLidenUI/GLideNUI.vcxproj.filters
View File

@ -27,6 +27,16 @@
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter> </Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
<Extensions>qrc;*</Extensions>
<ParseFiles>false</ParseFiles>
</Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
@ -36,12 +46,12 @@
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="Generated Files\Debug"> <Filter Include="Generated Files\Debug">
<UniqueIdentifier>{3c4de5d9-fbc9-428b-a76a-4316cc47ab18}</UniqueIdentifier> <UniqueIdentifier>{d9d08fb0-53a8-4724-b4ab-fb1e2ea99dfd}</UniqueIdentifier>
<Extensions>cpp;moc</Extensions> <Extensions>cpp;moc</Extensions>
<SourceControlFiles>False</SourceControlFiles> <SourceControlFiles>False</SourceControlFiles>
</Filter> </Filter>
<Filter Include="Generated Files\Release"> <Filter Include="Generated Files\Release">
<UniqueIdentifier>{56b4f220-aa69-4516-a37c-1f65e75c30da}</UniqueIdentifier> <UniqueIdentifier>{af9d1355-f301-48fa-b05c-f2943e14f77d}</UniqueIdentifier>
<Extensions>cpp;moc</Extensions> <Extensions>cpp;moc</Extensions>
<SourceControlFiles>False</SourceControlFiles> <SourceControlFiles>False</SourceControlFiles>
</Filter> </Filter>
@ -50,23 +60,26 @@
<ClCompile Include="ConfigDialog.cpp"> <ClCompile Include="ConfigDialog.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FullscreenResolutions_windows.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GLideNUI.cpp"> <ClCompile Include="GLideNUI.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ScreenShot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Settings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GeneratedFiles\Debug\moc_ConfigDialog.cpp"> <ClCompile Include="GeneratedFiles\Debug\moc_ConfigDialog.cpp">
<Filter>Generated Files\Debug</Filter> <Filter>Generated Files\Debug</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="GeneratedFiles\Release\moc_ConfigDialog.cpp"> <ClCompile Include="GeneratedFiles\Release\moc_ConfigDialog.cpp">
<Filter>Generated Files\Release</Filter> <Filter>Generated Files\Release</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FullscreenResolutions_windows.cpp"> <ClCompile Include="GeneratedFiles\qrc_icon.cpp">
<Filter>Source Files</Filter> <Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="Settings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ScreenShot.cpp">
<Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -79,18 +92,26 @@
<ClInclude Include="GLideNUI.h"> <ClInclude Include="GLideNUI.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="configDialog.ui"> <CustomBuild Include="configDialog.ui">
<Filter>Form Files</Filter> <Filter>Form Files</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Icon.png">
<Filter>Resource Files</Filter>
</None>
<CustomBuild Include="icon.qrc">
<Filter>Resource Files</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="GeneratedFiles\ui_configDialog.h"> <ClInclude Include="GeneratedFiles\ui_configDialog.h">
<Filter>Generated Files</Filter> <Filter>Generated Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
GLidenUI/configDialog.ui
View File

@ -22,6 +22,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>GLideN64 settings</string> <string>GLideN64 settings</string>
</property> </property>
<property name="windowIcon">
<iconset resource="icon.qrc">
<normaloff>:/Icon.png</normaloff>:/Icon.png</iconset>
</property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -970,7 +974,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="icon.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>