cleaned up naming scheme (for real this time)

flameshot-org · Oct 7, 2024 · 2461e72 · 2461e72
1 parent c4ffb91
commit 2461e72
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/config/generalconf.cpp b/src/config/generalconf.cpp
@@ -59,7 +59,7 @@ GeneralConf::GeneralConf(QWidget* parent)
     initUploadClientSecret();
     initPredefinedColorPaletteLarge();
     initShowSelectionGeometry();
-    initCountingCircleNoContrast();
+    initDisableCountingCircleContrast();
 
     m_layout->addStretch();
 
@@ -83,7 +83,7 @@ void GeneralConf::_updateComponents(bool allowEmptySavePath)
     m_copyPathAfterSave->setChecked(config.copyPathAfterSave());
     m_antialiasingPinZoom->setChecked(config.antialiasingPinZoom());
     m_useJpgForClipboard->setChecked(config.useJpgForClipboard());
-    m_countingCircleNoContrast->setChecked(config.countingCircleNoContrast());
+    m_disableCountingCircleContrast->setChecked(config.disableCountingCircleContrast());
     m_copyOnDoubleClick->setChecked(config.copyOnDoubleClick());
     m_uploadWithoutConfirmation->setChecked(config.uploadWithoutConfirmation());
     m_historyConfirmationToDelete->setChecked(
@@ -152,9 +152,9 @@ void GeneralConf::allowMultipleGuiInstancesChanged(bool checked)
     ConfigHandler().setAllowMultipleGuiInstances(checked);
 }
 
-void GeneralConf::setCountingCircleNoContrast(bool checked)
+void GeneralConf::setDisableCountingCircleContrast(bool checked)
 {
-    ConfigHandler().setCountingCircleNoContrast(checked);
+    ConfigHandler().setDisableCountingCircleContrast(checked);
 }
 void GeneralConf::autoCloseIdleDaemonChanged(bool checked)
 {
@@ -805,16 +805,16 @@ void GeneralConf::initJpegQuality()
             &GeneralConf::setJpegQuality);
 }
 
-void GeneralConf::initCountingCircleNoContrast()
+void GeneralConf::initDisableCountingCircleContrast()
 {
-    m_countingCircleNoContrast = new QCheckBox(tr("Disable contrast on the counting bubble"), this);
-    m_countingCircleNoContrast->setToolTip(
+    m_disableCountingCircleContrast = new QCheckBox(tr("Disable contrast on the counting bubble"), this);
+    m_disableCountingCircleContrast->setToolTip(
       tr("Disable the contrasting circle that is around the counting circle tool when it has no arrow"));
-    m_scrollAreaLayout->addWidget(m_countingCircleNoContrast);
-    connect(m_countingCircleNoContrast,
+    m_scrollAreaLayout->addWidget(m_disableCountingCircleContrast);
+    connect(m_disableCountingCircleContrast,
             &QCheckBox::clicked,
             this,
-            &GeneralConf::setCountingCircleNoContrast);}
+            &GeneralConf::setDisableCountingCircleContrast);}
 
 void GeneralConf::setSelGeoHideTime(int v)
 {

diff --git a/src/config/generalconf.h b/src/config/generalconf.h
@@ -58,7 +58,7 @@ private slots:
     void setGeometryLocation(int index);
     void setSelGeoHideTime(int v);
     void setJpegQuality(int v);
-    void setCountingCircleNoContrast(bool checked);
+    void setDisableCountingCircleContrast(bool checked);
 
 private:
     const QString chooseFolder(const QString& currentPath = "");
@@ -93,7 +93,7 @@ private slots:
     void initSaveLastRegion();
     void initShowSelectionGeometry();
     void initJpegQuality();
-    void initCountingCircleNoContrast();
+    void initDisableCountingCircleContrast();
 
     void _updateComponents(bool allowEmptySavePath);
 
@@ -138,5 +138,5 @@ private slots:
     QComboBox* m_selectGeometryLocation;
     QSpinBox* m_xywhTimeout;
     QSpinBox* m_jpegQuality;
-    QCheckBox* m_countingCircleNoContrast;
+    QCheckBox* m_disableCountingCircleContrast;
 };
diff --git a/src/tools/circlecount/circlecounttool.cpp b/src/tools/circlecount/circlecounttool.cpp
@@ -134,7 +134,7 @@ void CircleCountTool::process(QPainter& painter, const QPixmap& pixmap)
     }
     painter.setPen(contrastColor);
     painter.setBrush(antiContrastColor);
-    if(ConfigHandler().countingCircleNoContrast())
+    if(ConfigHandler().disableCountingCircleContrast())
     {
         if(line.length() < bubble_size)
         {

diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
@@ -79,7 +79,7 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("showDesktopNotification"     ,Bool               ( true          )),
     OPTION("disabledTrayIcon"            ,Bool               ( false         )),
     OPTION("disabledGrimWarning"         ,Bool               ( false         )),
-    OPTION("countingCircleNoContrast"    ,Bool               ( false         )),
+    OPTION("disableCountingCircleContrast"    ,Bool               ( false         )),
     OPTION("historyConfirmationToDelete" ,Bool               ( true          )),
 #if !defined(DISABLE_UPDATE_CHECKER)
     OPTION("checkForUpdates"             ,Bool               ( true          )),

diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
@@ -89,7 +89,7 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(filenamePattern, setFilenamePattern, QString)
     CONFIG_GETTER_SETTER(disabledTrayIcon, setDisabledTrayIcon, bool)
     CONFIG_GETTER_SETTER(disabledGrimWarning, disabledGrimWarning, bool)
-    CONFIG_GETTER_SETTER(countingCircleNoContrast, setCountingCircleNoContrast, bool)
+    CONFIG_GETTER_SETTER(disableCountingCircleContrast, setDisableCountingCircleContrast, bool)
     CONFIG_GETTER_SETTER(drawThickness, setDrawThickness, int)
     CONFIG_GETTER_SETTER(drawFontSize, setDrawFontSize, int)
     CONFIG_GETTER_SETTER(keepOpenAppLauncher, setKeepOpenAppLauncher, bool)