Qt Redesign (#103)

* feat: Add `InfoBar` Control

* feat: Add MenuBar to Qt

* feat: Update helpers + controller implementation

* fix: GNOME allowEllipse

* feat: Windows Update notification

* fix: Flathub GitHub Action

* fix: Flatpak Qt GitHub Action

* feat: New Qt `AboutDialog`

* feat: New Qt `SettingsDialog`

* feat: Remove logging

* feat: Qt Files Page

Author: nlogozzo

.github/workflows/flatpak.yml

@@ -15,15 +15,15 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47
       options: --privileged
     strategy:
       matrix:
         arch: [x86_64]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+      - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
         with:
           bundle: org.nickvision.application.gnome.flatpak
           manifest-path: flatpak/org.nickvision.application.gnome.json
@@ -35,15 +35,15 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
       options: --privileged
     strategy:
       matrix:
         arch: [x86_64]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+      - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
         with:
           bundle: org.nickvision.application.qt.flatpak
           manifest-path: flatpak/org.nickvision.application.qt.json

Application.doap

@@ -10,7 +10,7 @@
   <bug-database rdf:resource="https://github.com/NickvisionApps/Application/issues"/>
   <download-page rdf:resource="https://github.com/NickvisionApps/Application" /> <!-- replace with flathub link -->
   <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
-  <programming-language>C#</programming-language>
+  <programming-language>C++</programming-language>
 
   <maintainer>
     <foaf:Person>

README.md

@@ -22,6 +22,8 @@ Ensure both `vcpkg` and `cmake` are installed on your system before building.
 
 A C++20 compiler is also required to build Application.
 
+**If building the GNOME version, `blueprint-compiler` must be installed from your system package manager as it is not available on `vcpkg`.**
+
 ### Configuring vcpkg
 1. Set the `VCPKG_ROOT` environment variable to the path of your vcpkg installation's root directory.
 #### Windows

flatpak/org.nickvision.application.gnome.json

@@ -74,7 +74,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "tag": "v0.14.0"
+                    "tag": "v0.16.0"
                 }
             ]
         },

libapplication/include/controllers/mainwindowcontroller.h

@@ -13,7 +13,6 @@
 #include <libnick/app/datafilemanager.h>
 #include <libnick/app/windowgeometry.h>
 #include <libnick/events/event.h>
-#include <libnick/logging/logger.h>
 #include <libnick/notifications/notificationsenteventargs.h>
 #include <libnick/notifications/shellnotificationsenteventargs.h>
 #include <libnick/taskbar/taskbaritem.h>
@@ -105,13 +104,6 @@ namespace Nickvision::Application::Shared::Controllers
          */
         void windowsUpdate();
 #endif
-        /**
-         * @brief Logs a system message.
-         * @param level The severity level of the message
-         * @param message The message to log
-         * @param source The source location of the log message
-         */
-        void log(Logging::LogLevel level, const std::string& message, const std::source_location& source = std::source_location::current());
         /**
          * @brief Gets the string for greeting on the home page.
          * @return The greeting string
@@ -149,17 +141,10 @@ namespace Nickvision::Application::Shared::Controllers
         void closeFolder();
 
     private:
-        /**
-         * @brief Obtains the paths of files in an open folder for the files list.
-         * @brief This method only scans the top-level directory for files.
-         * @brief Other sub-directory paths are not added to the files list.
-         */
-        void loadFiles();
         bool m_started;
         std::vector<std::string> m_args;
         Nickvision::App::AppInfo m_appInfo;
         Nickvision::App::DataFileManager m_dataFileManager;
-        Nickvision::Logging::Logger m_logger;
         std::shared_ptr<Nickvision::Update::Updater> m_updater;
         Nickvision::Taskbar::TaskbarItem m_taskbar;
         Nickvision::Events::Event<Nickvision::Notifications::NotificationSentEventArgs> m_notificationSent;

libapplication/src/controllers/mainwindowcontroller.cpp

@@ -28,8 +28,7 @@ namespace Nickvision::Application::Shared::Controllers
         : m_started{ false },
         m_args{ args },
         m_appInfo{ "org.nickvision.application", "Nickvision Application", "Application" },
-        m_dataFileManager{ m_appInfo.getName() },
-        m_logger{ UserDirectories::get(ApplicationUserDirectory::LocalData, m_appInfo.getName()) / "log.txt", Logging::LogLevel::Info, false }
+        m_dataFileManager{ m_appInfo.getName() }
     {
         m_appInfo.setVersion({ "2025.1.0-next" });
         m_appInfo.setShortName(_("Application"));
@@ -50,10 +49,6 @@ namespace Nickvision::Application::Shared::Controllers
 #ifdef _WIN32
         m_updater = std::make_shared<Updater>(m_appInfo.getSourceRepo());
 #endif
-        m_dataFileManager.get<Configuration>("config").saved() += [this](const EventArgs&)
-        {
-            m_logger.log(Logging::LogLevel::Info, "Configuration saved.");
-        };
     }
 
     Event<EventArgs>& MainWindowController::configurationSaved()
