[stable-3.13] nmc/2003-E2E_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

@@ -21,6 +21,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
@@ -303,9 +306,10 @@ 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)
 endif()
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)

src/3rdparty/kmessagewidget/kmessagewidget.cpp

@@ -44,6 +44,8 @@ class KMessageWidgetPrivate
     QFrame *content = nullptr;
     QLabel *iconLabel = nullptr;
     QLabel *textLabel = nullptr;
+    QLabel *titleLabel = nullptr;
+    QLabel *titelIcon = nullptr;
     QToolButton *closeButton = nullptr;
     QTimeLine *timeLine = nullptr;
     QIcon icon;
@@ -62,6 +64,9 @@ class KMessageWidgetPrivate
     void slotTimeLineFinished();
 
     [[nodiscard]] int bestContentHeight() const;
+
+private:
+    void applyNMCStylesheets() const;
 };
 
 void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
@@ -86,11 +91,21 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
     iconLabel->hide();
 
     textLabel = new QLabel(content);
-    textLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    textLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    textLabel->setFixedWidth(500);
     textLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     QObject::connect(textLabel, &QLabel::linkActivated, q, &KMessageWidget::linkActivated);
     QObject::connect(textLabel, &QLabel::linkHovered, q, &KMessageWidget::linkHovered);
 
+    titleLabel = new QLabel(content);
+    titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    titleLabel->setText(QCoreApplication::translate("", "E2E_ENCRYPTION"));
+    titleLabel->setStyleSheet("font-size: 13px; font-weight: 600;");
+
+    titelIcon = new QLabel(content);
+    titelIcon->setFixedSize(24,24);
+    titelIcon->setPixmap(QIcon(QLatin1String(":/client/theme/NMCIcons/cloud-security.svg")).pixmap(24,24));
+
     auto *closeAction = new QAction(q);
     closeAction->setText(KMessageWidget::tr("&Close"));
     closeAction->setToolTip(KMessageWidget::tr("Close message"));
@@ -99,8 +114,8 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
     QObject::connect(closeAction, &QAction::triggered, q, &KMessageWidget::animatedHide);
 
     closeButton = new QToolButton(content);
-    closeButton->setAutoRaise(true);
-    closeButton->setDefaultAction(closeAction);
+    //closeButton->setAutoRaise(true);
+    //closeButton->setDefaultAction(closeAction);
 
     q->setMessageType(KMessageWidget::Information);
 }
@@ -117,37 +132,57 @@ void KMessageWidgetPrivate::createLayout()
     Q_FOREACH (QAction *action, q->actions()) {
         auto *button = new QToolButton(content);
         button->setDefaultAction(action);
-        button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        button->setToolButtonStyle(Qt::ToolButtonTextOnly);
         buttons.append(button);
     }
 
     // AutoRaise reduces visual clutter, but we don't want to turn it on if
     // there are other buttons, otherwise the close button will look different
     // from the others.
-    closeButton->setAutoRaise(buttons.isEmpty());
+    //closeButton->setAutoRaise(buttons.isEmpty());
 
-    if (wordWrap) {
+    //NMC customization, make sure, we always enter the first case
+    if (true) {
         auto *layout = new QGridLayout(content);
+
+        layout->setContentsMargins(8,8,0,8);
+        content->setFixedHeight(84);
+
+        auto *titleLayout = new QHBoxLayout(content);
+        titleLayout->setSpacing(8);
+        titleLayout->setContentsMargins(0,0,0,0);
+        titleLayout->addWidget(titleLabel);
+        titleLayout->addWidget(titelIcon);
+
+        layout->addLayout(titleLayout, 0, 0, 1, 1, Qt::AlignLeft | Qt::AlignCenter);
+
         // Set alignment to make sure icon does not move down if text wraps
-        layout->addWidget(iconLabel, 0, 0, 1, 1, Qt::AlignHCenter | Qt::AlignTop);
-        layout->addWidget(textLabel, 0, 1);
+        //layout->addWidget(iconLabel, 0, 0, 1, 1, Qt::AlignHCenter | Qt::AlignTop);
+        layout->addWidget(textLabel, 1, 0);
+        textLabel->setWordWrap(true);
+
+        QSpacerItem *spacerItem = new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding);
+        layout->addItem(spacerItem, 2, 0);
 
         if (buttons.isEmpty()) {
             // Use top-vertical alignment like the icon does.
-            layout->addWidget(closeButton, 0, 2, 1, 1, Qt::AlignHCenter | Qt::AlignTop);
+            //layout->addWidget(closeButton, 0, 2, 1, 1, Qt::AlignHCenter | Qt::AlignTop);
         } else {
             // Use an additional layout in row 1 for the buttons.
-            auto *buttonLayout = new QHBoxLayout;
-            buttonLayout->addStretch();
+            auto *buttonLayout = new QVBoxLayout;
+            buttonLayout->setContentsMargins(0,0,0,0);
+            buttonLayout->setSpacing(4);
+            //buttonLayout->addStretch();
             Q_FOREACH (QToolButton *button, buttons) {
                 // For some reason, calling show() is necessary if wordwrap is true,
                 // otherwise the buttons do not show up. It is not needed if
                 // wordwrap is false.
                 button->show();
                 buttonLayout->addWidget(button);
             }
-            buttonLayout->addWidget(closeButton);
-            layout->addItem(buttonLayout, 1, 0, 1, 2);
+            //buttonLayout->addWidget(closeButton);
+            layout->addItem(buttonLayout, 0, 1, 3, 1, Qt::AlignRight);
+            applyNMCStylesheets();
         }
     } else {
         auto *layout = new QHBoxLayout(content);
@@ -158,7 +193,7 @@ void KMessageWidgetPrivate::createLayout()
             layout->addWidget(button);
         }
 
