Changeset View
Changeset View
Standalone View
Standalone View
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 | QRadioButton *nothingToCopy = new QRadioButton(i18n("Do nothing"), this); | ||||
davidre: This one | |||||
64 | QRadioButton *copyImageToClipboard = new QRadioButton(i18n("Copy image to clipboard"), this); | ||||
65 | mCopyToClipboardGroup = new QButtonGroup(this); | ||||
66 | mCopyToClipboardGroup->setExclusive(true); | ||||
ngraham: I would write "Copy image to clipboard" | |||||
67 | mCopyToClipboardGroup->addButton(nothingToCopy, SpectacleConfig::CopyImageToClipboardSetting::DoNotChangeClipboard); | ||||
68 | mCopyToClipboardGroup->addButton(copyImageToClipboard, SpectacleConfig::CopyImageToClipboardSetting::CopyImageToClipboard); | ||||
69 | //mNothingToCopy->setChecked(true); | ||||
davidre: Remove comment | |||||
70 | connect(mCopyToClipboardGroup, qOverload<int, bool>(&QButtonGroup::buttonToggled), this, &GeneralOptionsPage::markDirty); | ||||
71 | mainLayout->addRow(i18n("After taking a screenshot:"), nothingToCopy); | ||||
72 | mainLayout->addRow(QString(), copyImageToClipboard); | ||||
73 | | ||||
ngraham: I would simplify this as "After taking screenshot:" | |||||
60 | // Rectangular Region settings | 74 | // Rectangular Region settings | ||
61 | KTitleWidget *titleWidget = new KTitleWidget(this); | 75 | KTitleWidget *titleWidget = new KTitleWidget(this); | ||
62 | titleWidget->setText(i18n("Rectangular Region")); | 76 | titleWidget->setText(i18n("Rectangular Region")); | ||
63 | titleWidget->setLevel(2); | 77 | titleWidget->setLevel(2); | ||
64 | mainLayout->addRow(titleWidget); | 78 | mainLayout->addRow(titleWidget); | ||
65 | 79 | | |||
66 | // use light background | 80 | // use light background | ||
67 | mUseLightBackground = new QCheckBox(i18n("Use light background"), this); | 81 | mUseLightBackground = new QCheckBox(i18n("Use light background"), this); | ||
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s) | 122 | { | |||
109 | SpectacleConfig *cfgManager = SpectacleConfig::instance(); | 123 | SpectacleConfig *cfgManager = SpectacleConfig::instance(); | ||
110 | 124 | | |||
111 | cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); | 125 | cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); | ||
112 | cfgManager->setRememberLastRectangularRegion(mRememberUntilClosed->isChecked() || mRememberAlways->isChecked()); | 126 | cfgManager->setRememberLastRectangularRegion(mRememberUntilClosed->isChecked() || mRememberAlways->isChecked()); | ||
113 | cfgManager->setAlwaysRememberRegion (mRememberAlways->isChecked()); | 127 | cfgManager->setAlwaysRememberRegion (mRememberAlways->isChecked()); | ||
114 | cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); | 128 | cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); | ||
115 | cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); | 129 | cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); | ||
116 | cfgManager->setPrintKeyActionRunning(static_cast<SpectacleConfig::PrintKeyActionRunning>(mPrintKeyActionGroup->checkedId())); | 130 | cfgManager->setPrintKeyActionRunning(static_cast<SpectacleConfig::PrintKeyActionRunning>(mPrintKeyActionGroup->checkedId())); | ||
131 | cfgManager->setCopyImageToClipboardSetting(static_cast<SpectacleConfig::CopyImageToClipboardSetting>(mCopyToClipboardGroup->checkedId())); | ||||
117 | 132 | | |||
118 | mChangesMade = false; | 133 | mChangesMade = false; | ||
119 | } | 134 | } | ||
120 | 135 | | |||
121 | void GeneralOptionsPage::resetChanges() | 136 | void GeneralOptionsPage::resetChanges() | ||
122 | { | 137 | { | ||
123 | SpectacleConfig *cfgManager = SpectacleConfig::instance(); | 138 | SpectacleConfig *cfgManager = SpectacleConfig::instance(); | ||
124 | 139 | | |||
125 | mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); | 140 | mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); | ||
126 | mRememberUntilClosed->setChecked(cfgManager->rememberLastRectangularRegion()); | 141 | mRememberUntilClosed->setChecked(cfgManager->rememberLastRectangularRegion()); | ||
127 | mRememberAlways->setChecked(cfgManager->alwaysRememberRegion()); | 142 | mRememberAlways->setChecked(cfgManager->alwaysRememberRegion()); | ||
128 | mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); | 143 | mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); | ||
129 | mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); | 144 | mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); | ||
130 | mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); | 145 | mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); | ||
146 | mCopyToClipboardGroup->button(cfgManager->copyImageToClipboardSetting())->setChecked(true); | ||||
131 | 147 | | |||
132 | mChangesMade = false; | 148 | mChangesMade = false; | ||
133 | } | 149 | } |
This one