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

Minor tweaks after code review

Browse Source
This commit is contained in:
Jeremy Borgman
2021-02-01 19:35:41 -06:00
committed by borgmanJeremy
parent a944860d12
commit 2ee76addbd
5 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/config/geneneralconf.cpp
View File

@@ -39,11 +39,11 @@ GeneneralConf::GeneneralConf(QWidget* parent)
initShowDesktopNotification();
initShowTrayIcon();
initAutostart();
initUseJpgInsteadPngWhenCopy();
initUseJpgForClipboard();
initSaveAfterCopy();
// this has to be at the end
initConfingButtons();
initConfigButtons();
updateComponents();
}
@@ -55,7 +55,7 @@ void GeneneralConf::updateComponents()
m_sysNotifications->setChecked(config.desktopNotificationValue());
m_autostart->setChecked(config.startupLaunchValue());
m_saveAfterCopy->setChecked(config.saveAfterCopyValue());
m_useJpgInsteadPngCheck->setChecked(config.useJpgInsteadPngWhenCopy());
m_useJpgForClipboard->setChecked(config.useJpgForClipboard());
if (!config.saveAfterCopyPathValue().isEmpty()) {
m_savePath->setText(config.saveAfterCopyPathValue());
@@ -216,7 +216,7 @@ void GeneneralConf::initShowTrayIcon()
#endif
}
void GeneneralConf::initConfingButtons()
void GeneneralConf::initConfigButtons()
{
QHBoxLayout* buttonLayout = new QHBoxLayout();
m_layout->addStretch();
@@ -306,21 +306,21 @@ void GeneneralConf::initSaveAfterCopy()
vboxLayout->addWidget(m_screenshotPathFixedCheck);
}
void GeneneralConf::initUseJpgInsteadPngWhenCopy()
void GeneneralConf::initUseJpgForClipboard()
{
m_useJpgInsteadPngCheck =
new QCheckBox(tr("Use JPG format instead of PNG when copy"), this);
m_useJpgForClipboard =
new QCheckBox(tr("Use JPG format for clipboard (PNG default)"), this);
ConfigHandler config;
bool checked = config.useJpgInsteadPngWhenCopy();
m_useJpgInsteadPngCheck->setChecked(checked);
m_useJpgInsteadPngCheck->setToolTip(
tr("Use JPG format instead of PNG when copy"));
m_layout->addWidget(m_useJpgInsteadPngCheck);
bool checked = config.useJpgForClipboard();
m_useJpgForClipboard->setChecked(checked);
m_useJpgForClipboard->setToolTip(
tr("Use JPG format for clipboard (PNG default)"));
m_layout->addWidget(m_useJpgForClipboard);
connect(m_useJpgInsteadPngCheck,
connect(m_useJpgForClipboard,
&QCheckBox::clicked,
this,
&GeneneralConf::useJpgInsteadPngChanged);
&GeneneralConf::useJpgForClipboardChanged);
}
void GeneneralConf::saveAfterCopyChanged(bool checked)
@@ -368,7 +368,7 @@ void GeneneralConf::togglePathFixed()
ConfigHandler().setSavePathFixed(m_screenshotPathFixedCheck->isChecked());
}
void GeneneralConf::useJpgInsteadPngChanged(bool checked)
void GeneneralConf::useJpgForClipboardChanged(bool checked)
{
ConfigHandler().setUseJpgInsteadPngWhenCopy(checked);
ConfigHandler().setUseJpgForClipboard(checked);
}

8
src/config/geneneralconf.h
View File

@@ -46,7 +46,7 @@ private slots:
void exportFileConfiguration();
void resetConfiguration();
void togglePathFixed();
void useJpgInsteadPngChanged(bool checked);
void useJpgForClipboardChanged(bool checked);
private:
const QString chooseFolder(const QString currentPath = "");
@@ -55,10 +55,10 @@ private:
void initShowSidePanelButton();
void initShowDesktopNotification();
void initShowTrayIcon();
void initConfingButtons();
void initConfigButtons();
void initAutostart();
void initSaveAfterCopy();
void initUseJpgInsteadPngWhenCopy();
void initUseJpgForClipboard();
// class members
QVBoxLayout* m_layout;
@@ -74,5 +74,5 @@ private:
QLineEdit* m_savePath;
QPushButton* m_changeSaveButton;
QCheckBox* m_screenshotPathFixedCheck;
QCheckBox* m_useJpgInsteadPngCheck;
QCheckBox* m_useJpgForClipboard;
};