Differential D11599 Diff 32248 src/Gui/SettingsDialog/GeneralOptionsPage.cpp

Changeset View

Standalone View

View Options

src/Gui/SettingsDialog/GeneralOptionsPage.cpp

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)32{
52 connect(mUseLightBackground, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); 52​ connect(mUseLightBackground, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty);
53 mainLayout->addWidget(mUseLightBackground, 1); 53​ mainLayout->addWidget(mUseLightBackground, 1);
54 54​
55 // remember Rectangular Region box 55​ // remember Rectangular Region box
56 56​
57 mRememberRect = new QCheckBox(i18n("Remember selected area"), this); 57​ mRememberRect = new QCheckBox(i18n("Remember selected area"), this);
58 connect(mRememberRect, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); 58​ connect(mRememberRect, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty);
59 59​
60​ // show magnifier
61​
62​ mShowMagnifier = new QCheckBox(i18n("Show magnifier"), this);
63​ connect(mShowMagnifier, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty);
rkflxUnsubmitted
Done

I'd use ⇧ in the text here (even though it already works with every modifier…) , as it is more commonly connected with modifying state (e.g. "Preserve aspect ratio"):

Hold the Shift key to temporarily toggle the magnifier when adjusting the selection rectangle.

(Also reworded a bit, to make it more clear that the magnifier only appears once you press down a mouse button.)

rkflx: I'd use {key Shift} in the text here (even though it already works with every modifier…) , as…
64​
60 QVBoxLayout *rrCLayout = new QVBoxLayout; 65​ QVBoxLayout *rrCLayout = new QVBoxLayout;
61// rrCLayout->setContentsMargins(15, 10, 0, 10); 66​// rrCLayout->setContentsMargins(15, 10, 0, 10);
62 rrCLayout->addWidget(mUseLightBackground); 67​ rrCLayout->addWidget(mUseLightBackground);
63 rrCLayout->addWidget(mRememberRect); 68​ rrCLayout->addWidget(mRememberRect);
69​ rrCLayout->addWidget(mShowMagnifier);
64 rrLayout->addLayout(rrCLayout); 70​ rrLayout->addLayout(rrCLayout);
65 mainLayout->addWidget(rrGroup, 1); 71​ mainLayout->addWidget(rrGroup, 1);
66 72​
67 // read in the data 73​ // read in the data
68 74​
69 resetChanges(); 75​ resetChanges();
70 76​
71 // finish up with the main layout 77​ // finish up with the main layout
Show All 9 Lines
81} 87​}
82 88​
83void GeneralOptionsPage::saveChanges() 89​void GeneralOptionsPage::saveChanges()
84{ 90​{
85 SpectacleConfig *cfgManager = SpectacleConfig::instance(); 91​ SpectacleConfig *cfgManager = SpectacleConfig::instance();
86 92​
87 cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); 93​ cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked);
88 cfgManager->setRememberLastRectangularRegion(mRememberRect->checkState() == Qt::Checked); 94​ cfgManager->setRememberLastRectangularRegion(mRememberRect->checkState() == Qt::Checked);
95​ cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked);
89 cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked); 96​ cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked);
90 97​
91 mChangesMade = false; 98​ mChangesMade = false;
92} 99​}
93 100​
94void GeneralOptionsPage::resetChanges() 101​void GeneralOptionsPage::resetChanges()
95{ 102​{
96 SpectacleConfig *cfgManager = SpectacleConfig::instance(); 103​ SpectacleConfig *cfgManager = SpectacleConfig::instance();
97 104​
98 mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); 105​ mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour());
99 mRememberRect->setChecked(cfgManager->rememberLastRectangularRegion()); 106​ mRememberRect->setChecked(cfgManager->rememberLastRectangularRegion());
107​ mShowMagnifier->setChecked(cfgManager->showMagnifierChecked());
100 mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); 108​ mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard());
101 109​
102 mChangesMade = false; 110​ mChangesMade = false;
103} 111​}