last current step

beware this is messy

Signed-off-by: Matthieu Gallien <[email protected]>

CMakeLists.txt

@@ -7,6 +7,7 @@ project(client)
 include(FeatureSummary)
 
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml)
 
 include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
 

resources.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qml">
+    <qresource prefix="/qmlold">
         <file>src/gui/UserStatusSelector.qml</file>
         <file>src/gui/UserStatusSelectorPage.qml</file>
         <file>src/gui/EmojiPicker.qml</file>

src/CMakeLists.txt

@@ -28,6 +28,18 @@ set_package_properties(Qt${QT_VERSION_MAJOR}Concurrent PROPERTIES
     TYPE REQUIRED
 )
 
+find_package(Qt${QT_VERSION_MAJOR}WebSockets ${REQUIRED_QT_VERSION} CONFIG QUIET)
+set_package_properties(Qt${QT_VERSION_MAJOR}WebSockets PROPERTIES
+    DESCRIPTION "Qt${QT_VERSION_MAJOR} WebSockets component."
+    TYPE REQUIRED
+)
+
+find_package(Qt${QT_VERSION_MAJOR}Core5Compat ${REQUIRED_QT_VERSION} CONFIG QUIET)
+set_package_properties(Qt${QT_VERSION_MAJOR}Core5Compat PROPERTIES
+    DESCRIPTION "Qt${QT_VERSION_MAJOR} Core5Compat component."
+    TYPE REQUIRED
+)
+
 find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET)
 if(APPLE)
     set_package_properties(Qt${QT_VERSION_MAJOR}WebEngineWidgets PROPERTIES

src/cmd/CMakeLists.txt

@@ -14,9 +14,6 @@ target_link_libraries(cmdCore
   Qt::Network
   )
 
-# Need tokenizer for netrc parser
-target_include_directories(cmdCore PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer)
-
 if(UNIX AND NOT APPLE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")

src/cmd/netrcparser.cpp

@@ -15,8 +15,7 @@
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
-
-#include <qtokenizer.h>
+#include <QStringTokenizer>
 
 #include <QDebug>
 
@@ -59,33 +58,32 @@ bool NetrcParser::parse()
     }
     QString content = netrc.readAll();
 
-    QStringTokenizer tokenizer(content, " \n\t");
-    tokenizer.setQuoteCharacters("\"'");
+    auto tokenizer = QStringTokenizer{content, u" \n\t"};
 
     LoginPair pair;
     QString machine;
     bool isDefault = false;
-    while (tokenizer.hasNext()) {
-        QString key = tokenizer.next();
+    for(auto itToken = tokenizer.cbegin(); itToken != tokenizer.cend(); ++itToken) {
+        const auto key = *itToken;
         if (key == defaultKeyword) {
             tryAddEntryAndClear(machine, pair, isDefault);
             isDefault = true;
             continue; // don't read a value
         }
 
-        if (!tokenizer.hasNext()) {
+        if (itToken != tokenizer.cend()) {
             qDebug() << "error fetching value for" << key;
             return false;
         }
-        QString value = tokenizer.next();
+        auto value = *(++itToken);
 
         if (key == machineKeyword) {
             tryAddEntryAndClear(machine, pair, isDefault);
-            machine = value;
+            machine = value.toString();
         } else if (key == loginKeyword) {
-            pair.first = value;
+            pair.first = value.toString();
         } else if (key == passwordKeyword) {
-            pair.second = value;
+            pair.second = value.toString();
         } // ignore unsupported tokens
     }
     tryAddEntryAndClear(machine, pair, isDefault);

src/common/filesystembase.cpp

@@ -326,7 +326,7 @@ bool FileSystem::fileExists(const QString &filename, const QFileInfo &fileInfo)
 #ifdef Q_OS_WIN
 QString FileSystem::fileSystemForPath(const QString &path)
 {
-    // See also QStorageInfo (Qt >=5.4) and GetVolumeInformationByHandleW (>= Vista)
+    // See also QStorageInfo (Qt${QT_VERSION_MAJOR} >=5.4) and GetVolumeInformationByHandleW (>= Vista)
     QString drive = path.left(2);
     if (!drive.endsWith(QLatin1Char(':')))
         return QString();

src/common/utility.cpp

@@ -245,7 +245,7 @@ qint64 Utility::freeDiskSpace(const QString &path)
 QString Utility::compactFormatDouble(double value, int prec, const QString &unit)
 {
     QLocale locale = QLocale::system();
-    QChar decPoint = locale.decimalPoint();
+    auto decPoint = locale.decimalPoint();
     QString str = locale.toString(value, 'f', prec);
     while (str.endsWith(QLatin1Char('0')) || str.endsWith(decPoint)) {
         if (str.endsWith(decPoint)) {

src/common/utility_unix.cpp

@@ -85,7 +85,6 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
         const QString executablePath = runningInsideAppImage ? appImagePath : QCoreApplication::applicationFilePath();
 
         QTextStream ts(&iniFile);
-        ts.setCodec("UTF-8");
         ts << QLatin1String("[Desktop Entry]\n")
            << QLatin1String("Name=") << guiName << QLatin1Char('\n')
            << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n")

src/gui/BasicComboBox.qml

@@ -13,10 +13,9 @@
  */
 
 import QtQuick 2.15
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import Style 1.0
 

src/gui/CMakeLists.txt

@@ -1,6 +1,7 @@
 project(gui)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 Xml Network)
-find_package(KF5Archive REQUIRED)
+
+set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml)
 
 if(QUICK_COMPILER)
     if (${QT_VERSION_MAJOR} STREQUAL "6")
@@ -357,10 +358,6 @@ set( final_src
     ${3rdparty_MOC}
 )
 
-if(Qt5Keychain_FOUND)
-    list(APPEND libsync_LINK_TARGETS qt5keychain)
-endif()
-
 # add executable icon on windows and osx
 include(GenerateIconsUtils)
 
@@ -519,7 +516,6 @@ target_link_libraries(nextcloudCore
   Qt::Qml
   Qt::Quick
   Qt::QuickControls2
-  KF5::Archive
   )
 
 add_subdirectory(socketapi)
@@ -534,6 +530,71 @@ set_target_properties(nextcloudCore
   AUTOMOC ON
 )
 
+qt_add_library(desktopclientQmlStyle STATIC)
+set_target_properties(desktopclientQmlStyle
+  PROPERTIES
+  AUTOUIC ON
+  AUTOMOC ON
+)
+target_link_libraries(nextcloudCore PUBLIC desktopclientQmlStyle)
+qt_add_qml_module(desktopclientQmlStyle
+    URI Style
+    OUTPUT_DIRECTORY Style
+    VERSION 1.0
+    QML_FILES
+    ../../theme/Style/Style.qml
+)
+
+qt_add_library(desktopclientQml STATIC)
+set_target_properties(desktopclientQml
+  PROPERTIES
+  AUTOUIC ON
+  AUTOMOC ON
+)
+target_link_libraries(nextcloudCore PUBLIC desktopclientQml)
+qt_add_qml_module(desktopclientQml
+    URI com.nextcloud.desktopclient
+    OUTPUT_DIRECTORY com/nextcloud/desktopclient
+    VERSION 1.0
+    QML_FILES
+    UserStatusSelector.qml
+    UserStatusSelectorPage.qml
+    EmojiPicker.qml
+    UserStatusSelectorButton.qml
+    PredefinedStatusButton.qml
+    BasicComboBox.qml
+    ErrorBox.qml
+    tray/Window.qml
+    tray/UserLine.qml
+    tray/HeaderButton.qml
+    tray/SyncStatus.qml
+    tray/ActivityActionButton.qml
+    tray/ActivityItem.qml
+    tray/AutoSizingMenu.qml
+    tray/ActivityList.qml
+    tray/FileActivityDialog.qml
+    tray/UnifiedSearchInputContainer.qml
+    tray/UnifiedSearchResultFetchMoreTrigger.qml
+    tray/UnifiedSearchResultItem.qml
+    tray/UnifiedSearchResultItemSkeleton.qml
+    tray/UnifiedSearchResultItemSkeletonContainer.qml
+    tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml
+    tray/UnifiedSearchResultListItem.qml
+    tray/UnifiedSearchResultNothingFound.qml
+    tray/UnifiedSearchResultSectionItem.qml
+    tray/CustomButton.qml
+    tray/NCButtonContents.qml
+    tray/NCButtonBackground.qml
+    tray/TextButtonContents.qml
+    tray/ActivityItemContextMenu.qml
+    tray/ActivityItemActions.qml
+    tray/ActivityItemContent.qml
+    tray/TalkReplyTextField.qml
+    tray/CallNotificationDialog.qml
+    tray/NCBusyIndicator.qml
+    tray/NCToolTip.qml
+)
+
 target_include_directories(nextcloudCore
   PUBLIC
   ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator

src/gui/PredefinedStatusButton.qml

@@ -13,7 +13,6 @@
  */
 
 import QtQuick 2.15
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 

src/gui/UserStatusSelector.qml

@@ -12,8 +12,8 @@
  * for more details.
  */
 
-import QtQuick 2.6
-import QtQuick.Dialogs 1.3
+import QtQml
+import QtQuick
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 import QtQuick.Window 2.15

src/gui/UserStatusSelectorButton.qml

@@ -13,7 +13,6 @@
  */
 
 import QtQuick 2.6
-import QtQuick.Dialogs 1.3
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 

src/gui/accountsettings.cpp

@@ -197,7 +197,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
     addAction(syncNowAction);
 
     auto *syncNowWithRemoteDiscovery = new QAction(this);
-    syncNowWithRemoteDiscovery->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_F6));
+    syncNowWithRemoteDiscovery->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_F6));
     connect(syncNowWithRemoteDiscovery, &QAction::triggered, this, &AccountSettings::slotScheduleCurrentFolderForceRemoteDiscovery);
     addAction(syncNowWithRemoteDiscovery);
 

src/gui/application.cpp

@@ -203,7 +203,7 @@ Application::Application(int &argc, char **argv)
 {
     _startedAt.start();
 
-    QRandomGenerator::global()->seed(std::random_device()());
+//    QRandomGenerator::global()->seed(std::random_device()());
 
 #ifdef Q_OS_WIN
     // Ensure OpenSSL config file is only loaded from app directory
@@ -219,7 +219,7 @@ Application::Application(int &argc, char **argv)
     setOrganizationDomain(QLatin1String(APPLICATION_REV_DOMAIN));
 
     // setDesktopFilename to provide wayland compatibility (in general: conformance with naming standards)
-    // but only on Qt >= 5.7, where setDesktopFilename was introduced
+    // but only on Qt${QT_VERSION_MAJOR} >= 5.7, where setDesktopFilename was introduced
 #if (QT_VERSION >= 0x050700)
     QString desktopFileName = QString(QLatin1String(LINUX_APPLICATION_ID)
                                         + QLatin1String(".desktop"));
@@ -382,7 +382,7 @@ Application::Application(int &argc, char **argv)
     QTimer::singleShot(0, this, &Application::slotCheckConnection);
 
     // Can't use onlineStateChanged because it is always true on modern systems because of many interfaces
-    connect(&_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged,
+    connect(QNetworkInformation::instance(), &QNetworkInformation::reachabilityChanged,
         this, &Application::slotSystemOnlineConfigurationChanged);
 
 #if defined(BUILD_UPDATER)
@@ -468,9 +468,10 @@ void Application::slotCleanup()
 // FIXME: This is not ideal yet since a ConnectionValidator might already be running and is in
 // progress of timing out in some seconds.
 // Maybe we need 2 validators, one triggered by timer, one by network configuration changes?
-void Application::slotSystemOnlineConfigurationChanged(QNetworkConfiguration cnf)
+void Application::slotSystemOnlineConfigurationChanged()
 {
-    if (cnf.state() & QNetworkConfiguration::Active) {
+    if (QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Site ||
+            QNetworkInformation::instance()->reachability() == QNetworkInformation::Reachability::Online) {
         const auto list = AccountManager::instance()->accounts();
         for (const auto &accountState : list) {
             accountState->systemOnlineConfigurationChanged();

src/gui/application.h

@@ -20,7 +20,7 @@
 #include <QQueue>
 #include <QTimer>
 #include <QElapsedTimer>
-#include <QNetworkConfigurationManager>
+#include <QNetworkInformation>
 
 #include "qtsingleapplication.h"
 
@@ -106,7 +106,7 @@ protected slots:
     void slotCleanup();
     void slotAccountStateAdded(AccountState *accountState);
     void slotAccountStateRemoved(AccountState *accountState);
-    void slotSystemOnlineConfigurationChanged(QNetworkConfiguration);
+    void slotSystemOnlineConfigurationChanged();
     void slotGuiIsShowingSettings();
 
 private:
@@ -144,7 +144,6 @@ protected slots:
 
     ClientProxy _proxy;
 
-    QNetworkConfigurationManager _networkConfigurationManager;
     QTimer _checkConnectionTimer;
 
 #if defined(WITH_CRASHREPORTER)

src/gui/folderstatusdelegate.cpp

@@ -321,7 +321,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         pBarOpt.minimum = 0;
         pBarOpt.maximum = 100;
         pBarOpt.progress = overallPercent;
-        pBarOpt.orientation = Qt::Horizontal;
+//        pBarOpt.orientation = Qt::Horizontal;
         pBarOpt.rect = QStyle::visualRect(option.direction, option.rect, pBRect);
         QApplication::style()->drawControl(QStyle::CE_ProgressBar, &pBarOpt, painter, option.widget);
 

src/gui/folderwizard.cpp

@@ -38,6 +38,7 @@
 #include <QEvent>
 #include <QCheckBox>
 #include <QMessageBox>
+#include <QStandardPaths>
 
 #include <cstdlib>