Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9a3ebd1

Browse files
committed
[Feature]: Style option for columns affected by a Display Format
Also some minor improvements (buddies, tab order, size policies) in the PreferencesDialog UI. See issue #3404.
1 parent 559198f commit 9a3ebd1

File tree

5 files changed

+320
-139
lines changed

5 files changed

+320
-139
lines changed

src/PreferencesDialog.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Tabs tab)
3131
ui->fr_reg_fg->installEventFilter(this);
3232
ui->fr_null_bg->installEventFilter(this);
3333
ui->fr_null_fg->installEventFilter(this);
34+
ui->fr_formatted_bg->installEventFilter(this);
35+
ui->fr_formatted_fg->installEventFilter(this);
3436

3537
connect(ui->comboDataBrowserFont, static_cast<void (QFontComboBox::*)(int)>(&QFontComboBox::currentIndexChanged), this, &PreferencesDialog::updatePreviewFont);
3638
connect(ui->spinDataBrowserFontSize, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &PreferencesDialog::updatePreviewFont);
@@ -111,6 +113,8 @@ void PreferencesDialog::loadSettings()
111113
loadColorSetting(ui->fr_bin_bg, "bin_bg");
112114
loadColorSetting(ui->fr_reg_fg, "reg_fg");
113115
loadColorSetting(ui->fr_reg_bg, "reg_bg");
116+
loadColorSetting(ui->fr_formatted_fg, "formatted_fg");
117+
loadColorSetting(ui->fr_formatted_bg, "formatted_bg");
114118

115119
ui->spinSymbolLimit->setValue(Settings::getValue("databrowser", "symbol_limit").toInt());
116120
ui->spinCompleteThreshold->setValue(Settings::getValue("databrowser", "complete_threshold").toInt());
@@ -238,6 +242,8 @@ void PreferencesDialog::saveSettings(bool accept)
238242
saveColorSetting(ui->fr_null_bg, "null_bg");
239243
saveColorSetting(ui->fr_reg_fg, "reg_fg");
240244
saveColorSetting(ui->fr_reg_bg, "reg_bg");
245+
saveColorSetting(ui->fr_formatted_fg, "formatted_fg");
246+
saveColorSetting(ui->fr_formatted_bg, "formatted_bg");
241247
saveColorSetting(ui->fr_bin_fg, "bin_fg");
242248
saveColorSetting(ui->fr_bin_bg, "bin_bg");
243249
Settings::setValue("databrowser", "symbol_limit", ui->spinSymbolLimit->value());
@@ -376,6 +382,7 @@ bool PreferencesDialog::eventFilter(QObject *obj, QEvent *event)
376382
// Use mouse click and enter press on the frames to pop up a colour dialog
377383
if (obj == ui->fr_bin_bg || obj == ui->fr_bin_fg ||
378384
obj == ui->fr_reg_bg || obj == ui->fr_reg_fg ||
385+
obj == ui->fr_formatted_bg || obj == ui->fr_formatted_fg ||
379386
obj == ui->fr_null_bg || obj == ui->fr_null_fg)
380387
{
381388
if (event->type() == QEvent::KeyPress)
@@ -521,6 +528,12 @@ void PreferencesDialog::setColorSetting(QFrame *frame, const QColor &color)
521528
} else if (frame == ui->fr_reg_fg) {
522529
line = ui->txtRegular;
523530
role = line->foregroundRole();
531+
} else if (frame == ui->fr_formatted_bg) {
532+
line = ui->txtFormatted;
533+
role = line->backgroundRole();
534+
} else if (frame == ui->fr_formatted_fg) {
535+
line = ui->txtFormatted;
536+
role = line->foregroundRole();
524537
} else if (frame == ui->fr_null_bg) {
525538
line = ui->txtNull;
526539
role = line->backgroundRole();
@@ -559,6 +572,8 @@ void PreferencesDialog::adjustColorsToStyle(int style)
559572
setColorSetting(ui->fr_bin_bg, Settings::getDefaultColorValue("databrowser", "bin_bg_colour", appStyle));
560573
setColorSetting(ui->fr_reg_fg, Settings::getDefaultColorValue("databrowser", "reg_fg_colour", appStyle));
561574
setColorSetting(ui->fr_reg_bg, Settings::getDefaultColorValue("databrowser", "reg_bg_colour", appStyle));
575+
setColorSetting(ui->fr_formatted_fg, Settings::getDefaultColorValue("databrowser", "formatted_fg_colour", appStyle));
576+
setColorSetting(ui->fr_formatted_bg, Settings::getDefaultColorValue("databrowser", "formatted_bg_colour", appStyle));
562577

563578
for(int i=0; i < ui->treeSyntaxHighlighting->topLevelItemCount(); ++i)
564579
{
@@ -666,6 +681,7 @@ void PreferencesDialog::updatePreviewFont()
666681
QFont textFont(ui->comboDataBrowserFont->currentText());
667682
textFont.setPointSize(ui->spinDataBrowserFontSize->value());
668683
ui->txtRegular->setFont(textFont);
684+
ui->txtFormatted->setFont(textFont);
669685
textFont.setItalic(true);
670686
ui->txtNull->setFont(textFont);
671687
ui->txtBlob->setFont(textFont);

0 commit comments

Comments
 (0)