DolphinView: Remove -1 interval, add setAutoActivationEnabled

[dolphin.git] / src / selectionmode / bottombarcontentscontainer.h

diff --git a/src/selectionmode/bottombarcontentscontainer.h b/src/selectionmode/bottombarcontentscontainer.h
index b9d7947ae318df11d3e40637a36854cce367ad42..10e7ba5fdc2b915d2bdf68c6a0a220db8a9f6f0d 100644 (file)
--- a/src/selectionmode/bottombarcontentscontainer.h
+++ b/src/selectionmode/bottombarcontentscontainer.h
@@ -1,6 +1,6 @@
 /*
     This file is part of the KDE project
 /*
     This file is part of the KDE project

-    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@zohomail.eu>
+    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@kde.org>

 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */


@@ -12,7 +12,7 @@
 #include "bottombar.h"
 
 #include <QPointer>
 #include "bottombar.h"
 
 #include <QPointer>

-#include <QToolButton>
+#include <QPushButton>

 #include <QWidget>
 
 class DolphinContextMenu;
 #include <QWidget>
 
 class DolphinContextMenu;


@@ -52,7 +52,8 @@ public:
         return m_contents;
     };
 
         return m_contents;
     };
 

-    inline bool hasSomethingToShow() {
+    inline bool hasSomethingToShow()
+    {

         return contents() != BottomBar::GeneralContents || m_internalContextMenu;
     }
 
         return contents() != BottomBar::GeneralContents || m_internalContextMenu;
     }
 


@@ -74,11 +75,11 @@ Q_SIGNALS:
 
     /**
      * When it does not make sense to show any specific contents, this signal is emitted and the receiver hides the bar.
 
     /**
      * When it does not make sense to show any specific contents, this signal is emitted and the receiver hides the bar.

-     * Later it might sense to show it again e.g. because the user selected items. Then this signal is used to request showing of the bar.
+     * Later it might make sense to show it again e.g. because the user selected items. Then this signal is used to request showing of the bar.

      */
     void barVisibilityChangeRequested(bool visible);
 
      */
     void barVisibilityChangeRequested(bool visible);
 

-    void leaveSelectionModeRequested();
+    void selectionModeLeavingRequested();

 
 private:
     void addCopyContents();
 
 private:
     void addCopyContents();


@@ -144,7 +145,7 @@ private:
     /// @see updateMainActionButtonText
     ActionWithWidget m_mainAction = ActionWithWidget(nullptr);
     /// The button containing all the actions that don't currently fit into the bar.
     /// @see updateMainActionButtonText
     ActionWithWidget m_mainAction = ActionWithWidget(nullptr);
     /// The button containing all the actions that don't currently fit into the bar.

-    QPointer<QToolButton> m_overflowButton;
+    QPointer<QPushButton> m_overflowButton;

     /// The actionCollection from which the actions for this bar are retrieved.
     KActionCollection *m_actionCollection;
     /// Describes the current contents of the bar.
     /// The actionCollection from which the actions for this bar are retrieved.
     KActionCollection *m_actionCollection;
     /// Describes the current contents of the bar.