[stable-4.0] [master] 2003-Network_Settings_Dialog

src/gui/CMakeLists.txt

@@ -23,6 +23,9 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
 set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
 
+#NMC customization: needed to find the ui file in a different location than the header file
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/src/gui")
+
 set(client_UI_SRCS
     accountsettings.ui
     conflictdialog.ui
@@ -260,6 +263,10 @@ set(client_SRCS
     wizard/wizardproxysettingsdialog.cpp
     )
 
+file(GLOB NMC_FILES "nmcgui/*")
+set(NMC_SRCS ${NMC_FILES})
+list(APPEND client_SRCS ${NMC_SRCS})
+
 if (NOT DISABLE_ACCOUNT_MIGRATION)
     list(APPEND client_SRCS
         legacyaccountselectiondialog.h

src/gui/networksettings.cpp

@@ -17,6 +17,8 @@
 #include <QNetworkProxy>
 #include <QString>
 #include <QList>
+#include <QPainter>
+#include <QPainterPath>
 #include <type_traits>
 
 namespace OCC {
@@ -28,6 +30,9 @@ NetworkSettings::NetworkSettings(const AccountPtr &account, QWidget *parent)
 {
     _ui->setupUi(this);
 
+    setAttribute(Qt::WA_OpaquePaintEvent, false);
+    setAutoFillBackground(false);
+
     _ui->manualSettings->setVisible(_ui->manualProxyRadioButton->isChecked());
 
     _ui->proxyGroupBox->setVisible(!Theme::instance()->doNotUseProxy());
@@ -276,5 +281,23 @@ void NetworkSettings::checkAccountLocalhost()
     _ui->labelLocalhost->setVisible(visible);
 }
 
+void NetworkSettings::paintEvent(QPaintEvent *event)
+{
+
+    const int radius = 4;
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    QRect rect(0, 0, width(), height());
+    QPainterPath path;
+    path.addRoundedRect(rect, radius, radius);
+
+    QPalette palette = this->palette();
+    painter.fillRect(rect, palette.color(QPalette::Base));
+    painter.fillPath(path, palette.color(QPalette::Base));
+
+    QWidget::paintEvent(event);
+}
 
 } // namespace OCC

src/gui/networksettings.h

@@ -31,6 +31,11 @@ class NetworkSettings : public QWidget
     ~NetworkSettings() override;
     [[nodiscard]] QSize sizeHint() const override;
 
+    Ui::NetworkSettings *getUi() const
+    {
+        return _ui;
+    }
+
 private slots:
     void saveProxySettings();
     void saveBWLimitSettings();
@@ -42,6 +47,7 @@ private slots:
 
 protected:
     void showEvent(QShowEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
 
 private:
     void loadProxySettings();

src/gui/networksettings.ui

@@ -17,6 +17,9 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
+   <property name="topMargin">
+    <number>16</number>
+   </property>
    <item row="2" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -45,6 +48,9 @@
       <string>Proxy Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <property name="verticalSpacing">
+       <number>8</number>
+      </property>
       <item row="0" column="0">
        <widget class="QRadioButton" name="noProxyRadioButton">
         <property name="text">
@@ -306,13 +312,13 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
         <property name="topMargin">
-         <number>9</number>
+        <number>8</number>
         </property>
         <property name="bottomMargin">
-         <number>0</number>
+        <number>0</number>
         </property>
         <property name="verticalSpacing">
-         <number>6</number>
+        <number>8</number>
         </property>
         <item row="3" column="0">
          <widget class="QRadioButton" name="downloadLimitRadioButton">
@@ -337,7 +343,7 @@
            <string>Limit to 3/4 of estimated bandwidth</string>
           </property>
           <property name="text">
-           <string>Limit automatically</string>
+           <string>Limit to 3/4 of estimated bandwidth</string>
           </property>
          </widget>
         </item>
@@ -401,18 +407,15 @@
        <property name="alignment">
         <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
        </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
        <layout class="QGridLayout" name="gridLayout_4">
         <property name="topMargin">
-         <number>9</number>
+         <number>12</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
         <property name="verticalSpacing">
-         <number>6</number>
+         <number>8</number>
         </property>
         <item row="3" column="0">
          <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0">
@@ -460,7 +463,7 @@
            <string>Limit to 3/4 of estimated bandwidth</string>
           </property>
           <property name="text">
-           <string>Limit automatically</string>
+           <string>Limit to 3/4 of estimated bandwidth</string>
           </property>
          </widget>
         </item>

src/gui/nmcgui/nmcnetworksettings.cpp

@@ -0,0 +1,125 @@
+/*
+* 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/nmcnetworksettings.h"
+#include "networksettings.h"
+#include "ui_networksettings.h"
+
+#include <QLabel>
+#include <QSpacerItem>
+#include <QGridLayout>
+#include <QSizePolicy>
+#include <QCoreApplication>
+
+namespace OCC {
+
+NMCNetworkSettings::NMCNetworkSettings(const AccountPtr &account, QWidget *parent)
+    : NetworkSettings(account, parent)
+{
+    setLayout();
+}
+
+void NMCNetworkSettings::setLayout()
+{
+    auto *ui = getUi();
+
+    //
+    // Proxy Settings
+    //
+    ui->proxyGroupBox->setTitle({});
+    ui->proxyGroupBox->layout()->removeWidget(ui->manualProxyRadioButton);
+    ui->proxyGroupBox->layout()->removeWidget(ui->noProxyRadioButton);
+    ui->proxyGroupBox->layout()->removeWidget(ui->systemProxyRadioButton);
+
+    delete ui->horizontalLayout_7;
+    delete ui->horizontalSpacer_2;
+
+    ui->proxyGroupBox->layout()->setContentsMargins(16, 16, 16, 16);
+    ui->proxyGroupBox->setStyleSheet("border-radius: 4px;");
+
+    auto *proxyLayout = qobject_cast<QGridLayout *>(ui->proxyGroupBox->layout());
+    auto *proxyLabel = new QLabel(QCoreApplication::translate("", "PROXY_SETTINGS"));
+    proxyLabel->setStyleSheet("font-size: 12px; font-weight: bold;");
+
+    proxyLayout->addWidget(proxyLabel, 0, 0);
+    proxyLayout->addItem(new QSpacerItem(1, 8, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 0);
+    proxyLayout->addWidget(ui->noProxyRadioButton, 2, 0);
+    proxyLayout->addWidget(ui->systemProxyRadioButton, 3, 0);
+    proxyLayout->addWidget(ui->manualProxyRadioButton, 4, 0);
+
+    ui->horizontalSpacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+    ui->proxyGroupBox->setStyleSheet(ui->proxyGroupBox->styleSheet());
+
+    //
+    // Download Bandwidth
+    //
+    ui->verticalSpacer_2->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+    ui->downloadBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->horizontalLayout_3->setSpacing(8);
+    ui->downloadBox->setTitle({});
+
+    ui->downloadBox->layout()->removeWidget(ui->noDownloadLimitRadioButton);
+    ui->downloadBox->layout()->removeWidget(ui->autoDownloadLimitRadioButton);
+    ui->downloadBox->layout()->removeWidget(ui->downloadLimitRadioButton);
+
+    delete ui->horizontalLayout_3;
+
+    ui->downloadBox->layout()->setContentsMargins(16, 16, 16, 16);
+    ui->downloadBox->setStyleSheet("border-radius: 4px;");
+
+    auto *downLayout = qobject_cast<QGridLayout *>(ui->downloadBox->layout());
+    auto *downLabel = new QLabel(QCoreApplication::translate("", "DOWNLOAD_BANDWIDTH"));
+    downLabel->setStyleSheet("font-size: 12px; font-weight: bold;");
+
+    downLayout->addWidget(downLabel, 0, 0);
+    downLayout->addItem(new QSpacerItem(1, 8, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 0);
+    downLayout->addWidget(ui->noDownloadLimitRadioButton, 2, 0);
+    downLayout->addWidget(ui->autoDownloadLimitRadioButton, 3, 0);
+    downLayout->addWidget(ui->downloadLimitRadioButton, 4, 0);
+
+    ui->downloadLimitRadioButton->setFixedHeight(ui->downloadSpinBox->height());
+    ui->downloadBox->setStyleSheet(ui->downloadBox->styleSheet());
+
+    //
+    // Upload Bandwidth
+    //
+    ui->verticalSpacer_3->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+    ui->uploadBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->horizontalLayout_4->setSpacing(8);
+    ui->uploadBox->setTitle({});
+
+    ui->uploadBox->layout()->removeWidget(ui->noUploadLimitRadioButton);
+    ui->uploadBox->layout()->removeWidget(ui->autoUploadLimitRadioButton);
+    ui->uploadBox->layout()->removeWidget(ui->uploadLimitRadioButton);
+
+    delete ui->horizontalLayout_4;
+
+    ui->uploadBox->layout()->setContentsMargins(16, 16, 16, 16);
+    ui->uploadBox->setStyleSheet("border-radius: 4px;");
+
+    auto *upLayout = qobject_cast<QGridLayout *>(ui->uploadBox->layout());
+    auto *upLabel = new QLabel(QCoreApplication::translate("", "UPLOAD_BANDWIDTH"));
+    upLabel->setStyleSheet("font-size: 12px; font-weight: bold;");
+
+    upLayout->addWidget(upLabel, 0, 0);
+    upLayout->addItem(new QSpacerItem(1, 8, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 0);
+    upLayout->addWidget(ui->noUploadLimitRadioButton, 2, 0);
+    upLayout->addWidget(ui->autoUploadLimitRadioButton, 3, 0);
+    upLayout->addWidget(ui->uploadLimitRadioButton, 4, 0);
+
+    ui->uploadLimitRadioButton->setFixedHeight(ui->uploadSpinBox->height());
+    ui->uploadBox->setStyleSheet(ui->uploadBox->styleSheet());
+}
+
+} // namespace OCC

src/gui/nmcgui/nmcnetworksettings.h

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.com>
+ *
+ * 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_NETWORKSETTINGSMAGENTA_H
+#define MIRALL_NETWORKSETTINGSMAGENTA_H
+
+#include "networksettings.h"
+
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
+
+namespace OCC {
+
+/**
+ * @class NMCNetworkSettings
+ * @ingroup gui
+ * @brief Derived class for network settings specific to NMC (Magenta) in the ownCloud client.
+ */
+class NMCNetworkSettings : public NetworkSettings
+{
+    Q_OBJECT
+
+    public:
+        /**
+         * @brief Constructor
+         * @param account Account pointer used to configure settings
+         * @param parent Parent widget
+         */
+        explicit NMCNetworkSettings(const AccountPtr &account = {}, QWidget *parent = nullptr);
+
+        /**
+         * @brief Destructor
+         */
+        ~NMCNetworkSettings() override = default;
+
+    private:
+        /**
+         * @brief Initializes and sets the custom layout
+         */
+        void setLayout();
+    };
+
+} // namespace OCC
+
+#endif // MIRALL_NETWORKSETTINGSMAGENTA_H