mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-03 06:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "qt ui update"

Browse source 
This reverts commit 813ab23895.
This commit is contained in:
Nayla Hanegan 2024-05-23 17:36:21 -04:00
commit bbdf0732ad
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/DolphinLib.vcxproj
View file

@ -77,11 +77,6 @@
<BuildInfoTemplate>Common\build_info.txt.in</BuildInfoTemplate> <BuildInfoTemplate>Common\build_info.txt.in</BuildInfoTemplate>
<BuildInfoOutput>$(BinaryOutputDir)build_info.txt</BuildInfoOutput> <BuildInfoOutput>$(BinaryOutputDir)build_info.txt</BuildInfoOutput>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<Text Include="$(BuildInfoTemplate)" /> <Text Include="$(BuildInfoTemplate)" />
</ItemGroup> </ItemGroup>

6
Source/Core/DolphinQt/CMakeLists.txt
View file

@ -388,6 +388,12 @@ add_executable(dolphin-mpn
WiiUpdate.h WiiUpdate.h
) )
if (WIN32)
target_sources(dolphin-mpn PRIVATE
Styles/Dark/dark.qrc
)
endif()
if (NOT WIN32) if (NOT WIN32)
target_sources(dolphin-mpn PRIVATE target_sources(dolphin-mpn PRIVATE
QtUtils/SignalDaemon.cpp QtUtils/SignalDaemon.cpp

4
Source/Core/DolphinQt/DolphinQt.vcxproj
View file

@ -45,14 +45,10 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles> <ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
</ClCompile> </ClCompile>
<Manifest> <Manifest>
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest> </Manifest>
<Link>
<TreatLinkerWarningAsErrors Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatLinkerWarningAsErrors>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="AboutDialog.cpp" /> <ClCompile Include="AboutDialog.cpp" />

6
Source/Core/DolphinQt/Settings/InterfacePane.cpp
View file

@ -140,6 +140,12 @@ void InterfacePane::CreateUI()
m_combobox_userstyle->addItem(tr("System"), static_cast<int>(Settings::StyleType::System)); m_combobox_userstyle->addItem(tr("System"), static_cast<int>(Settings::StyleType::System));
// TODO: Support forcing light/dark on other OSes too.
#ifdef _WIN32
m_combobox_userstyle->addItem(tr("Light"), static_cast<int>(Settings::StyleType::Light));
m_combobox_userstyle->addItem(tr("Dark"), static_cast<int>(Settings::StyleType::Dark));
#endif
for (const std::string& path : userstyle_search_results) for (const std::string& path : userstyle_search_results)
{ {
const QFileInfo file_info(QString::fromStdString(path)); const QFileInfo file_info(QString::fromStdString(path));

3
Source/VSProps/QtCompile.props
View file

@ -113,8 +113,7 @@
<QtDllNames Include="@(QtDllNames_ -> '%(Identity)$(QtLibSuffix).dll')" /> <QtDllNames Include="@(QtDllNames_ -> '%(Identity)$(QtLibSuffix).dll')" />
<QtDllsSrc Include="@(QtDllNames -> '$(QtBinDir)%(Identity)')" /> <QtDllsSrc Include="@(QtDllNames -> '$(QtBinDir)%(Identity)')" />
<QtDllsDst Include="@(QtDllNames -> '$(BinaryOutputDir)%(Identity)')" /> <QtDllsDst Include="@(QtDllNames -> '$(BinaryOutputDir)%(Identity)')" />
<QtPluginNames_ Include="iconengines\qsvgicon;imageformats\qsvg;platforms\qdirect2d;platforms\qwindows;styles\qwindowsvistastyle"/>
<QtPluginNames_ Include="iconengines\qsvgicon;imageformats\qsvg;platforms\qdirect2d;platforms\qwindows;styles\qmodernwindowsstyle"/>
<QtPluginNames Include="@(QtPluginNames_ -> '%(Identity)$(QtLibSuffix).dll')" /> <QtPluginNames Include="@(QtPluginNames_ -> '%(Identity)$(QtLibSuffix).dll')" />
<QtPluginsSrc Include="@(QtPluginNames -> '$(QtPluginsDir)%(Identity)')" /> <QtPluginsSrc Include="@(QtPluginNames -> '$(QtPluginsDir)%(Identity)')" />
<QtPluginsDst Include="@(QtPluginNames -> '$(BinaryOutputDir)$(QtPluginFolder)\%(Identity)')" /> <QtPluginsDst Include="@(QtPluginNames -> '$(BinaryOutputDir)$(QtPluginFolder)\%(Identity)')" />