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

Qt: fix tty objectname and add tty text color to stylesheet

This commit is contained in:
Megamouse 2017-09-28 15:23:55 +02:00 committed by Ivan
parent 632c8872cd
commit 3067c8bd27
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/rpcs3_app.cpp
View File

@ -319,6 +319,7 @@ void rpcs3_app::OnChangeStyleSheetRequest(const QString& sheetFilePath)
QString style_log = QString QString style_log = QString
( (
"QTextEdit#tty_frame { background-color: #ffffff; }" "QTextEdit#tty_frame { background-color: #ffffff; }"
"QLabel#tty_text { color: #000000; }"
"QTextEdit#log_frame { background-color: #ffffff; }" "QTextEdit#log_frame { background-color: #ffffff; }"
"QLabel#log_level_always { color: #107896; }" "QLabel#log_level_always { color: #107896; }"
"QLabel#log_level_fatal { color: #ff00ff; }" "QLabel#log_level_fatal { color: #ff00ff; }"

8
rpcs3/rpcs3qt/log_frame.cpp
View File

@ -110,7 +110,7 @@ log_frame::log_frame(std::shared_ptr<gui_settings> guiSettings, QWidget *parent)
m_log->setContextMenuPolicy(Qt::CustomContextMenu); m_log->setContextMenuPolicy(Qt::CustomContextMenu);
m_tty = new QTextEdit(tabWidget); m_tty = new QTextEdit(tabWidget);
m_log->setObjectName("tty_frame"); m_tty->setObjectName("tty_frame");
m_tty->setReadOnly(true); m_tty->setReadOnly(true);
tabWidget->addTab(m_log, tr("Log")); tabWidget->addTab(m_log, tr("Log"));
@ -259,6 +259,7 @@ void log_frame::LoadSettings()
m_stackAct->setChecked(m_stack_log); m_stackAct->setChecked(m_stack_log);
} }
//TODO: repaint old text with new colors
void log_frame::RepaintTextColors() void log_frame::RepaintTextColors()
{ {
// Get text color. Do this once to prevent possible slowdown // Get text color. Do this once to prevent possible slowdown
@ -271,7 +272,10 @@ void log_frame::RepaintTextColors()
m_color.append(GUI::get_Label_Color("log_level_warning")); m_color.append(GUI::get_Label_Color("log_level_warning"));
m_color.append(GUI::get_Label_Color("log_level_notice")); m_color.append(GUI::get_Label_Color("log_level_notice"));
m_color.append(GUI::get_Label_Color("log_level_trace")); m_color.append(GUI::get_Label_Color("log_level_trace"));
m_color_stack = GUI::get_Label_Color("log_stack"); m_color_stack = GUI::get_Label_Color("log_stack");
m_tty->setTextColor(GUI::get_Label_Color("tty_text"));
} }
void log_frame::UpdateUI() void log_frame::UpdateUI()
@ -325,8 +329,6 @@ void log_frame::UpdateUI()
// Confirm log level // Confirm log level
if (packet->sev <= s_gui_listener.enabled) if (packet->sev <= s_gui_listener.enabled)
{ {
// Get text color
QColor color;
QString text; QString text;
switch (packet->sev) switch (packet->sev)
{ {