diff --git a/src/platform/qt/AssetInfo.cpp b/src/platform/qt/AssetInfo.cpp index 22f1a464e..b0d180ae3 100644 --- a/src/platform/qt/AssetInfo.cpp +++ b/src/platform/qt/AssetInfo.cpp @@ -22,6 +22,7 @@ void AssetInfo::addCustomProperty(const QString& id, const QString& visibleName) QLabel* value = new QLabel; value->setFont(GBAApp::app()->monospaceFont()); value->setAlignment(Qt::AlignRight); + value->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); newLayout->addWidget(value); m_customProperties[id] = value; int index = customLocation(); diff --git a/src/platform/qt/AssetTile.ui b/src/platform/qt/AssetTile.ui index 6712166f2..266a042ec 100644 --- a/src/platform/qt/AssetTile.ui +++ b/src/platform/qt/AssetTile.ui @@ -51,7 +51,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -74,6 +74,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -96,7 +99,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -162,6 +165,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -169,6 +175,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -176,6 +185,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + diff --git a/src/platform/qt/DebuggerConsole.cpp b/src/platform/qt/DebuggerConsole.cpp index b7ac06323..2d4261afb 100644 --- a/src/platform/qt/DebuggerConsole.cpp +++ b/src/platform/qt/DebuggerConsole.cpp @@ -6,6 +6,7 @@ #include "DebuggerConsole.h" #include "DebuggerConsoleController.h" +#include "GBAApp.h" #include @@ -18,6 +19,8 @@ DebuggerConsole::DebuggerConsole(DebuggerConsoleController* controller, QWidget* m_ui.setupUi(this); m_ui.prompt->installEventFilter(this); + m_ui.log->setFont(GBAApp::app()->monospaceFont()); + m_ui.prompt->setFont(GBAApp::app()->monospaceFont()); connect(m_ui.prompt, &QLineEdit::returnPressed, this, &DebuggerConsole::postLine); connect(controller, &DebuggerConsoleController::log, this, &DebuggerConsole::log); @@ -81,4 +84,4 @@ bool DebuggerConsole::eventFilter(QObject*, QEvent* event) { m_ui.prompt->setText(m_history[m_history.size() - m_historyOffset]); } return true; -} \ No newline at end of file +} diff --git a/src/platform/qt/DebuggerConsole.ui b/src/platform/qt/DebuggerConsole.ui index 7374afd89..4199e1e83 100644 --- a/src/platform/qt/DebuggerConsole.ui +++ b/src/platform/qt/DebuggerConsole.ui @@ -16,11 +16,6 @@ - - - Source Code Pro - - Enter command (try `help` for more info) @@ -35,11 +30,6 @@ - - - Source Code Pro - - true diff --git a/src/platform/qt/IOViewer.ui b/src/platform/qt/IOViewer.ui index bcd338af9..e53541f4a 100644 --- a/src/platform/qt/IOViewer.ui +++ b/src/platform/qt/IOViewer.ui @@ -25,6 +25,9 @@ 0x0000 + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + diff --git a/src/platform/qt/ObjView.ui b/src/platform/qt/ObjView.ui index adf60a165..3e7f41e9f 100644 --- a/src/platform/qt/ObjView.ui +++ b/src/platform/qt/ObjView.ui @@ -82,7 +82,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -173,6 +173,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -199,6 +202,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -246,6 +252,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -272,6 +281,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -283,6 +295,9 @@ +0.00 + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -290,6 +305,9 @@ +1.00 + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -304,6 +322,9 @@ +1.00 + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -324,6 +345,9 @@ +0.00 + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -405,6 +429,9 @@ Off + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -439,6 +466,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -564,6 +594,9 @@ Normal + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -669,6 +702,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + diff --git a/src/platform/qt/PaletteView.ui b/src/platform/qt/PaletteView.ui index 9224969bf..ea1357bc0 100644 --- a/src/platform/qt/PaletteView.ui +++ b/src/platform/qt/PaletteView.ui @@ -211,6 +211,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -218,6 +221,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -225,6 +231,9 @@ 0x00 (00) + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -274,6 +283,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -284,6 +296,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + @@ -294,6 +309,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + diff --git a/src/platform/qt/ROMInfo.ui b/src/platform/qt/ROMInfo.ui index a328bbd98..aeebdad7f 100644 --- a/src/platform/qt/ROMInfo.ui +++ b/src/platform/qt/ROMInfo.ui @@ -36,7 +36,7 @@ true - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -53,7 +53,7 @@ {TITLE} - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -70,7 +70,7 @@ {ID} - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -87,7 +87,7 @@ {SIZE} - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -104,7 +104,7 @@ {CRC} - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/platform/qt/ReportView.cpp b/src/platform/qt/ReportView.cpp index d21da1422..737247eba 100644 --- a/src/platform/qt/ReportView.cpp +++ b/src/platform/qt/ReportView.cpp @@ -98,6 +98,7 @@ ReportView::ReportView(QWidget* parent) QString description = m_ui.description->text(); description.replace("{projectName}", QLatin1String(projectName)); m_ui.description->setText(description); + m_ui.fileView->setFont(GBAApp::app()->monospaceFont()); connect(m_ui.fileList, &QListWidget::currentTextChanged, this, &ReportView::setShownReport); } diff --git a/src/platform/qt/ReportView.ui b/src/platform/qt/ReportView.ui index 9c7f2158c..8b6614d18 100644 --- a/src/platform/qt/ReportView.ui +++ b/src/platform/qt/ReportView.ui @@ -50,11 +50,6 @@ 0 - - - Monospace - - Qt::TextEditorInteraction