[stable-3.12] nmc/2003-Account_Settings_Dialog

.gitignore

@@ -190,3 +190,6 @@ convert.exe
 *-w10startmenu.png
 *state-*.png
 theme.qrc
+
+# Ignore specific folders
+shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/

CMakeLists.txt

@@ -19,6 +19,9 @@ set(CMAKE_XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES)
 
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
+set(NMC_RCC_FILE "nmctheme_v1.rcc")
+configure_file(${CMAKE_SOURCE_DIR}/${NMC_RCC_FILE} "${BIN_OUTPUT_DIRECTORY}/${NMC_RCC_FILE}" COPYONLY)
+
 include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
 
 # CfAPI Shell Extensions
@@ -301,6 +304,7 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
     configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+    install(FILES nmctheme_v1.rcc DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
 elseif(BUILD_CLIENT)
     install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
     configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)

src/gui/CMakeLists.txt

@@ -2,6 +2,9 @@ project(gui)
 find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 Xml Network)
 find_package(KF5Archive REQUIRED)
 
+#NMC change, its needed to find the ui file in a different location than the header file
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/src/gui")
+
 if(QUICK_COMPILER)
         find_package(Qt5QuickCompiler)
         set_package_properties(Qt5QuickCompiler PROPERTIES
@@ -260,6 +263,10 @@ set(client_SRCS
     wizard/linklabel.cpp
     )
 
+file(GLOB NMC_FILES "nmcgui/*")
+set(NMC_SRCS ${NMC_FILES})
+list(APPEND client_SRCS ${NMC_SRCS})
+
 if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
   list(APPEND client_SRCS
     wizard/webviewpage.h
@@ -590,6 +597,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
         install(FILES ${VISUAL_ELEMENTS} DESTINATION bin/visualelements)
         install(FILES "${theme_dir}/${APPLICATION_EXECUTABLE}.VisualElementsManifest.xml" DESTINATION bin)
         install(FILES ${client_I18N} DESTINATION i18n)
+        install(FILES ${CMAKE_SOURCE_DIR}/nmctheme_v1.rcc DESTINATION bin)
     endif()
 
     # we may not add MACOSX_BUNDLE here, if not building one

src/gui/accountsettings.cpp

@@ -329,6 +329,8 @@ QString AccountSettings::selectedFolderAlias() const
     return _model->data(selected, FolderStatusDelegate::FolderAliasRole).toString();
 }
 
+
+
 void AccountSettings::slotToggleSignInState()
 {
     if (_accountState->isSignedOut()) {
@@ -1112,7 +1114,7 @@ void AccountSettings::showConnectionLabel(const QString &message, QStringList er
         _ui->connectLabel->setToolTip({});
         _ui->connectLabel->setStyleSheet(errStyle);
     }
-    _ui->accountStatus->setVisible(!message.isEmpty());
+    //_ui->accountStatus->setVisible(!message.isEmpty()); //NMC Customization
 }
 
 void AccountSettings::slotEnableCurrentFolder(bool terminate)
@@ -1208,7 +1210,7 @@ void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
         const auto totalStr = Utility::octetsToString(total);
         const auto percentStr = Utility::compactFormatDouble(percent, 1);
         const auto toolTip = tr("%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.").arg(usedStr, totalStr, percentStr);
-        _ui->quotaInfoLabel->setText(tr("%1 of %2 in use").arg(usedStr, totalStr));
+        _ui->quotaInfoLabel->setText(QCoreApplication::translate("", "%1_OF_%2").arg(usedStr, totalStr));
         _ui->quotaInfoLabel->setToolTip(toolTip);
         _ui->quotaProgressBar->setToolTip(toolTip);
     } else {

src/gui/accountsettings.h

@@ -111,6 +111,7 @@ protected slots:
     void slotSelectiveSyncChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
                                   const QVector<int> &roles);
     void slotPossiblyUnblacklistE2EeFoldersAndRestartSync();
+    void checkClientSideEncryptionState(); //NMC customization, we need acces to it
 
 private slots:
     void updateBlackListAndScheduleFolderSync(const QStringList &blackList, OCC::Folder *folder, const QStringList &foldersToRemoveFromBlacklist) const;
@@ -125,9 +126,14 @@ private slots:
 
     void initializeE2eEncryption();
     void resetE2eEncryption();
-    void checkClientSideEncryptionState();
     void removeActionFromEncryptionMessage(const QString &actionId);
 
+protected:
+    Ui::AccountSettings *getUi() const
+    {
+        return _ui;
+    }
+
 private:
     bool event(QEvent *) override;
     QAction *addActionToEncryptionMessage(const QString &actionTitle, const QString &actionId);

src/gui/main.cpp

@@ -58,6 +58,17 @@ int main(int argc, char **argv)
 #ifdef Q_OS_WIN
     SetDllDirectory(L"");
 #endif
+    bool resourceLoaded = false;
+    const QString currentPath = QDir::currentPath();
+    if(Utility::isMac())
+    {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc"));
+    }
+    else if(Utility::isWindows() || !resourceLoaded)
+    {
+        resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc"));
+    }
+
     Q_INIT_RESOURCE(resources);
     Q_INIT_RESOURCE(theme);
 

src/gui/nmcgui/nmcaccountsettings.cpp

@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "nmcgui/nmcaccountsettings.h"
+#include "ui_accountsettings.h"
+#include "qdesktopservices.h"
+
+
+namespace OCC {
+
+NMCAccountSettings::NMCAccountSettings(AccountState *accountState, QWidget *parent)
+    : AccountSettings(accountState, parent)
+    , m_liveAccountButton(new CustomButton(QCoreApplication::translate("", "ADD_LIVE_BACKUP"), QIcon(QLatin1String(":/client/theme/NMCIcons/action-add.svg")).pixmap(24,24)))
+    , m_liveTitle(new QLabel(QCoreApplication::translate("", "LIVE_BACKUPS")))
+    , m_liveDescription(new QLabel(QCoreApplication::translate("", "LIVE_DESCRIPTION")))
+    , m_folderSync(new QLabel(QCoreApplication::translate("", "YOUR_FOLDER_SYNC")))
+{
+    setDefaultSettings();
+    setLayout();
+    connect(m_liveAccountButton, &CustomButton::clicked, this, &NMCAccountSettings::slotAddFolder);
+}
+
+void NMCAccountSettings::setDefaultSettings()
+{
+    //Set default settings
+    getUi()->encryptionMessage->setCloseButtonVisible(true);
+    getUi()->selectiveSyncStatus->setVisible(false);
+    getUi()->selectiveSyncNotification->setVisible(false);
+    getUi()->accountStatus->setVisible(false);
+    getUi()->bigFolderUi->setVisible(false);
+
+    getUi()->gridLayout->setSpacing(8);
+}
+
+void NMCAccountSettings::setLayout()
+{
+    //Fix layout
+    getUi()->storageGroupBox->removeWidget(getUi()->quotaInfoLabel);
+    getUi()->storageGroupBox->removeWidget(getUi()->quotaProgressBar);
+
+    getUi()->gridLayout->removeWidget(getUi()->encryptionMessage);
+    getUi()->gridLayout->addWidget(getUi()->encryptionMessage, 0, 0);
+
+    //getUi()->gridLayout->addWidget(new QLabel(""), 1, 0); //Spacer
+
+    //Title
+    m_folderSync->setStyleSheet("font-size: 15px; font-weight: 600; padding: 8px;"); //Semi-bold
+    m_folderSync->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    getUi()->gridLayout->addWidget(m_folderSync, 1, 0);
+
+    //Live backup area encryptionMessage
+    auto *liveHLayout = new QHBoxLayout(this);
+    liveHLayout->setContentsMargins(8,8,8,8);
+    auto *liveVLayout = new QVBoxLayout(this);
+    auto *liveWidget = new QWidget(this);
+
+    liveWidget->setStyleSheet("QWidget {background-color: white;border-radius: 4px;}");
+    liveWidget->setLayout(liveHLayout);
+    liveHLayout->addLayout(liveVLayout);
+
+    liveHLayout->addSpacerItem(new QSpacerItem(1,1, QSizePolicy::Expanding, QSizePolicy::Fixed));
+
+    const QString styleSheet("QPushButton{ font-size: %5px; border: %1px solid; border-color: black; border-radius: 4px; background-color: %2; color: %3;} QPushButton:hover { background-color: %4; }" );
+    m_liveAccountButton->setStyleSheet(styleSheet.arg("0","#E20074","white", "#c00063", "13"));
+    m_liveAccountButton->setFixedSize(180, 32);
+    m_liveAccountButton->setLeftIconMargin(4);
+    liveHLayout->addWidget(m_liveAccountButton);
+
+    liveVLayout->addWidget(m_liveTitle);
+    m_liveTitle->setStyleSheet("font-size: 15px; font-weight: 600;"); //Semi-bold
+    liveVLayout->addWidget(m_liveDescription);
+    m_liveDescription->setStyleSheet("font-size: 13px;");
+    m_liveDescription->setText("Synchronisieren Sie weitere beliebiege lokale Ordner in ihre MagentaCLOUD und schützen Sie damit ihre Onhalte kontienuierlich.");
+    m_liveDescription->setWordWrap(true);
+    m_liveDescription->setFixedWidth(450);
+
+    getUi()->gridLayout->addWidget(liveWidget, 4, 0);
+
+
+    //Storage area
+    auto *magentaHLayout = new QHBoxLayout(this);
+    magentaHLayout->setSpacing(32);
+
+    auto *quotaVLayout = new QVBoxLayout(this);
+    quotaVLayout->setSpacing(4);
+    auto *quota = new QLabel(this);
+    quota->setText(QCoreApplication::translate("", "USED_STORAGE_%1").arg(QString::number(getUi()->quotaProgressBar->value() > 0 ? getUi()->quotaProgressBar->value() : 0)));
+
+    quotaVLayout->addSpacerItem(new QSpacerItem(1,12, QSizePolicy::Fixed, QSizePolicy::Fixed));
+    quotaVLayout->addWidget(getUi()->quotaInfoLabel);
+    getUi()->quotaInfoLabel->setStyleSheet("QLabel{font-size: 18px; padding: 8px; font-weight: 500;}");
+    quotaVLayout->addWidget(getUi()->quotaProgressBar);
+    getUi()->quotaProgressBar->setStyleSheet("QProgressBar {"
+        "    background-color: #e5e5e5;"
+        "    color: black;"
+        "    border-width: 1px;"
+        "    border-color: black;"
+        "    border-radius: 4px;"
+        "}"
+
+        "QProgressBar::chunk {"
+        "    background-color: #ea0a8e; }");
+    getUi()->quotaProgressBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    quotaVLayout->addWidget(quota);
+    quota->setStyleSheet("font-size: 13px; padding: 8px;");
+    quotaVLayout->addSpacerItem(new QSpacerItem(1,20, QSizePolicy::Fixed, QSizePolicy::Fixed));
+
+    magentaHLayout->addLayout(quotaVLayout);
+
+    auto *storageLinkButton = new QPushButton(QCoreApplication::translate("", "STORAGE_EXTENSION"), this);
+    storageLinkButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    storageLinkButton->setStyleSheet("QPushButton {"
+        "    height: 32px;"
+        "    width: 180px;"
+        "    border: 1px solid black;"
+        "    background-color: #ededed;"
+        "    font-size: 13px;"
+        "    border-radius: 4px;"
+        "} QPushButton::hover {"
+        "    background-color: white;"
+        "}");
+    connect(storageLinkButton, &QPushButton::clicked, this, [](){
+        QDesktopServices::openUrl(QUrl("https://cloud.telekom-dienste.de/tarife"));
+    });
+    magentaHLayout->addWidget(storageLinkButton);
+    magentaHLayout->addSpacerItem(new QSpacerItem(8,1, QSizePolicy::Fixed, QSizePolicy::Fixed));
+
+    getUi()->gridLayout->addLayout(magentaHLayout, 5, 0);
+
+    //We need these, because our widget becomes visibe, when we add it to our layout (due to parent), but in accountsettings its forced to be invisible at first.
+    //We do here the same and check if the visibility is needed or not.
+    getUi()->encryptionMessage->hide();
+    checkClientSideEncryptionState();
+}
+
+} // namespace OCC

src/gui/nmcgui/nmcaccountsettings.h

@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef MIRALL_ACCOUNTSETTINGSMAGENTA_H
+#define MIRALL_ACCOUNTSETTINGSMAGENTA_H
+
+#include "QtWidgets/qpushbutton.h"
+#include <accountsettings.h>
+#include <QPushButton>
+#include <QIcon>
+#include <QPainter>
+
+namespace OCC {
+
+/**
+ * @brief The CustomButton class is a QPushButton with an additional left icon.
+ * @ingroup gui
+ */
+class CustomButton : public QPushButton {
+public:
+    /**
+     * @brief Constructs a CustomButton.
+     * @param text The button text.
+     * @param icon The button icon.
+     * @param parent The parent widget.
+     */
+    explicit CustomButton(const QString &text, const QIcon &icon, QWidget *parent = nullptr)
+        : QPushButton(text, parent)
+        , icon_(icon)
+    {
+        setIconSize(QSize(24, 24));
+    }
+
+    /**
+     * @brief Sets the left margin for the icon.
+     * @param margin The left margin for the icon.
+     */
+    void setLeftIconMargin(int margin){
+        m_leftMargin = margin;
+    }
+
+protected:
+    void paintEvent(QPaintEvent *event) override {
+        QPushButton::paintEvent(event);
+
+        //Its an icon within the button, but we disable it for now, because the text occupies to much space, and the button shod be increased in size to fir the size,
+        //but we dont want to change the button size for cosmetic reasons.
+
+        // if (!icon_.isNull()) {
+        //     QRect iconRect = QRect(m_leftMargin, // left margin
+        //                            (height() - iconSize().height()) / 2, // vertical center
+        //                            iconSize().width(),
+        //                            iconSize().height());
+
+        //     QPainter painter(this);
+        //     painter.drawPixmap(iconRect, icon_.pixmap(iconSize()));
+        // }
+    }
+
+private:
+    QIcon icon_;
+    int m_leftMargin = 4;
+};
+
+/**
+ * @brief The NMCAccountSettings class represents the account settings for a specific type.
+ * @ingroup gui
+ */
+class NMCAccountSettings : public AccountSettings
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Constructs NMCAccountSettings.
+     * @param accountState The account state associated with the settings.
+     * @param parent The parent widget.
+     */
+    explicit NMCAccountSettings(AccountState *accountState, QWidget *parent = nullptr);
+    ~NMCAccountSettings() = default;
+
+private:
+    /**
+     * @brief Sets default settings for NMCAccountSettings.
+     */
+    void setDefaultSettings();
+
+    /**
+     * @brief Sets the layout for NMCAccountSettings.
+     */
+    void setLayout();
+
+private:
+    CustomButton *m_liveAccountButton = nullptr;
+    QLabel *m_liveTitle = nullptr;
+    QLabel *m_liveDescription = nullptr;
+    QLabel *m_folderSync = nullptr;
+};
+
+} // namespace OCC
+#endif // MIRALL_ACCOUNTSETTINGSMAGENTA_H