benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix checkboxes in General Config (#1543) (#1793)

Browse Source 
* GeneralConf.cpp: Remove redundant initializations

Removed unnecessary setChecked and setValue calls in init* methods which
get called inside updateComponents anyway. Also added missing function
calls in updateComponents. This has exposed more bugs.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Merge updateComponents and setActualFormData

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix useJpgForClipboard checkbox

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix crash when 'Automatic updates' is checked

The config window used to crash when 'Automatic updates' check box was
interacted with, if the application started with the system tray
disabled.

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Some cleanup

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-08-02 15:56:09 +02:00
committed by GitHub
parent 2608d1ecc0
commit b2ecb70e38
3 changed files with 21 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/config/generalconf.cpp
View File

@@ -51,7 +51,7 @@ GeneralConf::GeneralConf(QWidget* parent)
updateComponents();
}
void GeneralConf::updateComponents()
void GeneralConf::_updateComponents(bool allowEmptySavePath)
{
ConfigHandler config;
m_helpMessage->setChecked(config.showHelpValue());
@@ -63,10 +63,15 @@ void GeneralConf::updateComponents()
m_saveAfterCopy->setChecked(config.saveAfterCopyValue());
m_copyPathAfterSave->setChecked(config.copyPathAfterSaveEnabled());
m_useJpgForClipboard->setChecked(config.useJpgForClipboard());
m_historyConfirmationToDelete->setChecked(
config.historyConfirmationToDelete());
m_checkForUpdates->setChecked(config.checkForUpdates());
m_showStartupLaunchMessage->setChecked(config.showStartupLaunchMessage());
m_screenshotPathFixedCheck->setChecked(config.savePathFixed());
m_uploadHistoryMaxSize->setValue(config.uploadHistoryMaxSizeValue());
m_undoLimit->setValue(config.undoLimit());
if (!config.savePath().isEmpty()) {
if (allowEmptySavePath || !config.savePath().isEmpty()) {
m_savePath->setText(config.savePath());
} else {
ConfigHandler().setSavePath(
@@ -77,6 +82,11 @@ void GeneralConf::updateComponents()
#endif
}
void GeneralConf::updateComponents()
{
_updateComponents(false);
}
void GeneralConf::showHelpChanged(bool checked)
{
ConfigHandler().setShowHelp(checked);
@@ -169,34 +179,10 @@ void GeneralConf::resetConfiguration()
m_savePath->setText(
QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
ConfigHandler().setDefaultSettings();
setActualFormData();
_updateComponents(true);
}
}
void GeneralConf::setActualFormData()
{
// read and set current settings
ConfigHandler config;
m_sysNotifications->setChecked(config.desktopNotificationValue());
m_showTray->setChecked(!config.disabledTrayIconValue());
m_helpMessage->setChecked(config.showHelpValue());
m_sidePanelButton->setChecked(config.showSidePanelButtonValue());
m_checkForUpdates->setChecked(config.checkForUpdates());
m_autostart->setChecked(config.startupLaunchValue());
m_showStartupLaunchMessage->setChecked(config.showStartupLaunchMessage());
m_copyAndCloseAfterUpload->setChecked(
config.copyAndCloseAfterUploadEnabled());
m_copyPathAfterSave->setChecked(config.copyPathAfterSaveEnabled());
m_saveAfterCopy->setChecked(config.saveAfterCopyValue());
m_savePath->setText(config.savePath());
m_screenshotPathFixedCheck->setChecked(config.savePathFixed());
m_historyConfirmationToDelete->setChecked(
config.historyConfirmationToDelete());
m_uploadHistoryMaxSize->setValue(config.uploadHistoryMaxSizeValue());
m_undoLimit->setValue(config.undoLimit());
m_useJpgForClipboard->setChecked(config.useJpgForClipboard());
}
void GeneralConf::initScrollArea()
{
m_scrollArea = new QScrollArea(this);
@@ -219,9 +205,6 @@ void GeneralConf::initScrollArea()
void GeneralConf::initShowHelp()
{
m_helpMessage = new QCheckBox(tr("Show help message"), this);
ConfigHandler config;
bool checked = config.showHelpValue();
m_helpMessage->setChecked(checked);
m_helpMessage->setToolTip(tr("Show the help message at the beginning "
"in the capture mode."));
m_scrollAreaLayout->addWidget(m_helpMessage);
@@ -233,7 +216,6 @@ void GeneralConf::initShowHelp()
void GeneralConf::initShowSidePanelButton()
{
m_sidePanelButton = new QCheckBox(tr("Show the side panel button"), this);
m_sidePanelButton->setChecked(ConfigHandler().showSidePanelButtonValue());
m_sidePanelButton->setToolTip(
tr("Show the side panel toggle button in the capture mode."));
m_scrollAreaLayout->addWidget(m_sidePanelButton);
@@ -243,12 +225,10 @@ void GeneralConf::initShowSidePanelButton()
this,
&GeneralConf::showSidePanelButtonChanged);
}
void GeneralConf::initShowDesktopNotification()
{
m_sysNotifications = new QCheckBox(tr("Show desktop notifications"), this);
ConfigHandler config;
bool checked = config.desktopNotificationValue();
m_sysNotifications->setChecked(checked);
m_sysNotifications->setToolTip(tr("Show desktop notifications"));
m_scrollAreaLayout->addWidget(m_sysNotifications);
@@ -262,8 +242,6 @@ void GeneralConf::initShowTrayIcon()
{
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
m_showTray = new QCheckBox(tr("Show tray icon"), this);
bool checked = !ConfigHandler().disabledTrayIconValue();
m_showTray->setChecked(checked);
m_showTray->setToolTip(tr("Show the systemtray icon"));
m_scrollAreaLayout->addWidget(m_showTray);
@@ -279,8 +257,6 @@ void GeneralConf::initHistoryConfirmationToDelete()
m_historyConfirmationToDelete = new QCheckBox(
tr("Confirmation required to delete screenshot from the latest uploads"),
this);
m_historyConfirmationToDelete->setChecked(
ConfigHandler().historyConfirmationToDelete());
m_historyConfirmationToDelete->setToolTip(
tr("Confirmation required to delete screenshot from the latest uploads"));
m_scrollAreaLayout->addWidget(m_historyConfirmationToDelete);
@@ -324,7 +300,6 @@ void GeneralConf::initConfigButtons()
void GeneralConf::initCheckForUpdates()
{
m_checkForUpdates = new QCheckBox(tr("Automatic check for updates"), this);
m_checkForUpdates->setChecked(ConfigHandler().checkForUpdates());
m_checkForUpdates->setToolTip(tr("Automatic check for updates"));
m_scrollAreaLayout->addWidget(m_checkForUpdates);
@@ -337,8 +312,6 @@ void GeneralConf::initCheckForUpdates()
void GeneralConf::initAutostart()
{
m_autostart = new QCheckBox(tr("Launch at startup"), this);
bool checked = ConfigHandler().startupLaunchValue();
m_autostart->setChecked(checked);
m_autostart->setToolTip(tr("Launch Flameshot"));
m_scrollAreaLayout->addWidget(m_autostart);
@@ -351,9 +324,8 @@ void GeneralConf::initShowStartupLaunchMessage()
m_showStartupLaunchMessage =
new QCheckBox(tr("Show welcome message on launch"), this);
ConfigHandler config;
bool checked = config.showStartupLaunchMessage();
m_showStartupLaunchMessage->setChecked(checked);
m_showStartupLaunchMessage->setToolTip(tr("Launch Flameshot"));
m_showStartupLaunchMessage->setToolTip(
tr("Show welcome message on launch"));
m_scrollAreaLayout->addWidget(m_showStartupLaunchMessage);
connect(m_showStartupLaunchMessage, &QCheckBox::clicked, [](bool checked) {
@@ -365,9 +337,6 @@ void GeneralConf::initCopyAndCloseAfterUpload()
{
m_copyAndCloseAfterUpload =
new QCheckBox(tr("Copy URL after upload"), this);
ConfigHandler config;
m_copyAndCloseAfterUpload->setChecked(
config.copyAndCloseAfterUploadEnabled());
m_copyAndCloseAfterUpload->setToolTip(
tr("Copy URL and close window after upload"));
m_scrollAreaLayout->addWidget(m_copyAndCloseAfterUpload);
@@ -416,7 +385,6 @@ void GeneralConf::initSaveAfterCopy()
m_screenshotPathFixedCheck =
new QCheckBox(tr("Use fixed path for screenshots to save"), this);
m_screenshotPathFixedCheck->setChecked(ConfigHandler().savePathFixed());
connect(m_screenshotPathFixedCheck,
SIGNAL(toggled(bool)),
this,
@@ -440,11 +408,8 @@ void GeneralConf::initUploadHistoryMaxSize()
QVBoxLayout* vboxLayout = new QVBoxLayout();
box->setLayout(vboxLayout);
int max = ConfigHandler().uploadHistoryMaxSizeValue();
m_uploadHistoryMaxSize = new QSpinBox(this);
m_uploadHistoryMaxSize->setMaximum(50);
m_uploadHistoryMaxSize->setValue(max);
QString foreground = this->palette().windowText().color().name();
m_uploadHistoryMaxSize->setStyleSheet(
QStringLiteral("color: %1").arg(foreground));
@@ -470,12 +435,9 @@ void GeneralConf::initUndoLimit()
QVBoxLayout* vboxLayout = new QVBoxLayout();
box->setLayout(vboxLayout);
int limit = ConfigHandler().undoLimit();
m_undoLimit = new QSpinBox(this);
m_undoLimit->setMinimum(1);
m_undoLimit->setMaximum(999);
m_undoLimit->setValue(limit);
QString foreground = this->palette().windowText().color().name();
m_undoLimit->setStyleSheet(QStringLiteral("color: %1").arg(foreground));
@@ -493,9 +455,6 @@ void GeneralConf::initUseJpgForClipboard()
{
m_useJpgForClipboard =
new QCheckBox(tr("Use JPG format for clipboard (PNG default)"), this);
ConfigHandler config;
bool checked = config.useJpgForClipboard();
m_useJpgForClipboard->setChecked(checked);
m_useJpgForClipboard->setToolTip(
tr("Use JPG format for clipboard (PNG default)"));
m_scrollAreaLayout->addWidget(m_useJpgForClipboard);
@@ -532,8 +491,6 @@ void GeneralConf::changeSavePath()
void GeneralConf::initCopyPathAfterSave()
{
m_copyPathAfterSave = new QCheckBox(tr("Copy file path after save"), this);
ConfigHandler config;
m_copyPathAfterSave->setChecked(config.copyPathAfterSaveEnabled());
m_copyPathAfterSave->setToolTip(tr("Copy file path after save"));
m_scrollAreaLayout->addWidget(m_copyPathAfterSave);
connect(m_copyPathAfterSave, &QCheckBox::clicked, [](bool checked) {

2
src/config/generalconf.h
View File

@@ -60,7 +60,7 @@ private:
void initCopyPathAfterSave();
void initUseJpgForClipboard();
void setActualFormData();
void _updateComponents(bool allowEmptySavePath);
// class members
QVBoxLayout* m_layout;

6
src/core/controller.cpp
View File

@@ -134,8 +134,10 @@ void Controller::enableExports()
void Controller::setCheckForUpdatesEnabled(const bool enabled)
{
m_appUpdates->setVisible(enabled);
m_appUpdates->setEnabled(enabled);
if (m_appUpdates != nullptr) {
m_appUpdates->setVisible(enabled);
m_appUpdates->setEnabled(enabled);
}
if (enabled) {
getLatestAvailableVersion();
}