fix missing invert button on configure windows and remove old size (#3118)

Author: Alaskra

flameshot.example.ini

@@ -135,7 +135,6 @@
 ;TYPE_SYM_RESIZE_UP=Ctrl+Shift+Up
 ;TYPE_SAVE=Ctrl+S
 ;TYPE_SELECTION=S
-;TYPE_SELECTIONINDICATOR=
 ;TYPE_SELECT_ALL=Ctrl+A
 ;TYPE_TEXT=T
 ;TYPE_TOGGLE_PANEL=Space

src/tools/capturetool.h

@@ -31,7 +31,6 @@ class CaptureTool : public QObject
         TYPE_RECTANGLE = 4,
         TYPE_CIRCLE = 5,
         TYPE_MARKER = 6,
-        TYPE_SELECTIONINDICATOR = 7,
         TYPE_MOVESELECTION = 8,
         TYPE_UNDO = 9,
         TYPE_COPY = 10,

src/utils/confighandler.cpp

@@ -180,7 +180,6 @@ static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {
     SHORTCUT("TYPE_DELETE_CURRENT_TOOL" ,   "Delete"                ),
 #endif
     SHORTCUT("TYPE_PIN"                 ,                           ),
-    SHORTCUT("TYPE_SELECTIONINDICATOR"  ,                           ),
     SHORTCUT("TYPE_SIZEINCREASE"        ,                           ),
     SHORTCUT("TYPE_SIZEDECREASE"        ,                           ),
     SHORTCUT("TYPE_CIRCLECOUNT"         ,                           ),

src/widgets/capture/capturetoolbutton.cpp

@@ -23,12 +23,7 @@ CaptureToolButton::CaptureToolButton(const CaptureTool::Type t, QWidget* parent)
   , m_emergeAnimation(nullptr)
 {
     initButton();
-    if (t == CaptureTool::TYPE_SELECTIONINDICATOR) {
-        QFont f = this->font();
-        setFont(QFont(f.family(), 7, QFont::Bold));
-    } else {
-        updateIcon();
-    }
+    updateIcon();
 }
 
 CaptureToolButton::~CaptureToolButton()
@@ -143,7 +138,6 @@ static std::map<CaptureTool::Type, int> buttonTypeOrder
       { CaptureTool::TYPE_MARKER, 6 }, { CaptureTool::TYPE_TEXT, 7 },
       { CaptureTool::TYPE_PIXELATE, 8 }, { CaptureTool::TYPE_INVERT, 9 },
       { CaptureTool::TYPE_CIRCLECOUNT, 10 },
-      { CaptureTool::TYPE_SELECTIONINDICATOR, 11 },
       { CaptureTool::TYPE_MOVESELECTION, 12 }, { CaptureTool::TYPE_UNDO, 13 },
       { CaptureTool::TYPE_REDO, 14 }, { CaptureTool::TYPE_COPY, 15 },
       { CaptureTool::TYPE_SAVE, 16 }, { CaptureTool::TYPE_IMAGEUPLOADER, 17 },
@@ -167,18 +161,18 @@ int CaptureToolButton::getPriorityByButton(CaptureTool::Type b)
 }
 
 QList<CaptureTool::Type> CaptureToolButton::iterableButtonTypes = {
-    CaptureTool::TYPE_PENCIL,        CaptureTool::TYPE_DRAWER,
-    CaptureTool::TYPE_ARROW,         CaptureTool::TYPE_SELECTION,
-    CaptureTool::TYPE_RECTANGLE,     CaptureTool::TYPE_CIRCLE,
-    CaptureTool::TYPE_MARKER,        CaptureTool::TYPE_TEXT,
-    CaptureTool::TYPE_CIRCLECOUNT,   CaptureTool::TYPE_PIXELATE,
-    CaptureTool::TYPE_MOVESELECTION, CaptureTool::TYPE_UNDO,
-    CaptureTool::TYPE_REDO,          CaptureTool::TYPE_COPY,
-    CaptureTool::TYPE_SAVE,          CaptureTool::TYPE_EXIT,
-    CaptureTool::TYPE_IMAGEUPLOADER,
+    CaptureTool::TYPE_PENCIL,       CaptureTool::TYPE_DRAWER,
+    CaptureTool::TYPE_ARROW,        CaptureTool::TYPE_SELECTION,
+    CaptureTool::TYPE_RECTANGLE,    CaptureTool::TYPE_CIRCLE,
+    CaptureTool::TYPE_MARKER,       CaptureTool::TYPE_TEXT,
+    CaptureTool::TYPE_CIRCLECOUNT,  CaptureTool::TYPE_PIXELATE,
+    CaptureTool::TYPE_INVERT,       CaptureTool::TYPE_MOVESELECTION,
+    CaptureTool::TYPE_UNDO,         CaptureTool::TYPE_REDO,
+    CaptureTool::TYPE_COPY,         CaptureTool::TYPE_SAVE,
+    CaptureTool::TYPE_EXIT,         CaptureTool::TYPE_IMAGEUPLOADER,
 #if !defined(Q_OS_MACOS)
     CaptureTool::TYPE_OPEN_APP,
 #endif
-    CaptureTool::TYPE_PIN,           CaptureTool::TYPE_SIZEINCREASE,
-    CaptureTool::TYPE_SIZEDECREASE,  CaptureTool::TYPE_ACCEPT,
+    CaptureTool::TYPE_PIN,          CaptureTool::TYPE_SIZEINCREASE,
+    CaptureTool::TYPE_SIZEDECREASE, CaptureTool::TYPE_ACCEPT,
 };

src/widgets/capture/capturewidget.cpp

@@ -312,9 +312,6 @@ void CaptureWidget::initButtons()
     // This will allow keyboard shortcuts for those buttons to work
     for (CaptureTool::Type t : allButtonTypes) {
         auto* b = new CaptureToolButton(t, this);
-        if (t == CaptureTool::TYPE_SELECTIONINDICATOR) {
-            m_sizeIndButton = b;
-        }
         b->setColor(m_uiColor);
         b->hide();
         // must be enabled for SelectionWidget's eventFilter to work correctly