ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Updates to the SystemInfo dialog. 

* Windows 8.1/10 & OS X .10/.11 constants now in Qt
 * idealThreadCount() includes hyperthreads, so say 'logical processors'
This commit is contained in:
waddlesplash 2015-09-12 13:37:33 -04:00
parent 7c2f22fd0c
commit 7c91669ced
1 changed files with 5 additions and 1 deletions
Show Stats 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("System\n===========================\n");
sysinfo += SL("OS: %1\n").arg(GetOS()); 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()); .arg(QThread::idealThreadCount());
sysinfo += SL("\nDolphin\n===========================\n"); sysinfo += SL("\nDolphin\n===========================\n");
@ -70,12 +70,16 @@ QString DSystemInfo::GetOS() const
case QSysInfo::WV_VISTA: ret += SL("Vista"); break; case QSysInfo::WV_VISTA: ret += SL("Vista"); break;
case QSysInfo::WV_WINDOWS7: ret += SL("7"); break; case QSysInfo::WV_WINDOWS7: ret += SL("7"); break;
case QSysInfo::WV_WINDOWS8: ret += SL("8"); 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; default: ret += SL("(unknown)"); break;
} }
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
ret += SL("Mac OS X "); ret += SL("Mac OS X ");
switch (QSysInfo::MacintoshVersion) { switch (QSysInfo::MacintoshVersion) {
case QSysInfo::MV_10_9: ret += SL("10.9"); break; 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; default: ret += SL("(unknown)"); break;
} }
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)