Merge pull request #8094 from leoetlino/log-type-names

Qt/LogConfigWidget: Show log type short names
This commit is contained in:
Léo Lam 2019-05-20 18:27:57 +02:00 committed by GitHub
commit d2c7a6f239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -91,7 +91,7 @@ LogManager::LogManager()
// create log containers // create log containers
m_log[LogTypes::ACTIONREPLAY] = {"ActionReplay", "ActionReplay"}; m_log[LogTypes::ACTIONREPLAY] = {"ActionReplay", "ActionReplay"};
m_log[LogTypes::AUDIO] = {"Audio", "Audio Emulator"}; 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::BOOT] = {"BOOT", "Boot"};
m_log[LogTypes::COMMANDPROCESSOR] = {"CP", "CommandProc"}; m_log[LogTypes::COMMANDPROCESSOR] = {"CP", "CommandProc"};
m_log[LogTypes::COMMON] = {"COMMON", "Common"}; m_log[LogTypes::COMMON] = {"COMMON", "Common"};
@ -131,11 +131,11 @@ LogManager::LogManager()
m_log[LogTypes::PIXELENGINE] = {"PE", "PixelEngine"}; m_log[LogTypes::PIXELENGINE] = {"PE", "PixelEngine"};
m_log[LogTypes::PROCESSORINTERFACE] = {"PI", "ProcessorInt"}; m_log[LogTypes::PROCESSORINTERFACE] = {"PI", "ProcessorInt"};
m_log[LogTypes::POWERPC] = {"PowerPC", "IBM CPU"}; 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::SP1] = {"SP1", "Serial Port 1"};
m_log[LogTypes::SYMBOLS] = {"SYMBOLS", "Symbols"}; m_log[LogTypes::SYMBOLS] = {"SYMBOLS", "Symbols"};
m_log[LogTypes::VIDEO] = {"Video", "Video Backend"}; 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::WIIMOTE] = {"Wiimote", "Wiimote"};
m_log[LogTypes::WII_IPC] = {"WII_IPC", "WII IPC"}; m_log[LogTypes::WII_IPC] = {"WII_IPC", "WII IPC"};

View File

@ -64,8 +64,10 @@ void LogConfigWidget::CreateWidgets()
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{ {
QListWidgetItem* widget = new QListWidgetItem(QString::fromStdString( const auto log_type = static_cast<LogTypes::LOG_TYPE>(i);
LogManager::GetInstance()->GetFullName(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); widget->setCheckState(Qt::Unchecked);
m_types_list->addItem(widget); m_types_list->addItem(widget);
} }