Theme: Revert logic of singleAccount switch.

To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.

Note that existing brandings need to rename the switch.

https://github.com/owncloud/ownbrander/issues/443

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 703dd29ea2be56a2d77c75fdb0e834f84cc9a428..c4a8e35c385cd2c47884a1e10077cf37ddd6f4dd 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -173,7 +173,7 @@ void GeneralSettings::slotAccountAddedOrRemoved()
 {
     _ui->addAccountButton->setVisible(
         AccountManager::instance()->accounts().isEmpty()
-            || !Theme::instance()->singleAccount());
+            || Theme::instance()->multiAccount());
 }
 
 

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 257c05ba146ec89c84e2eaa7b93f8cb01debcd17..17016b6bab1fc1741d6163f4751fc6285f76376a 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -201,9 +201,9 @@ bool Theme::singleSyncFolder() const {
     return false;
 }
 
-bool Theme::singleAccount() const
+bool Theme::multiAccount() const
 {
-    return false;
+    return true;
 }
 
 QString Theme::defaultServerFolder() const

diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 05acf80cca126a50ffccdf6e31acf68c8cbeea67..d3062449c67314892dc17ea541d11018226a0991 100644 (file)
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -111,10 +111,11 @@ public:
      * Characteristics: bool if more than one sync folder is allowed
      */
     virtual bool singleSyncFolder() const;
+
     /**
-     * When true, there can only be one account.
+     * When true, client works with multiple accounts.
      */
-    virtual bool singleAccount() const;
+    virtual bool multiAccount() const;
 
     /**
     * URL to help file