-        layout->addWidget(closeButton);
+        //layout->addWidget(closeButton);
     };
 
     if (q->isVisible()) {
@@ -176,10 +211,10 @@ void KMessageWidgetPrivate::applyStyleSheet()
     // The following RGB color values come from the "default" scheme in kcolorscheme.cpp
     switch (messageType) {
     case KMessageWidget::Positive:
-        bgBaseColor.setRgb(39, 174,  96); // Window: ForegroundPositive
+        bgBaseColor.setRgb(204, 250,  225); // Window: ForegroundPositive
         break;
     case KMessageWidget::Information:
-        bgBaseColor.setRgb(61, 174, 233); // Window: ForegroundActive
+        bgBaseColor.setRgb(211, 215, 249); // Window: ForegroundActive
         break;
     case KMessageWidget::Warning:
         bgBaseColor.setRgb(246, 116, 0); // Window: ForegroundNeutral
@@ -188,13 +223,12 @@ void KMessageWidgetPrivate::applyStyleSheet()
         bgBaseColor.setRgb(218, 68, 83); // Window: ForegroundNegative
         break;
     }
-    const qreal bgBaseColorAlpha = 0.2;
+    const qreal bgBaseColorAlpha = 1.0;
     bgBaseColor.setAlphaF(bgBaseColorAlpha);
 
     const QPalette palette = QGuiApplication::palette();
     const QColor windowColor = palette.window().color();
     const QColor textColor = palette.text().color();
-    const QColor border = bgBaseColor;
 
     // Generate a final background color from overlaying bgBaseColor over windowColor
     const int newRed = qRound(bgBaseColor.red() * bgBaseColorAlpha) + qRound(windowColor.red() * (1 - bgBaseColorAlpha));
@@ -213,11 +247,13 @@ void KMessageWidgetPrivate::applyStyleSheet()
                               ".QLabel { color: %4; }"
                              )
         .arg(bgFinalColor.name())
-        .arg(border.name())
+        .arg(bgFinalColor.name())
         // DefaultFrameWidth returns the size of the external margin + border width. We know our border is 1px, so we subtract this from the frame normal QStyle FrameWidth to get our margin
         .arg(q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, q) - 1)
         .arg(textColor.name())
     );
+
+    applyNMCStylesheets();
 }
 
 void KMessageWidgetPrivate::updateLayout()
@@ -271,6 +307,30 @@ int KMessageWidgetPrivate::bestContentHeight() const
     return height;
 }
 
+void KMessageWidgetPrivate::applyNMCStylesheets() const
+{
+    //Set button color and size
+    if(!buttons.empty()){
+        QString stylesheet = QString("QToolButton{width: 180px; height: 32px; border-radius: 4px; font-size: %1px; color: %2; background-color: %3;} QToolButton:hover { background-color: %4;}");
+        switch (messageType) {
+        case KMessageWidget::Positive:
+            Q_FOREACH (QToolButton *button, buttons) {
+                button->setStyleSheet(stylesheet.arg("13", "white", "#00b367", "#00a461"));
+            }
+            break;
+        case KMessageWidget::Information:
+            Q_FOREACH (QToolButton *button, buttons) {
+                button->setStyleSheet(stylesheet.arg("13", "white", "#216bff", "#0819bd"));
+            }
+            break;
+        case KMessageWidget::Warning:
+            break;
+        case KMessageWidget::Error:
+            break;
+        }
+    }
+}
+
 //---------------------------------------------------------------------
 // KMessageWidget
 //---------------------------------------------------------------------
@@ -396,7 +456,8 @@ bool KMessageWidget::isCloseButtonVisible() const
 
 void KMessageWidget::setCloseButtonVisible(bool show)
 {
-    d->closeButton->setVisible(show);
+    Q_UNUSED(show)
+    d->closeButton->setVisible(false);
     updateGeometry();
 }
 

src/gui/CMakeLists.txt

@@ -3,6 +3,9 @@ find_package(Qt5 REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 QuickW
 find_package(KF5Archive REQUIRED)
 find_package(KF5GuiAddons)
 
+#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
@@ -261,6 +264,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
@@ -623,6 +630,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
@@ -785,4 +793,4 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
     endif(SharedMimeInfo_FOUND)
 endif()
 
-configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h)
+configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h)

src/gui/accountsettings.cpp

