From 0d9a76fb0493de78b04417d25e7484f27e3b0ffe Mon Sep 17 00:00:00 2001 From: torusrxxx Date: Sat, 28 Nov 2020 16:17:41 +0800 Subject: [PATCH] Fix appearance, assemble and close dialog when using ultra large font --- src/gui/Src/Gui/AppearanceDialog.ui | 3393 +++++++++++++-------------- src/gui/Src/Gui/AssembleDialog.ui | 12 +- src/gui/Src/Gui/CloseDialog.cpp | 4 + src/gui/Src/Gui/CloseDialog.ui | 28 +- 4 files changed, 1675 insertions(+), 1762 deletions(-) diff --git a/src/gui/Src/Gui/AppearanceDialog.ui b/src/gui/Src/Gui/AppearanceDialog.ui index f9e697ed..0bab9675 100644 --- a/src/gui/Src/Gui/AppearanceDialog.ui +++ b/src/gui/Src/Gui/AppearanceDialog.ui @@ -20,1792 +20,1713 @@ - - - - 2 - 2 - 521 - 391 - - - - 0 - - - - Colors - - - - - 360 - 10 - 151 - 181 - + + + + + 0 - - Color - - - false - - - - - - 0 - - - - - - 0 - 0 - - - - background-color: #000000; + + + Colors + + + + + + Properties + + + false + + + + + + Qt::ScrollBarAlwaysOn + + + Qt::ScrollBarAlwaysOff + + + + + + + + + + Color + + + false + + + + + + 0 + + + + + + 0 + 0 + + + + background-color: #000000; border: solid black; border-width: 2px 1px 2px 2px; - - - - - - - - - - - 0 - 0 - - - - background-color: #000080; + + + + + + + + + + + 0 + 0 + + + + background-color: #000080; border: solid black; border-width: 2px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #008000; + + + + + + + + + + + 0 + 0 + + + + background-color: #008000; border: solid black; border-width: 2px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #008080; + + + + + + + + + + + 0 + 0 + + + + background-color: #008080; border: solid black; border-width: 2px 2px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #800000; + + + + + + + + + + + 0 + 0 + + + + background-color: #800000; border: solid black; border-width: 1px 1px 2px 2px; - - - - - - - - - - - 0 - 0 - - - - background-color: #800080; + + + + + + + + + + + 0 + 0 + + + + background-color: #800080; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #808000; + + + + + + + + + + + 0 + 0 + + + + background-color: #808000; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #C0C0C0; + + + + + + + + + + + 0 + 0 + + + + background-color: #C0C0C0; border: solid black; border-width: 1px 2px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #808080; + + + + + + + + + + + 0 + 0 + + + + background-color: #808080; border: solid black; border-width: 1px 1px 2px 2px; - - - - - - - - - - - 0 - 0 - - - - background-color: #0000FF; + + + + + + + + + + + 0 + 0 + + + + background-color: #0000FF; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #00FF00; + + + + + + + + + + + 0 + 0 + + + + background-color: #00FF00; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #00FFFF; + + + + + + + + + + + 0 + 0 + + + + background-color: #00FFFF; border: solid black; border-width: 1px 2px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color : #FF0000; + + + + + + + + + + + 0 + 0 + + + + background-color : #FF0000; border: solid black; border-width: 1px 1px 2px 2px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FF00FF; + + + + + + + + + + + 0 + 0 + + + + background-color: #FF00FF; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FFFF00; + + + + + + + + + + + 0 + 0 + + + + background-color: #FFFF00; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FFFBF0; + + + + + + + + + + + 0 + 0 + + + + background-color: #FFFBF0; border: solid black; border-width: 1px 2px 2px 1px; - - - - - - - - - - - - - 0 - 0 - - - - QLineEdit {border-style: outset; border-width: 1px; border-color: black} - - - #FFFFFF - - - false - - - - - - - - 0 - 0 - - - - - 30 - 18 - - - - background-color: #FFFFFF; border : 2px solid black - - - - - - - - - - - - 360 - 200 - 151 - 121 - - - - Background Color - - - - - - 0 - - - - - - 0 - 0 - - - - background-color: #C0C0C0; + + + + + + + + + + + + + 0 + 0 + + + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + + + #FFFFFF + + + false + + + + + + + + 0 + 0 + + + + + 30 + 18 + + + + background-color: #FFFFFF; border : 2px solid black + + + + + + + + + + + + + Background Color + + + + + + 0 + + + + + + 0 + 0 + + + + background-color: #C0C0C0; border: solid black; border-width: 2px 1px 2px 2px; - - - X - - - - - - - - 0 - 0 - - - - background-color: #000000; + + + X + + + + + + + + 0 + 0 + + + + background-color: #000000; border: solid black; border-width: 2px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #C0C0C0; + + + + + + + + + + + 0 + 0 + + + + background-color: #C0C0C0; border: solid black; border-width: 2px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FFFBF0; + + + + + + + + + + + 0 + 0 + + + + background-color: #FFFBF0; border: solid black; border-width: 2px 2px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color : #00FFFF; + + + + + + + + + + + 0 + 0 + + + + background-color : #00FFFF; border: solid black; border-width: 1px 1px 2px 2px; - - - - - - - - - - - 0 - 0 - - - - background-color: #00FF00; + + + + + + + + + + + 0 + 0 + + + + background-color: #00FF00; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FF0000; + + + + + + + + + + + 0 + 0 + + + + background-color: #FF0000; border: solid black; border-width: 1px 1px 2px 1px; - - - - - - - - - - - 0 - 0 - - - - background-color: #FFFF00; + + + + + + + + + + + 0 + 0 + + + + background-color: #FFFF00; border: solid black; border-width: 1px 2px 2px 1px; - - - - - - - - - - - - - 0 - 0 - - - - QLineEdit {border-style: outset; border-width: 1px; border-color: black} - - - #FFFFFF - - - false - - - - - - - - 0 - 0 - - - - - 30 - 18 - - - - background-color: #FFFFFF; border : 2px solid black - - - - - - - - - - - - 10 - 10 - 341 - 351 - - - - Properties - - - false - - - - - 10 - 20 - 321 - 321 - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - + + + + + + + + + + + + + 0 + 0 + + + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + + + #FFFFFF + + + false + + + + + + + + 0 + 0 + + + + + 30 + 18 + + + + background-color: #FFFFFF; border : 2px solid black + + + + + + + + + + + + + Example Text + + + Qt::AlignCenter + + + + + groupBackgroundColor + groupColor + groupProperties + exampleText + + + + Font + + + + + + + + + 0 + 0 + + + + General Tables: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + Disassembly: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + HexDump: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + Stack: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + Registers: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + HexEdit: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + Log: + + + + + + + + 0 + 0 + + + + false + + + QFontComboBox::MonospacedFonts + + + + + + + + 0 + 0 + + + + + Normal + + + + + Bold + + + + + Italic + + + + + Bold + Italic + + + + + + + + + 0 + 0 + + + + 12 + + + QComboBox::AdjustToContentsOnFirstShow + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 14 + + + + + 16 + + + + + 18 + + + + + 20 + + + + + 22 + + + + + + + + + + + + + 0 + 0 + + + + &Application Font* + + + + + + + + 0 + 0 + + + + Courier New + + + + + + + + 0 + 0 + + + + &Defaults + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + *Setting requires restarting the application to take effect. + + + true + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - 370 - 330 - 131 - 20 - - - - Example Text - - - Qt::AlignCenter - - - groupBackgroundColor - groupColor - groupProperties - exampleText - - - - Font - - - - - 10 - 10 - 110 - 21 - - - - - 0 - 0 - - - - General Tables: - - - - - - 10 - 40 - 110 - 21 - - - - - 0 - 0 - - - - Disassembly: - - - - - - 10 - 70 - 110 - 21 - - - - - 0 - 0 - - - - HexDump: - - - - - - 10 - 100 - 110 - 21 - - - - - 0 - 0 - - - - Stack: - - - - - - 10 - 130 - 110 - 21 - - - - - 0 - 0 - - - - Registers: - - - - - - 10 - 160 - 110 - 21 - - - - - 0 - 0 - - - - HexEdit: - - - - - - 10 - 220 - 501 - 25 - - - - - - - &Application Font* - - - - - - - - 0 - 0 - - - - Courier New - - - - - - - - 0 - 0 - - - - &Defaults - - - - - - - - - 130 - 11 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 130 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 70 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 40 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 100 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 160 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 130 - 190 - 381 - 22 - - - - - - - false - - - QFontComboBox::MonospacedFonts - - - - - - - - 0 - 0 - - - - - Normal - - - - - Bold - - - - - Italic - - - - - Bold + Italic - - - - - - - - - 0 - 0 - - - - 12 - - - QComboBox::AdjustToContentsOnFirstShow - - - - 6 - - - - - 7 - - - - - 8 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 14 - - - - - 16 - - - - - 18 - - - - - 20 - - - - - 22 - - - - - - - - - - 10 - 190 - 110 - 21 - - - - - 0 - 0 - - - - Log: - - - - - - 10 - 250 - 500 - 56 - - - - - QLayout::SetMinimumSize - - - - - - 0 - 0 - - - - *Setting requires restarting the application to take effect. - - - true - - - - - - layoutWidget1 - layoutWidget2 - layoutWidget3 - layoutWidget4 - layoutWidget5 - layoutWidget6 - layoutWidget7 - labelFontAbstractTables - labelFontDisassembly - labelFontHexDump - labelFontStack - labelFontRegisters - labelFontHexEdit - layoutWidget8 - labelFontLog - layoutWidget9 - - - - - - 440 - 400 - 75 - 23 - - - - &Cancel - - - - - - 360 - 400 - 75 - 23 - - - - &Save - - - true - - + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Save + + + true + + + + + + + &Cancel + + + + + + @@ -1862,8 +1783,6 @@ border-width: 1px 2px 2px 1px; fontLogSize buttonApplicationFont buttonFontDefaults - buttonCancel - buttonSave diff --git a/src/gui/Src/Gui/AssembleDialog.ui b/src/gui/Src/Gui/AssembleDialog.ui index 13670c77..2b188d5e 100644 --- a/src/gui/Src/Gui/AssembleDialog.ui +++ b/src/gui/Src/Gui/AssembleDialog.ui @@ -6,8 +6,8 @@ 0 0 - 484 - 85 + 526 + 86 @@ -24,17 +24,11 @@ - + 0 0 - - - 0 - 20 - - diff --git a/src/gui/Src/Gui/CloseDialog.cpp b/src/gui/Src/Gui/CloseDialog.cpp index 12fb5095..fab6e213 100644 --- a/src/gui/Src/Gui/CloseDialog.cpp +++ b/src/gui/Src/Gui/CloseDialog.cpp @@ -10,6 +10,10 @@ CloseDialog::CloseDialog(QWidget* parent) : QDialog(parent), ui(new Ui::CloseDia setWindowFlags(windowFlags() & ~(Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint) | Qt::MSWindowsFixedSizeDialogHint); SetApplicationIcon(QDialog::winId()); bCanClose = false; + // Resize window + int requiredWidth = ui->label->fontMetrics().boundingRect(ui->label->text()).width(); + if(width() < requiredWidth) + resize(requiredWidth, height()); } CloseDialog::~CloseDialog() diff --git a/src/gui/Src/Gui/CloseDialog.ui b/src/gui/Src/Gui/CloseDialog.ui index ef613548..518703be 100644 --- a/src/gui/Src/Gui/CloseDialog.ui +++ b/src/gui/Src/Gui/CloseDialog.ui @@ -13,22 +13,18 @@ - - - - 0 - 0 - 220 - 80 - - - - Closing Debugger... - - - Qt::AlignCenter - - + + + + + Closing Debugger... + + + Qt::AlignCenter + + + +