From 63ff07783c3a5ea5b3ef0f4c621abeecf0a5cb5c Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Fri, 11 Dec 2020 18:37:16 -0800 Subject: [PATCH] Configurable inactive view color. --- qt/lc_qpreferencesdialog.cpp | 8 +++ qt/lc_qpreferencesdialog.ui | 105 +++++++++++++++++++++++------------ 2 files changed, 78 insertions(+), 35 deletions(-) diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 8ad93c66..3e107f99 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -212,6 +212,9 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO pix.fill(QColor(LC_RGBA_RED(mOptions->Preferences.mActiveViewColor), LC_RGBA_GREEN(mOptions->Preferences.mActiveViewColor), LC_RGBA_BLUE(mOptions->Preferences.mActiveViewColor))); ui->ActiveViewColorButton->setIcon(pix); + pix.fill(QColor(LC_RGBA_RED(mOptions->Preferences.mInactiveViewColor), LC_RGBA_GREEN(mOptions->Preferences.mInactiveViewColor), LC_RGBA_BLUE(mOptions->Preferences.mInactiveViewColor))); + ui->InactiveViewColorButton->setIcon(pix); + pix.fill(QColor(LC_RGBA_RED(mOptions->Preferences.mFadeStepsColor), LC_RGBA_GREEN(mOptions->Preferences.mFadeStepsColor), LC_RGBA_BLUE(mOptions->Preferences.mFadeStepsColor))); ui->FadeStepsColor->setIcon(pix); @@ -491,6 +494,11 @@ void lcQPreferencesDialog::ColorButtonClicked() Color = &mOptions->Preferences.mActiveViewColor; Title = tr("Select Active View Color"); } + else if (Button == ui->InactiveViewColorButton) + { + Color = &mOptions->Preferences.mInactiveViewColor; + Title = tr("Select Inactive View Color"); + } else if (Button == ui->FadeStepsColor) { Color = &mOptions->Preferences.mFadeStepsColor; diff --git a/qt/lc_qpreferencesdialog.ui b/qt/lc_qpreferencesdialog.ui index 56f206c7..4e613afd 100644 --- a/qt/lc_qpreferencesdialog.ui +++ b/qt/lc_qpreferencesdialog.ui @@ -17,7 +17,7 @@ - 3 + 0 @@ -1000,48 +1000,34 @@ - + - View + Overlays - - - - - - - - - - - - Active View: - - - - - - - - - - - - - - Overlay Color: - - - - + + - - + + + + Axis Icon: + + + + + + + + + + + + Qt::Horizontal @@ -1053,6 +1039,41 @@ + + + + Overlay Color: + + + + + + + Active View: + + + + + + + + + + + + + + Inactive View: + + + + + + + + + + @@ -1754,6 +1775,20 @@ PreviewPositionCombo PreviewViewSphereCheckBox PreviewAxisIconCheckBox + BackgroundSolidRadio + BackgroundSolidColorButton + BackgroundGradientRadio + BackgroundGradient1ColorButton + BackgroundGradient2ColorButton + ActiveViewColorButton + InactiveViewColorButton + AxesColorButton + OverlayColorButton + gridLineColor + gridStudColor + ViewSphereColorButton + ViewSphereTextColorButton + ViewSphereHighlightColorButton categoriesTree partsTree importCategories