@@ -298,7 +298,7 @@ void AccountSettings::slotE2eEncryptionMnemonicReady()
 
     _ui->encryptionMessage->setMessageType(KMessageWidget::Positive);
     _ui->encryptionMessage->setText(tr("End-to-end encryption has been enabled for this account"));
-    _ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/lock.svg")));
+    //_ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/lock.svg")));
     _ui->encryptionMessage->show();
 }
 
@@ -390,9 +390,7 @@ bool AccountSettings::canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo
 
     if (!_accountState->account()->e2e() || _accountState->account()->e2e()->_mnemonic.isEmpty()) {
         QMessageBox msgBox;
-        msgBox.setText(tr("End-to-end encryption is not configured on this device. "
-                          "Once it is configured, you will be able to encrypt this folder.\n"
-                          "Would you like to set up end-to-end encryption?"));
+        msgBox.setText(QCoreApplication::translate("", "E2E_MNEMONIC_TEXT2"));
         msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
         msgBox.setDefaultButton(QMessageBox::Ok);
         const auto ret = msgBox.exec();
@@ -1066,10 +1064,9 @@ void AccountSettings::displayMnemonic(const QString &mnemonic)
     Ui_Dialog ui{};
     ui.setupUi(&widget);
     widget.setWindowTitle(tr("End-to-end encryption mnemonic"));
+    widget.setWindowFlags(Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
     ui.label->setText(
-        tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
-           "Please note these down and keep them safe. "
-           "They will be needed to add other devices to your account (like your mobile phone or laptop)."));
+        QCoreApplication::translate("", "E2E_MNEMONIC_TEXT"));
     QFont monoFont(QStringLiteral("Monospace"));
     monoFont.setStyleHint(QFont::TypeWriter);
     ui.lineEdit->setFont(monoFont);
@@ -1093,10 +1090,10 @@ void AccountSettings::disableEncryptionForAccount(const AccountPtr &account) con
 {
     QMessageBox dialog;
     dialog.setWindowTitle(tr("Disable end-to-end encryption"));
-    dialog.setText(tr("Disable end-to-end encryption for %1?").arg(account->davUser()));
-    dialog.setInformativeText(tr("Removing end-to-end encryption will remove locally-synced files that are encrypted."
-                                 "<br>"
-                                 "Encrypted files will remain on the server."));
+    dialog.setText(QCoreApplication::translate("", "E2E_MNEMONIC_TEXT4"));
+    // dialog.setInformativeText(tr("Removing end-to-end encryption will remove locally-synced files that are encrypted."
+    //                              "<br>"
+    //                              "Encrypted files will remain on the server."));
     dialog.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
     dialog.setDefaultButton(QMessageBox::Ok);
     dialog.adjustSize();
@@ -1643,11 +1640,7 @@ void AccountSettings::initializeE2eEncryption()
 
         connect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, [this] {
             if (!_accountState->account()->e2e()->_publicKey.isNull()) {
-                _ui->encryptionMessage->setText(tr("End-to-end encryption has been enabled on this account with another device."
-                                                   "<br>"
-                                                   "It can be enabled on this device by entering your mnemonic."
-                                                   "<br>"
-                                                   "This will enable synchronisation of existing encrypted folders."));
+                _ui->encryptionMessage->setText(QCoreApplication::translate("", "E2E_ENCRYPTION_START"));
             }
         });
         _accountState->account()->setE2eEncryptionKeysGenerationAllowed(false);
@@ -1703,7 +1696,7 @@ void AccountSettings::initializeE2eEncryptionSettingsMessage()
 {
     _ui->encryptionMessage->setMessageType(KMessageWidget::Information);
     _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
-    _ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/black/state-info.svg")));
+    //_ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/black/state-info.svg")));
     _ui->encryptionMessage->hide();
 
     auto *const actionEnableE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionEnableEncryptionId);

src/gui/main.cpp

@@ -58,6 +58,15 @@ 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);
 
@@ -188,4 +197,4 @@ int main(int argc, char **argv)
     }
 
     return app.exec();
-}
+}

src/gui/socketapi/socketapi.cpp

@@ -548,8 +548,7 @@ void SocketApi::processEncryptRequest(const QString &localFile)
     if (!account->e2e() || account->e2e()->_mnemonic.isEmpty()) {
         const int ret = QMessageBox::critical(nullptr,
                                               tr("Failed to encrypt folder at \"%1\"").arg(fileData.folderRelativePath),
-                                              tr("The account %1 does not have end-to-end encryption configured. "
-                                                 "Please configure this in your account settings to enable folder encryption.").arg(account->prettyName()));
+                                              QCoreApplication::translate("", "E2E_MNEMONIC_TEXT3").arg(account->prettyName()));
         Q_UNUSED(ret)
         return;
     }

src/gui/tray/usermodel.cpp

@@ -154,7 +154,7 @@ void User::showDesktopNotification(const Activity &activity)
 
 void User::showDesktopNotification(const ActivityList &activityList)
 {
-    const auto subject = QStringLiteral("%1 notifications").arg(activityList.count());
+    const auto subject = tr("%1 notifications").arg(activityList.count());
     const auto notificationId = -static_cast<int>(qHash(subject));
 
     if (!canShowNotification(notificationId)) {