diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-05-20 18:27:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 18:27:57 +0200 |
| commit | d2c7a6f2392c79fc447de825fb752305b04df41b (patch) | |
| tree | e380177736e6d7510f84de80082eb6f123e350b7 /Source | |
| parent | d3c4d278e2a795ab4aadbb6ed1dafcc826c03301 (diff) | |
| parent | 453c1d4170745e9f3ca20b1edaede40966c769ea (diff) | |
Merge pull request #8094 from leoetlino/log-type-names
Qt/LogConfigWidget: Show log type short names
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Logging/LogManager.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/Config/LogConfigWidget.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 6efb4a39d0..4e946e8fd2 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -91,7 +91,7 @@ LogManager::LogManager() // create log containers m_log[LogTypes::ACTIONREPLAY] = {"ActionReplay", "ActionReplay"}; m_log[LogTypes::AUDIO] = {"Audio", "Audio Emulator"}; - m_log[LogTypes::AUDIO_INTERFACE] = {"AI", "Audio Interface (AI)"}; + m_log[LogTypes::AUDIO_INTERFACE] = {"AI", "Audio Interface"}; m_log[LogTypes::BOOT] = {"BOOT", "Boot"}; m_log[LogTypes::COMMANDPROCESSOR] = {"CP", "CommandProc"}; m_log[LogTypes::COMMON] = {"COMMON", "Common"}; @@ -131,11 +131,11 @@ LogManager::LogManager() m_log[LogTypes::PIXELENGINE] = {"PE", "PixelEngine"}; m_log[LogTypes::PROCESSORINTERFACE] = {"PI", "ProcessorInt"}; m_log[LogTypes::POWERPC] = {"PowerPC", "IBM CPU"}; - m_log[LogTypes::SERIALINTERFACE] = {"SI", "Serial Interface (SI)"}; + m_log[LogTypes::SERIALINTERFACE] = {"SI", "Serial Interface"}; m_log[LogTypes::SP1] = {"SP1", "Serial Port 1"}; m_log[LogTypes::SYMBOLS] = {"SYMBOLS", "Symbols"}; m_log[LogTypes::VIDEO] = {"Video", "Video Backend"}; - m_log[LogTypes::VIDEOINTERFACE] = {"VI", "Video Interface (VI)"}; + m_log[LogTypes::VIDEOINTERFACE] = {"VI", "Video Interface"}; m_log[LogTypes::WIIMOTE] = {"Wiimote", "Wiimote"}; m_log[LogTypes::WII_IPC] = {"WII_IPC", "WII IPC"}; diff --git a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp index adde3d95f0..5e336a8f93 100644 --- a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp +++ b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp @@ -64,8 +64,10 @@ void LogConfigWidget::CreateWidgets() for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) { - QListWidgetItem* widget = new QListWidgetItem(QString::fromStdString( - LogManager::GetInstance()->GetFullName(static_cast<LogTypes::LOG_TYPE>(i)))); + const auto log_type = static_cast<LogTypes::LOG_TYPE>(i); + const QString full_name = QString::fromUtf8(LogManager::GetInstance()->GetFullName(log_type)); + const QString short_name = QString::fromUtf8(LogManager::GetInstance()->GetShortName(log_type)); + auto* widget = new QListWidgetItem(QStringLiteral("%1 (%2)").arg(full_name, short_name)); widget->setCheckState(Qt::Unchecked); m_types_list->addItem(widget); } |