wip: modern QML backend

CMakeLists.txt

@@ -10,7 +10,7 @@ option(KTAILCTL_FLATPAK_BUILD "Build for Flatpak" OFF)
 set(QT_MAJOR_VERSION 6)
 set(QT6_MIN_VERSION 6.5.0)
 set(KF6_MIN_VERSION 6.5.0)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -76,8 +76,9 @@ find_package(
              WindowSystem)
 find_package(nlohmann_json REQUIRED)
 
-add_subdirectory(src)
-add_subdirectory(tests)
+# add_subdirectory(src)
+add_subdirectory(src_new)
+# add_subdirectory(tests)
 
 install(PROGRAMS org.fkoehler.KTailctl.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.fkoehler.KTailctl.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})

scripts/fedora-deps.sh

@@ -13,6 +13,10 @@ PACKAGES=(
     kf6-ki18n-devel
     kf6-kirigami2-devel
     kf6-knotifications-devel
+    kf6-kdbusaddons-devel
+    kf6-kwindowsystem-devel
+    kf6-breeze-icons-devel
+    json-devel
 )
 
-dnf install -y ${PACKAGES[@]}
+dnf install -y "${PACKAGES[@]}"

src/CMakeLists.txt

@@ -28,7 +28,9 @@ add_executable(
   taildrop_sender.cpp
   tailscale.cpp
   tray_icon.cpp
-  util.cpp)
+  util.cpp
+  property_list_model.hpp
+  peer.hpp)
 
 ecm_add_qml_module(ktailctl URI org.fkoehler.KTailctl GENERATE_PLUGIN_SOURCE)
 ecm_target_qml_sources(

src/main.cpp

@@ -20,6 +20,7 @@
 #include "app.hpp"
 #include "ktailctlconfig.h"
 #include "logging.hpp"
+#include "peer.hpp"
 #include "peer_model.hpp"
 #include "preferences.hpp"
 #include "speed_statistics.hpp"
@@ -96,6 +97,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     qmlRegisterType<SpeedStatistics>("org.fkoehler.KTailctl", 1, 0, "SpeedStatistics");
     qmlRegisterType<Statistics>("org.fkoehler.KTailctl", 1, 0, "Statistics");
     qmlRegisterType<KTailctlConfig>("org.fkoehler.KTailctl", 1, 0, "KTailctlConfig"); // TODO(fk): remove, now handled via CMake
+    qmlRegisterType<Peer>("org.fkoehler.KTailctl", 1, 0, "Peer");
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.rootContext()->setContextProperty(QStringLiteral("styleName"), QQuickStyle::name());

src_new/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_executable(new_ktailctl peer.hpp property_list_model.hpp main.cpp
+        util.hpp
+        tailscale/status/login_profile.hpp
+        tailscale/status/network_profile.hpp)
+target_link_libraries(new_ktailctl PRIVATE Qt6::Core Qt6::Quick Qt6::Widgets KF6::CoreAddons KF6::I18n KF6::DBusAddons KF6::GuiAddons)
+ecm_add_qml_module(new_ktailctl URI org.fkoehler.KTailctl GENERATE_PLUGIN_SOURCE)
+ecm_target_qml_sources(new_ktailctl SOURCES ui/Main.qml)
+install(TARGETS new_ktailctl ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+add_subdirectory(tailscale)
+add_subdirectory(ui)
+add_subdirectory(icons)

src_new/icons/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(new_ktailctl PRIVATE icons.qrc)

src_new/icons/icons.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file alias="logo.svg">./logo.svg</file>
+    </qresource>
+</RCC>

src_new/main.cpp

@@ -0,0 +1,80 @@
+#include "util.hpp"
+
+#include <KAboutData>
+#include <KDBusService>
+#include <KLocalizedContext>
+#include <KLocalizedString>
+#include <QApplication>
+#include <QIcon>
+#include <QtQml>
+
+#include "tailscale/status/client_version.hpp"
+#include "tailscale/status/exit_node_status.hpp"
+#include "tailscale/status/peer_status.hpp"
+#include "tailscale/status/status.hpp"
+#include "tailscale/status/tailnet_status.hpp"
+#include "tailscale/tailscale.hpp"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QApplication::setWindowIcon(QIcon(QStringLiteral(":/icons/logo.svg")));
+
+    KLocalizedString::setApplicationDomain(QByteArrayLiteral("org.fkoehler.KTailctl"));
+    QCoreApplication::setOrganizationDomain(QStringLiteral("fkoehler.org"));
+    QCoreApplication::setApplicationName(QStringLiteral("KTailctl"));
+    QCoreApplication::setOrganizationName(QStringLiteral("fkoehler.org"));
+
+    KAboutData aboutData(QStringLiteral("ktailctl"),
+                         i18nc("@title", "KTailctl"),
+                         // TODO: version string via CMake
+                         QStringLiteral("1.0"),
+                         i18n("GUI for tailscale on the Linux desktop"),
+                         KAboutLicense::GPL,
+                         i18n("(c) Fabian Koehler 2023"));
+
+    aboutData.addAuthor(i18nc("@info:credit", "Fabian Koehler"),
+                        i18nc("@info:credit", "Project Maintainer"),
+                        QStringLiteral("[email protected]"),
+                        QStringLiteral("https://fkoehler.org"));
+
+    aboutData.setBugAddress("https://github.com/f-koehler/KTailctl/issues");
+    aboutData.setDesktopFileName(QStringLiteral("org.fkoehler.KTailctl"));
+    aboutData.setHomepage(QStringLiteral("https://github.com/f-koehler/KTailctl"));
+    aboutData.setOrganizationDomain("fkoehler.org");
+    aboutData.addAuthor(i18nc("@info:credit", "Fabian Köhler"),
+                        i18nc("@info:credit", "Project Maintainer"),
+                        QStringLiteral("[email protected]"),
+                        QStringLiteral("https://fkoehler.org"));
+    // TODO(fk): about icon
+    aboutData.setProgramLogo(QIcon(QStringLiteral(":/icons/logo.svg")));
+    KAboutData::setApplicationData(aboutData);
+    const KDBusService service(KDBusService::Unique);
+
+    QQmlApplicationEngine engine;
+    qmlRegisterType<ClientVersion>("org.fkoehler.KTailctl", 1, 0, "ClientVersion");
+    qmlRegisterType<ExitNodeStatus>("org.fkoehler.KTailctl", 1, 0, "ExitNodeStatus");
+    qmlRegisterType<Location>("org.fkoehler.KTailctl", 1, 0, "Location");
+    qmlRegisterType<PeerStatus>("org.fkoehler.KTailctl", 1, 0, "PeerStatus");
+    qmlRegisterType<Status>("org.fkoehler.KTailctl", 1, 0, "STatus");
+    qmlRegisterType<TailnetStatus>("org.fkoehler.KTailctl", 1, 0, "TailnetStatus");
+    qmlRegisterType<UserProfile>("org.fkoehler.KTailctl", 1, 0, "UserProfile");
+    qmlRegisterType<Status::PeerModel>("org.fkoehler.KTailctl", 1, 0, "PeerModel");
+
+    TailscaleNew *tailscale = new TailscaleNew();
+    Util* util = new Util();
+    qmlRegisterSingletonInstance("org.fkoehler.KTailctl", 1, 0, "Tailscale", tailscale);
+    qmlRegisterSingletonInstance("org.fkoehler.KTailctl", 1, 0, "Util", util);
+    qmlRegisterSingletonType("org.fkoehler.KTailctl", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(KAboutData::applicationData());
+    });
+
+    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+    engine.load(QStringLiteral("qrc:/Main.qml"));
+    if (engine.rootObjects().isEmpty()) {
+        return -1;
+    }
+
+    return app.exec();
+}