@@ -122,27 +117,13 @@ namespace Nickvision::Application::Shared::Controllers
         info.setWindowGeometry(m_dataFileManager.get<Configuration>("config").getWindowGeometry());
         //Load taskbar item
 #ifdef _WIN32
-        if(m_taskbar.connect(hwnd))
-        {
-            m_logger.log(Logging::LogLevel::Info, "Connected to Windows taskbar.");
-        }
-        else
-        {
-            m_logger.log(Logging::LogLevel::Error, "Unable to connect to Windows taskbar.");
-        }
+        m_taskbar.connect(hwnd);
         if (m_dataFileManager.get<Configuration>("config").getAutomaticallyCheckForUpdates())
         {
             checkForUpdates();
         }
 #elif defined(__linux__)
-        if(m_taskbar.connect(desktopFile))
-        {
-            m_logger.log(Logging::LogLevel::Info, "Connected to Linux taskbar.");
-        }
-        else
-        {
-            m_logger.log(Logging::LogLevel::Error, "Unable to connect to Linux taskbar.");
-        }
+        m_taskbar.connect(desktopFile);
 #endif
         m_started = true;
         return info;
@@ -161,25 +142,15 @@ namespace Nickvision::Application::Shared::Controllers
         {
             return;
         }
-        m_logger.log(Logging::LogLevel::Info, "Checking for updates...");
         std::thread worker{ [this]()
         {
             Version latest{ m_updater->fetchCurrentVersion(VersionType::Stable) };
-            if (!latest.empty())
+            if(!latest.empty())
             {
-                if (latest > m_appInfo.getVersion())
+                if(latest > m_appInfo.getVersion())
                 {
-                    m_logger.log(Logging::LogLevel::Info, "Update found: " + latest.str());
                     m_notificationSent.invoke({ _("New update available"), NotificationSeverity::Success, "update" });
                 }
-                else
-                {
-                    m_logger.log(Logging::LogLevel::Info, "No updates found.");
-                }
-            }
-            else
-            {
-                m_logger.log(Logging::LogLevel::Warning, "Unable to fetch latest app version.");
             }
         } };
         worker.detach();
@@ -192,28 +163,18 @@ namespace Nickvision::Application::Shared::Controllers
         {
             return;
         }
-        m_logger.log(Logging::LogLevel::Info, "Fetching Windows app update...");
+        m_notificationSent.invoke({ _("The update is downloading in the background and will start once it finishes"), NotificationSeverity::Informational });
         std::thread worker{ [this]()
         {
-            if (m_updater->windowsUpdate(VersionType::Stable))
-            {
-                m_logger.log(Logging::LogLevel::Info, "Windows app update started.");
-            }
-            else
+            if(!m_updater->windowsUpdate(VersionType::Stable))
             {
-                m_logger.log(Logging::LogLevel::Error, "Unable to fetch Windows app update.");
                 m_notificationSent.invoke({ _("Unable to download and install update"), NotificationSeverity::Error });
             }
         } };
         worker.detach();
     }
 #endif
 
-    void MainWindowController::log(Logging::LogLevel level, const std::string& message, const std::source_location& source)
-    {
-        m_logger.log(level, message, source);
-    }
-
     std::string MainWindowController::getGreeting() const
     {
         std::time_t now{ std::time(nullptr) };
@@ -259,32 +220,12 @@ namespace Nickvision::Application::Shared::Controllers
 
     bool MainWindowController::openFolder(const std::filesystem::path& path)
     {
-        if (std::filesystem::exists(path) && std::filesystem::is_directory(path))
+        m_folderPath = path;
+        if (!isFolderOpened())
         {
-            m_folderPath = path;
-            loadFiles();
-            m_notificationSent.invoke({ std::vformat(_("Folder Opened: {}"), std::make_format_args(CodeHelpers::unmove(m_folderPath.string()))), NotificationSeverity::Success, "close" });
-            m_folderChanged.invoke({});
-            m_taskbar.setCount(static_cast<long>(m_files.size()));
-            m_taskbar.setCountVisible(true);
-            m_logger.log(Logging::LogLevel::Info, "Folder opened. (" + m_folderPath.string() + ")");
-            return true;
+            return false;
         }
-        return false;
-    }
-
-    void MainWindowController::closeFolder()
-    {
-        m_logger.log(Logging::LogLevel::Info, "Folder closed. (" + m_folderPath.string() + ")");
-        m_folderPath = std::filesystem::path();
-        m_files.clear();
-        m_notificationSent.invoke({ _("Folder closed"), NotificationSeverity::Warning });
-        m_folderChanged.invoke({});
-        m_taskbar.setCountVisible(false);
-    }
-
-    void MainWindowController::loadFiles()
-    {
+        //Load Files
         m_files.clear();
         if (std::filesystem::exists(m_folderPath))
         {
@@ -296,6 +237,24 @@ namespace Nickvision::Application::Shared::Controllers
                 }
             }
         }
