The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-16 12:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3032 from waddlesplash/dolphin-qt

Browse Source 
Lots more minor DolphinQt stuffs.
This commit is contained in:
Scott Mansell
2015-11-23 21:45:28 +13:00
parent deacff4adb 2d9c5ce6b3
commit ffb9722f2d
16 changed files with 121 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt/SystemInfo.cpp
View File

@ -46,7 +46,7 @@ void DSystemInfo::UpdateSystemInfo()
sysinfo += SL("System\n===========================\n");
sysinfo += SL("OS: %1\n").arg(GetOS());
sysinfo += SL("CPU: %1, %2 cores\n").arg(QString::fromStdString(cpu_info.Summarize()))
sysinfo += SL("CPU: %1, %2 logical processors\n").arg(QString::fromStdString(cpu_info.Summarize()))
.arg(QThread::idealThreadCount());
sysinfo += SL("\nDolphin\n===========================\n");
@ -69,12 +69,16 @@ QString DSystemInfo::GetOS() const
case QSysInfo::WV_VISTA: ret += SL("Vista"); break;
case QSysInfo::WV_WINDOWS7: ret += SL("7"); break;
case QSysInfo::WV_WINDOWS8: ret += SL("8"); break;
case QSysInfo::WV_WINDOWS8_1: ret += SL("8.1"); break;
case QSysInfo::WV_WINDOWS10: ret += SL("10"); break;
default: ret += SL("(unknown)"); break;
}
#elif defined(Q_OS_MAC)
ret += SL("Mac OS X ");
switch (QSysInfo::MacintoshVersion) {
case QSysInfo::MV_10_9: ret += SL("10.9"); break;
case QSysInfo::MV_10_10: ret += SL("10.10"); break;
case QSysInfo::MV_10_11: ret += SL("10.11"); break;
default: ret += SL("(unknown)"); break;
}
#elif defined(Q_OS_LINUX)