dolphinmainwindow: zoom action is now a KToolBarPopupAction

[dolphin.git] / src / global.h

diff --git a/src/global.h b/src/global.h
index 4f4eb890cd79e954f72d6da81f8fa94140e1cc62..81ade47fa03db96bf259697ec4bfccdab5750868 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -14,47 +14,47 @@
 class KConfigGroup;
 class OrgKdeDolphinMainWindowInterface;
 
-namespace Dolphin {
-    QList<QUrl> validateUris(const QStringList& uriList);
+namespace Dolphin
+{
+QList<QUrl> validateUris(const QStringList &uriList);
 
-    /**
-     * Returns the home url which is defined in General Settings
-     */
-    QUrl homeUrl();
+/**
+ * Returns the home url which is defined in General Settings
+ */
+QUrl homeUrl();
 
-    enum class OpenNewWindowFlag {
-        None = 0,
-        Select = 1<<1
-    };
-    Q_DECLARE_FLAGS(OpenNewWindowFlags, OpenNewWindowFlag)
+enum class OpenNewWindowFlag { None = 0, Select = 1 << 1 };
+Q_DECLARE_FLAGS(OpenNewWindowFlags, OpenNewWindowFlag)
 
-    /**
-     * Opens a new Dolphin window
-     */
-    void openNewWindow(const QList<QUrl> &urls = {}, QWidget *window = nullptr, const OpenNewWindowFlags &flags = OpenNewWindowFlag::None);
+/**
+ * Opens a new Dolphin window
+ */
+void openNewWindow(const QList<QUrl> &urls = {}, QWidget *window = nullptr, const OpenNewWindowFlags &flags = OpenNewWindowFlag::None);
 
-    /**
-     * Attaches URLs to an existing Dolphin instance if possible.
-     * If @p preferredService is a valid dbus service, it will be tried first.
-     * @p preferredService needs to support the org.kde.dolphin.MainWindow dbus interface with the /dolphin/Dolphin_1 path.
-     * Returns true if the URLs were successfully attached.
-     */
-    bool attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService = QString());
+/**
+ * Attaches URLs to an existing Dolphin instance if possible.
+ * If @p preferredService is a valid dbus service, it will be tried first.
+ * @p preferredService needs to support the org.kde.dolphin.MainWindow dbus interface with the /dolphin/Dolphin_1 path.
+ * Returns true if the URLs were successfully attached.
+ */
+bool attachToExistingInstance(const QList<QUrl> &inputUrls, bool openFiles, bool splitView, const QString &preferredService, const QString &activationToken);
 
-    /**
-     * Returns a QVector with all GUI-capable Dolphin instances
-     */
-    QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinGuiInstances(const QString& preferredService);
+/**
+ * Returns a QVector with all GUI-capable Dolphin instances
+ */
+QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> dolphinGuiInstances(const QString &preferredService);
 
-    QPair<QString, Qt::SortOrder> sortOrderForUrl(QUrl &url);
+QPair<QString, Qt::SortOrder> sortOrderForUrl(QUrl &url);
 
-    /**
-     * TODO: Move this somewhere global to all KDE apps, not just Dolphin
-     */
-    const int VERTICAL_SPACER_HEIGHT = 12;
-    const int LAYOUT_SPACING_SMALL = 2;
+/**
+ * TODO: Use global KDE spacings instead of Dolphin-specific ones once we have them.
+ */
+constexpr int VERTICAL_SPACER_HEIGHT = 12;
+constexpr int LAYOUT_SPACING_SMALL = 4;
 }
 
+enum Animated { WithAnimation, WithoutAnimation };
+
 class GlobalConfig : public QObject
 {
     Q_OBJECT