Improve order and descriptions of Settings/General items (#2777)

* Improve descriptions in Settings/General

* Order Settings/General list more logically

- Startup items in the beginning
- Running and graphical items then
- Combined actions grouped together
etc
This commit is contained in:
Mikko Vedru
2022-07-11 03:27:10 +03:00
committed by GitHub
parent 8f3bf194c4
commit 3898636544

View File

@@ -32,30 +32,30 @@ GeneralConf::GeneralConf(QWidget* parent)
// It must be initialized before the checkboxes.
initScrollArea();
initShowHelp();
initSaveLastRegion();
initShowSidePanelButton();
initShowDesktopNotification();
initShowTrayIcon();
initHistoryConfirmationToDelete();
initCheckForUpdates();
initAutostart();
initShowStartupLaunchMessage();
initCopyAndCloseAfterUpload();
initCopyPathAfterSave();
initAntialiasingPinZoom();
initUploadWithoutConfirmation();
initUseJpgForClipboard();
initSaveAfterCopy();
initUploadHistoryMax();
initUndoLimit();
initUploadClientSecret();
initAllowMultipleGuiInstances();
#if !defined(Q_OS_WIN)
initAutoCloseIdleDaemon();
#endif
initPredefinedColorPaletteLarge();
initShowTrayIcon();
initShowDesktopNotification();
initCheckForUpdates();
initShowStartupLaunchMessage();
initAllowMultipleGuiInstances();
initSaveLastRegion();
initShowHelp();
initShowSidePanelButton();
initUseJpgForClipboard();
initCopyOnDoubleClick();
initSaveAfterCopy();
initCopyPathAfterSave();
initCopyAndCloseAfterUpload();
initUploadWithoutConfirmation();
initHistoryConfirmationToDelete();
initAntialiasingPinZoom();
initUploadHistoryMax();
initUndoLimit();
initUploadClientSecret();
initPredefinedColorPaletteLarge();
initshowSelectionGeometry();
m_layout->addStretch();
@@ -369,9 +369,9 @@ void GeneralConf::initAllowMultipleGuiInstances()
void GeneralConf::initAutoCloseIdleDaemon()
{
m_autoCloseIdleDaemon = new QCheckBox(
tr("Automatically close daemon when it is not needed"), this);
m_autoCloseIdleDaemon->setToolTip(
tr("Automatically close daemon when it is not needed"));
tr("Automatically unload from memory when it is not needed"), this);
m_autoCloseIdleDaemon->setToolTip(tr(
"Automatically close daemon (background process) when it is not needed"));
m_scrollAreaLayout->addWidget(m_autoCloseIdleDaemon);
connect(m_autoCloseIdleDaemon,
&QCheckBox::clicked,
@@ -381,9 +381,9 @@ void GeneralConf::initAutoCloseIdleDaemon()
void GeneralConf::initAutostart()
{
m_autostart = new QCheckBox(tr("Launch at startup"), this);
m_autostart->setToolTip(
tr("Launch Flameshot daemon when computer is booted"));
m_autostart = new QCheckBox(tr("Launch in background at startup"), this);
m_autostart->setToolTip(tr(
"Launch Flameshot daemon (background process) when computer is booted"));
m_scrollAreaLayout->addWidget(m_autostart);
connect(
@@ -421,7 +421,8 @@ void GeneralConf::initPredefinedColorPaletteLarge()
void GeneralConf::initCopyOnDoubleClick()
{
m_copyOnDoubleClick = new QCheckBox(tr("Copy on double click"), this);
m_copyOnDoubleClick->setToolTip(tr("Enable Copy on Double Click"));
m_copyOnDoubleClick->setToolTip(
tr("Enable Copy to clipboard on Double Click"));
m_scrollAreaLayout->addWidget(m_copyOnDoubleClick);
connect(m_copyOnDoubleClick, &QCheckBox::clicked, [](bool checked) {
@@ -599,7 +600,7 @@ void GeneralConf::initUseJpgForClipboard()
m_useJpgForClipboard =
new QCheckBox(tr("Use JPG format for clipboard (PNG default)"), this);
m_useJpgForClipboard->setToolTip(
tr("Use JPG format for clipboard (PNG default)"));
tr("Use lossy JPG format for clipboard (lossless PNG default)"));
m_scrollAreaLayout->addWidget(m_useJpgForClipboard);
#if defined(Q_OS_MACOS)