-        m_logger.log(Logging::LogLevel::Info, "Loaded " + std::to_string(m_files.size()) + " file(s). (" + m_folderPath.string() + ")");
+        //UI
+        m_notificationSent.invoke({ std::vformat(_("Folder Opened: {}"), std::make_format_args(CodeHelpers::unmove(m_folderPath.string()))), NotificationSeverity::Success, "close" });
+        m_folderChanged.invoke({});
+        m_taskbar.setCount(static_cast<long>(m_files.size()));
+        m_taskbar.setCountVisible(true);
+        return true;
+    }
+
+    void MainWindowController::closeFolder()
+    {
+        if(!isFolderOpened())
+        {
+            return;
+        }
+        m_folderPath = std::filesystem::path();
+        m_files.clear();
+        m_notificationSent.invoke({ _("Folder closed"), NotificationSeverity::Warning });
+        m_folderChanged.invoke({});
+        m_taskbar.setCountVisible(false);
     }
 }

org.nickvision.application.gnome/CMakeLists.txt

@@ -32,7 +32,7 @@ if(NOT WIN32)
     if(BLUEPRINT_COMPILER_EXECUTABLE)
         add_custom_command(TARGET gnome_commands PRE_BUILD COMMAND "${BLUEPRINT_COMPILER_EXECUTABLE}" batch-compile "${CMAKE_CURRENT_BINARY_DIR}/ui" "${CMAKE_CURRENT_SOURCE_DIR}/blueprints" "${CMAKE_CURRENT_SOURCE_DIR}/blueprints/*.blp")
     else()
-        message(ERROR "blueprint-compiler not found, UI will not be compiled")
+        message(FATAL_ERROR "blueprint-compiler not found, UI will not be compiled")
     endif()
 
     if(HAS_GETTEXT)
@@ -66,4 +66,4 @@ if(NOT WIN32)
     else()
         message(WARNING "update-desktop-database not found, desktop database will not be updated")
     endif()
-endif()
+endif()

org.nickvision.application.gnome/include/helpers/gtkhelpers.h

@@ -8,11 +8,26 @@
 
 namespace Nickvision::Application::GNOME::Helpers::GtkHelpers
 {
+    /**
+     * @brief Adds a widget to a GtkBox.
+     * @param box The box to add the widget to
+     * @param widget The widget to add
+     * @param addSeparator Whether or not to add a separator between the widgets
+     */
+    void addToBox(GtkBox* box, GtkWidget* widget, bool addSeparator = false);
     /**
      * @brief Runs the function on the main UI thread.
-     * @param function The function to run 
+     * @param function The function to run
      */
     void dispatchToMainThread(const std::function<void()>& function);
+    /**
+     * @brief Moves a widget from one box to another.
+     * @param oldBox The old box
+     * @param newBox The new box
+     * @param widget The widget to move
+     * @param addSeparator Whether or not to add a separator between the widgets
+     */
+    void moveFromBox(GtkBox* oldBox, GtkBox* newBox, GtkWidget* widget, bool addSeparator = false);
     /**
      * @brief Sets the accelerator for an action.
      * @param app The GtkApplication
@@ -24,8 +39,10 @@ namespace Nickvision::Application::GNOME::Helpers::GtkHelpers
      * @brief Sets the model for a combo row.
      * @param row The combo row
      * @param strs The strings to set
+     * @param selected An option string that should be selected
+     * @param allowEllipse Whether or not to allow ellipses in the combo row
      */
-    void setComboRowModel(AdwComboRow* row, const std::vector<std::string>& strs);
+    void setComboRowModel(AdwComboRow* row, const std::vector<std::string>& strs, const std::string& selected = "", bool allowEllipse = true);
 }
 
-#endif //GTKHELPERS_H
+#endif //GTKHELPERS_H

org.nickvision.application.gnome/src/application.cpp

@@ -20,7 +20,6 @@ namespace Nickvision::Application::GNOME
         GResource* resource{ g_resource_load(resources.string().c_str(), &resourceLoadError) };
         if(resourceLoadError)
         {
-            m_controller->log(Logging::LogLevel::Critical, "Unable to load GResource. " + std::string(resourceLoadError->message));
             throw std::runtime_error(resourceLoadError->message);
         }
         g_resources_register(resource);
@@ -35,7 +34,6 @@ namespace Nickvision::Application::GNOME
 
     void Application::onStartup(GtkApplication* app)
     {
-        m_controller->log(Logging::LogLevel::Info, "Started GTK application.");
         switch (m_controller->getTheme())
         {
         case Theme::Light:
@@ -58,4 +56,4 @@ namespace Nickvision::Application::GNOME
     {
         m_mainWindow->show();
     }
-}
+}