diff --git a/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp b/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp index c7e83426..d58e84a3 100644 --- a/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp +++ b/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.cpp @@ -407,7 +407,7 @@ void AppearanceDialog::colorInfoListInit() colorInfoIndex=0; colorInfoList.clear(); //list entries - colorInfoListAppend("AbstractTableView:", "", ""); + colorInfoListAppend("General:", "", ""); colorInfoListAppend("Text", "AbstractTableViewTextColor", ""); colorInfoListAppend("Header Text", "AbstractTableViewHeaderTextColor", ""); colorInfoListAppend("Background", "AbstractTableViewBackgroundColor", ""); diff --git a/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.ui b/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.ui index ba3bc992..eaa6b6f1 100644 --- a/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.ui +++ b/x64_dbg_gui/Project/Src/Gui/AppearanceDialog.ui @@ -57,9 +57,15 @@ 20 + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + #FFFFFF + + false + @@ -355,9 +361,15 @@ 20 + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + #FFFFFF + + false + diff --git a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.cpp b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.cpp index 621bdfe3..9ac5d834 100644 --- a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.cpp +++ b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.cpp @@ -20,6 +20,8 @@ HexEditDialog::HexEditDialog(QWidget *parent) : ui->lineEditAscii->setFont(font); ui->lineEditUnicode->setFont(font); ui->chkEntireBlock->hide(); + connect(Bridge::getBridge(), SIGNAL(repaintGui()), this, SLOT(updateStyle())); + updateStyle(); //setup hex editor mHexEdit = new QHexEdit(this); @@ -53,6 +55,13 @@ bool HexEditDialog::entireBlock() return ui->chkEntireBlock->isChecked(); } +void HexEditDialog::updateStyle() +{ + QString style = QString("QLineEdit { border-style: outset; border-width: 1px; border-color: %1; color: %1; background-color: %2 }").arg(ConfigColor("HexEditTextColor").name(), ConfigColor("HexEditBackgroundColor").name()); + ui->lineEditAscii->setStyleSheet(style); + ui->lineEditUnicode->setStyleSheet(style); +} + void HexEditDialog::on_btnAscii2Hex_clicked() { QString text = ui->lineEditAscii->text(); diff --git a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.h b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.h index 9c6a50ca..1523dec8 100644 --- a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.h +++ b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.h @@ -22,6 +22,7 @@ public: QHexEdit* mHexEdit; private slots: + void updateStyle(); void on_btnAscii2Hex_clicked(); void on_btnUnicode2Hex_clicked(); void on_chkKeepSize_toggled(bool checked); diff --git a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.ui b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.ui index 565c83d1..bc626ded 100644 --- a/x64_dbg_gui/Project/Src/Gui/HexEditDialog.ui +++ b/x64_dbg_gui/Project/Src/Gui/HexEditDialog.ui @@ -55,12 +55,18 @@ 20 + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + 32767 + + false + @@ -71,12 +77,18 @@ 20 + + QLineEdit {border-style: outset; border-width: 1px; border-color: black} + 32767 + + false + diff --git a/x64_dbg_gui/Project/Src/Gui/LogView.cpp b/x64_dbg_gui/Project/Src/Gui/LogView.cpp index 777eebbf..432e7c3f 100644 --- a/x64_dbg_gui/Project/Src/Gui/LogView.cpp +++ b/x64_dbg_gui/Project/Src/Gui/LogView.cpp @@ -1,4 +1,5 @@ #include "LogView.h" +#include "Configuration.h" LogView::LogView(QWidget *parent) : QTextEdit(parent) { @@ -8,14 +9,19 @@ LogView::LogView(QWidget *parent) : QTextEdit(parent) this->setFont(wFont); - this->setStyleSheet("QTextEdit { background-color: rgb(255, 251, 240) }"); + updateStyle(); this->setUndoRedoEnabled(false); this->setReadOnly(true); + connect(Bridge::getBridge(), SIGNAL(repaintTableView()), this, SLOT(updateStyle())); connect(Bridge::getBridge(), SIGNAL(addMsgToLog(QString)), this, SLOT(addMsgToLogSlot(QString))); connect(Bridge::getBridge(), SIGNAL(clearLog()), this, SLOT(clearLogSlot())); } +void LogView::updateStyle() +{ + setStyleSheet(QString("QTextEdit { color: %1; background-color: %2 }").arg(ConfigColor("AbstractTableViewTextColor").name(), ConfigColor("AbstractTableViewBackgroundColor").name())); +} void LogView::addMsgToLogSlot(QString msg) { diff --git a/x64_dbg_gui/Project/Src/Gui/LogView.h b/x64_dbg_gui/Project/Src/Gui/LogView.h index cb9a2e6e..eb461f0e 100644 --- a/x64_dbg_gui/Project/Src/Gui/LogView.h +++ b/x64_dbg_gui/Project/Src/Gui/LogView.h @@ -14,6 +14,7 @@ public: signals: public slots: + void updateStyle(); void addMsgToLogSlot(QString msg); void clearLogSlot(); diff --git a/x64_dbg_gui/Project/Src/Gui/SymbolView.cpp b/x64_dbg_gui/Project/Src/Gui/SymbolView.cpp index 697b1831..37c525cd 100644 --- a/x64_dbg_gui/Project/Src/Gui/SymbolView.cpp +++ b/x64_dbg_gui/Project/Src/Gui/SymbolView.cpp @@ -1,5 +1,6 @@ #include "SymbolView.h" #include "ui_SymbolView.h" +#include "Configuration.h" SymbolView::SymbolView(QWidget *parent) : QWidget(parent), @@ -60,6 +61,7 @@ SymbolView::SymbolView(QWidget *parent) : setupContextMenu(); //Signals and slots + connect(Bridge::getBridge(), SIGNAL(repaintTableView()), this, SLOT(updateStyle())); connect(Bridge::getBridge(), SIGNAL(addMsgToSymbolLog(QString)), this, SLOT(addMsgToSymbolLogSlot(QString))); connect(Bridge::getBridge(), SIGNAL(clearLog()), this, SLOT(clearSymbolLogSlot())); connect(Bridge::getBridge(), SIGNAL(clearSymbolLog()), this, SLOT(clearSymbolLogSlot())); @@ -86,6 +88,11 @@ void SymbolView::setupContextMenu() connect(mFollowSymbolDumpAction, SIGNAL(triggered()), this, SLOT(symbolFollowDump())); } +void SymbolView::updateStyle() +{ + ui->symbolLogEdit->setStyleSheet(QString("QTextEdit { color: %1; background-color: %2 }").arg(ConfigColor("AbstractTableViewTextColor").name(), ConfigColor("AbstractTableViewBackgroundColor").name())); +} + void SymbolView::addMsgToSymbolLogSlot(QString msg) { ui->symbolLogEdit->moveCursor(QTextCursor::End); diff --git a/x64_dbg_gui/Project/Src/Gui/SymbolView.h b/x64_dbg_gui/Project/Src/Gui/SymbolView.h index efe459eb..18c9c87d 100644 --- a/x64_dbg_gui/Project/Src/Gui/SymbolView.h +++ b/x64_dbg_gui/Project/Src/Gui/SymbolView.h @@ -24,6 +24,7 @@ public: void setupContextMenu(); private slots: + void updateStyle(); void addMsgToSymbolLogSlot(QString msg); void clearSymbolLogSlot(); void moduleSelectionChanged(int index);