From 127bc9f57b205be94265d7c38bd8b486f4e670a0 Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Thu, 9 Feb 2023 16:26:04 +0100 Subject: [PATCH] Sketcher: Grid settings - disable spacing when auto mode selected and vice versa --- src/Mod/Sketcher/Gui/SketcherSettings.cpp | 9 +++++++-- src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp index 39f99b9d53..49c7329669 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp +++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp @@ -112,8 +112,7 @@ SketcherSettingsGrid::SketcherSettingsGrid(QWidget* parent) styles << qMakePair(Qt::SolidLine, 0xffff) << qMakePair(Qt::DashLine, 0x0f0f) << qMakePair(Qt::DotLine, 0xaaaa); - // << qMakePair(Qt::DashDotLine, 0x????) - // << qMakePair(Qt::DashDotDotLine, 0x????); + ui->gridLinePattern->setIconSize(QSize(80, 12)); ui->gridDivLinePattern->setIconSize(QSize(80, 12)); for (QList < QPair >::iterator it = styles.begin(); it != styles.end(); ++it) { @@ -133,6 +132,12 @@ SketcherSettingsGrid::SketcherSettingsGrid(QWidget* parent) ui->gridLinePattern->addItem(QIcon(px), QString(), QVariant(it->second)); ui->gridDivLinePattern->addItem(QIcon(px), QString(), QVariant(it->second)); } + + ui->gridSize->setEnabled(!ui->checkBoxGridAuto->isChecked()); + + QObject::connect(ui->checkBoxGridAuto,&Gui::PrefCheckBox::stateChanged, [this](int state) { + ui->gridSize->setEnabled(state != Qt::Checked); + }); } SketcherSettingsGrid::~SketcherSettingsGrid() diff --git a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui index 21f23aee06..26e2065ffd 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettingsGrid.ui @@ -90,7 +90,7 @@ Points must be set closer than a fifth of the grid spacing to a grid line to sna - Grid spacing (if auto disabled) + Grid spacing gridSize