Differential D23162 Diff 63878 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)36{
52 mainLayout->addRow(QString(), startNewInstance); 52​ mainLayout->addRow(QString(), startNewInstance);
53 //On Wayland we can't programmatically raise and focus the window so we have to hide the option 53​ //On Wayland we can't programmatically raise and focus the window so we have to hide the option
54 if (!(KWindowSystem::isPlatformWayland() || qstrcmp(qgetenv("XDG_SESSION_TYPE"), "wayland") == 0)) { 54​ if (!(KWindowSystem::isPlatformWayland() || qstrcmp(qgetenv("XDG_SESSION_TYPE"), "wayland") == 0)) {
55 QRadioButton* focusWindow = new QRadioButton(i18n("Return focus to Spectacle"), this); 55​ QRadioButton* focusWindow = new QRadioButton(i18n("Return focus to Spectacle"), this);
56 mPrintKeyActionGroup->addButton( focusWindow, SpectacleConfig::PrintKeyActionRunning::FocusWindow); 56​ mPrintKeyActionGroup->addButton( focusWindow, SpectacleConfig::PrintKeyActionRunning::FocusWindow);
57 mainLayout->addRow(QString(), focusWindow); 57​ mainLayout->addRow(QString(), focusWindow);
58 } 58​ }
59 59​
60​ mainLayout->addItem(new QSpacerItem(0, 18, QSizePolicy::Fixed, QSizePolicy::Fixed));
61​
62​ // copy file or file location to clipboard after taking a screenshot
63​ mCopyToClipboardGroup = new QButtonGroup(this);
davidreUnsubmitted
Done

This one

davidre: This one
64​ mCopyToClipboardGroup->setExclusive(true);
65​ mNothingToCopy = new QRadioButton(i18n("Don't change the clipboard content"), this);
66​ mCopyImageToClipboard = new QRadioButton(i18n("Copy image to clipboard"), this);
ngrahamUnsubmitted
Done

I would write "Copy image to clipboard"

ngraham: I would write "Copy image to clipboard"
67​ mCopySaveLocationToClipboard = new QRadioButton(i18n("Copy file location to clipboard after saving"), this);
68​ mCopyToClipboardGroup->addButton(mNothingToCopy);
69​ mCopyToClipboardGroup->addButton(mCopySaveLocationToClipboard);
davidreUnsubmitted
Done

Remove comment

davidre: Remove comment
70​ mCopyToClipboardGroup->addButton(mCopyImageToClipboard);
71​ mNothingToCopy->setChecked(true);
72​ connect(mCopyToClipboardGroup, qOverload<QAbstractButton *, bool>(&QButtonGroup::buttonToggled), this, &GeneralOptionsPage::markDirty);
73​ mainLayout->addRow(i18n("After taking screenshot:"), mNothingToCopy);
ngrahamUnsubmitted
Done

I would simplify this as "After taking screenshot:"

ngraham: I would simplify this as "After taking screenshot:"
74​ mainLayout->addRow(QString(), mCopySaveLocationToClipboard);
75​ mainLayout->addRow(QString(), mCopyImageToClipboard);
76​
60 // Rectangular Region settings 77​ // Rectangular Region settings
61 KTitleWidget *titleWidget = new KTitleWidget(this); 78​ KTitleWidget *titleWidget = new KTitleWidget(this);
62 titleWidget->setText(i18n("Rectangular Region")); 79​ titleWidget->setText(i18n("Rectangular Region"));
63 titleWidget->setLevel(2); 80​ titleWidget->setLevel(2);
64 mainLayout->addRow(titleWidget); 81​ mainLayout->addRow(titleWidget);
65 82​
66 // use light background 83​ // use light background
67 mUseLightBackground = new QCheckBox(i18n("Use light background"), this); 84​ mUseLightBackground = new QCheckBox(i18n("Use light background"), this);
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s)125{
109 SpectacleConfig *cfgManager = SpectacleConfig::instance(); 126​ SpectacleConfig *cfgManager = SpectacleConfig::instance();
110 127​
111 cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); 128​ cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked);
112 cfgManager->setRememberLastRectangularRegion(mRememberUntilClosed->isChecked() || mRememberAlways->isChecked()); 129​ cfgManager->setRememberLastRectangularRegion(mRememberUntilClosed->isChecked() || mRememberAlways->isChecked());
113 cfgManager->setAlwaysRememberRegion (mRememberAlways->isChecked()); 130​ cfgManager->setAlwaysRememberRegion (mRememberAlways->isChecked());
114 cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); 131​ cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked);
115 cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); 132​ cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked);
116 cfgManager->setPrintKeyActionRunning(static_cast<SpectacleConfig::PrintKeyActionRunning>(mPrintKeyActionGroup->checkedId())); 133​ cfgManager->setPrintKeyActionRunning(static_cast<SpectacleConfig::PrintKeyActionRunning>(mPrintKeyActionGroup->checkedId()));
134​ cfgManager->setCopySaveLocationToClipboard(mCopySaveLocationToClipboard->isChecked());
135​ cfgManager->setCopyImageToClipboard(mCopyImageToClipboard->isChecked());
117 136​
118 mChangesMade = false; 137​ mChangesMade = false;
119} 138​}
120 139​
121void GeneralOptionsPage::resetChanges() 140​void GeneralOptionsPage::resetChanges()
122{ 141​{
123 SpectacleConfig *cfgManager = SpectacleConfig::instance(); 142​ SpectacleConfig *cfgManager = SpectacleConfig::instance();
124 143​
125 mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); 144​ mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour());
126 mRememberUntilClosed->setChecked(cfgManager->rememberLastRectangularRegion()); 145​ mRememberUntilClosed->setChecked(cfgManager->rememberLastRectangularRegion());
127 mRememberAlways->setChecked(cfgManager->alwaysRememberRegion()); 146​ mRememberAlways->setChecked(cfgManager->alwaysRememberRegion());
128 mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); 147​ mShowMagnifier->setChecked(cfgManager->showMagnifierChecked());
129 mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); 148​ mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture());
130 mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); 149​ mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true);
150​ mCopySaveLocationToClipboard->setChecked(cfgManager->copySaveLocationToClipboard());
151​ mCopyImageToClipboard->setChecked(cfgManager->copyImageToClipboard());
131 152​
132 mChangesMade = false; 153​ mChangesMade = false;
133} 154​}