feat: Blank template

Author: nlogozzo

org.nickvision.miniera.gnome/blueprints/main_window.blp

@@ -4,7 +4,7 @@ using Adw 1;
 menu mainMenu {
   item(_("Preferences"), "win.preferences")
   item(_("Keyboard Shortcuts"), "win.keyboardShortcuts")
-  item(_("About Application"), "win.about")
+  item(_("About Miniera"), "win.about")
 }
 
 Adw.ApplicationWindow root {
@@ -16,26 +16,6 @@ Adw.ApplicationWindow root {
     Adw.HeaderBar headerBar {
       title-widget: Adw.WindowTitle title {};
 
-      [start]
-      Gtk.Button btnOpenFolder {
-        tooltip-text: _("Open Folder (Ctrl+O)");
-        visible: false;
-        action-name: "win.openFolder";
-        
-        Adw.ButtonContent {
-          label: _("Open");
-          icon-name: "folder-open-symbolic";
-        }
-      }
-      
-      [start]
-      Gtk.Button btnCloseFolder {
-        icon-name: "window-close-symbolic";
-        tooltip-text: _("Close Folder (Ctrl+W)");
-        action-name: "win.closeFolder";
-        visible: false;
-      }
-      
       [end]
       Gtk.MenuButton {
         direction: none;
@@ -50,30 +30,6 @@ Adw.ApplicationWindow root {
       vexpand: true;
 
       Adw.ViewStack viewStack {
-        Adw.ViewStackPage {
-          name: "NoFolder";
-          child: Adw.StatusPage pageGreeting {
-            icon-name: "org.nickvision.miniera";
-            description: _("Open a folder (or drag one into the app) to get started");
-            child: Gtk.Button {
-              label: _("Open");
-              halign: center;
-              action-name: "win.openFolder";
-              styles ["pill", "suggested-action"]
-            };
-            
-            styles ["icon-dropshadow"]
-          };
-        }
-
-        Adw.ViewStackPage {
-          name: "Folder";
-          child: Adw.StatusPage pageFiles {
-            icon-name: "folder-documents-symbolic";
-
-            styles ["compact"]
-          };
-        }
       }
     };
   }

org.nickvision.miniera.gnome/include/views/mainwindow.h

@@ -35,12 +35,6 @@ namespace Nickvision::Miniera::GNOME::Views
          * @return True to prevent closing, else false 
          */
         bool onCloseRequested();
-        /**
-         * @brief Handles when a file is dropped on the window.
-         * @param value The GValue dropped on the window
-         * @return True if drop was accepted, else false
-         */
-        bool onDrop(const GValue* value);
         /**
          * @brief Handles when a notification is sent to the window.
          * @param args Nickvision::Notifications::NotificationSentEventArgs 
@@ -51,23 +45,10 @@ namespace Nickvision::Miniera::GNOME::Views
          * @param args Nickvision::Notifications::ShellNotificationSentEventArgs
          */
         void onShellNotificationSent(const Nickvision::Notifications::ShellNotificationSentEventArgs& args);
-        /**
-         * @brief Handles when the open folder is changed (including closed).
-         * @param args Nickvision::Events::EventArgs 
-         */
-        void onFolderChanged(const Nickvision::Events::EventArgs& args);
         /**
          * @brief Quits the application. 
          */
         void quit();
-        /**
-         * @brief Opens a folder. 
-         */
-        void openFolder();
-        /**
-         * @brief Closes the folder if one is open. 
-         */
-        void closeFolder();
         /**
          * @brief Opens the application's preferences dialog. 
          */

org.nickvision.miniera.gnome/resources/org.nickvision.application.gresource.xml renamed to org.nickvision.miniera.gnome/resources/org.nickvision.miniera.gresource.xml

@@ -41,25 +41,11 @@ namespace Nickvision::Miniera::GNOME::Views
         m_controller->notificationSent() += [&](const NotificationSentEventArgs& args) { GtkHelpers::dispatchToMainThread([this, args]() { onNotificationSent(args); }); };
         m_controller->shellNotificationSent() += [&](const ShellNotificationSentEventArgs& args) { onShellNotificationSent(args); };
         m_controller->folderChanged() += [&](const EventArgs& args) { onFolderChanged(args); };
-        //Drop Target
-        GtkDropTarget* dropTarget{ gtk_drop_target_new(G_TYPE_FILE, GDK_ACTION_COPY) };
-        g_signal_connect(dropTarget, "drop", G_CALLBACK(+[](GtkDropTarget*, const GValue* value, double, double, gpointer data) -> bool { return reinterpret_cast<MainWindow*>(data)->onDrop(value); }), this);
-        gtk_widget_add_controller(GTK_WIDGET(m_window), GTK_EVENT_CONTROLLER(dropTarget));
         //Quit Action
         GSimpleAction* actQuit{ g_simple_action_new("quit", nullptr) };
         g_signal_connect(actQuit, "activate", G_CALLBACK(+[](GSimpleAction*, GVariant*, gpointer data){ reinterpret_cast<MainWindow*>(data)->quit(); }), this);
         g_action_map_add_action(G_ACTION_MAP(m_window), G_ACTION(actQuit));
         GtkHelpers::setAccelForAction(m_app, "win.quit", "<Ctrl>Q");
-        //Open Folder Action
-        GSimpleAction* actOpenFolder{ g_simple_action_new("openFolder", nullptr) };
-        g_signal_connect(actOpenFolder, "activate", G_CALLBACK(+[](GSimpleAction*, GVariant*, gpointer data){ reinterpret_cast<MainWindow*>(data)->openFolder(); }), this);
-        g_action_map_add_action(G_ACTION_MAP(m_window), G_ACTION(actOpenFolder));
-        GtkHelpers::setAccelForAction(m_app, "win.openFolder", "<Ctrl>O");
-        //Close Folder Action
-        GSimpleAction* actCloseFolder{ g_simple_action_new("closeFolder", nullptr) };
-        g_signal_connect(actCloseFolder, "activate", G_CALLBACK(+[](GSimpleAction*, GVariant*, gpointer data){ reinterpret_cast<MainWindow*>(data)->closeFolder(); }), this);
-        g_action_map_add_action(G_ACTION_MAP(m_window), G_ACTION(actCloseFolder));
-        GtkHelpers::setAccelForAction(m_app, "win.closeFolder", "<Ctrl>W");
         //Preferences Action
         GSimpleAction* actPreferences{ g_simple_action_new("preferences", nullptr) };
         g_signal_connect(actPreferences, "activate", G_CALLBACK(+[](GSimpleAction*, GVariant*, gpointer data){ reinterpret_cast<MainWindow*>(data)->preferences(); }), this);
@@ -110,24 +96,9 @@ namespace Nickvision::Miniera::GNOME::Views
         return false;
     }
 
-    bool MainWindow::onDrop(const GValue* value)
-    {
-        if(G_VALUE_HOLDS(value, G_TYPE_FILE))
-        {
-            m_controller->openFolder(g_file_get_path(G_FILE(g_value_get_object(value))));
-            return true;
-        }
-        return false;
-    }
-
     void MainWindow::onNotificationSent(const NotificationSentEventArgs& args)
     {
         AdwToast* toast{ adw_toast_new(args.getMessage().c_str()) };
-        if(args.getAction() == "close")
-        {
-            adw_toast_set_button_label(toast, _("Close"));
-            g_signal_connect(toast, "button-clicked", G_CALLBACK(+[](AdwToast*, gpointer data){ reinterpret_cast<MainWindow*>(data)->closeFolder(); }), this);
-        }
         adw_toast_overlay_add_toast(m_builder.get<AdwToastOverlay>("toastOverlay"), toast);
     }
 
@@ -140,15 +111,6 @@ namespace Nickvision::Miniera::GNOME::Views
 #endif
     }
 
-    void MainWindow::onFolderChanged(const EventArgs& args)
-    {
-        adw_window_title_set_subtitle(m_builder.get<AdwWindowTitle>("title"), m_controller->isFolderOpened() ? m_controller->getFolderPath().c_str() : "");
-        gtk_widget_set_visible(m_builder.get<GtkWidget>("btnOpenFolder"), m_controller->isFolderOpened());
-        gtk_widget_set_visible(m_builder.get<GtkWidget>("btnCloseFolder"), m_controller->isFolderOpened());
-        adw_view_stack_set_visible_child_name(m_builder.get<AdwViewStack>("viewStack"), m_controller->isFolderOpened() ? "Folder" : "NoFolder");
-        adw_status_page_set_description(m_builder.get<AdwStatusPage>("pageFiles"), std::vformat(_n("There is {} file in the folder.", "There are {} files in the folder.", m_controller->getFiles().size()), std::make_format_args(CodeHelpers::unmove(m_controller->getFiles().size()))).c_str());
-    }
-
     void MainWindow::quit()
     {
         if(!onCloseRequested())
@@ -157,25 +119,6 @@ namespace Nickvision::Miniera::GNOME::Views
         }
     }
 
-    void MainWindow::openFolder()
-    {
-        GtkFileDialog* folderDialog{ gtk_file_dialog_new() };
-        gtk_file_dialog_set_title(folderDialog, _("Open Folder"));
-        gtk_file_dialog_select_folder(folderDialog, GTK_WINDOW(m_window), nullptr, GAsyncReadyCallback(+[](GObject* self, GAsyncResult* res, gpointer data)
-        {
-            GFile* folder{ gtk_file_dialog_select_folder_finish(GTK_FILE_DIALOG(self), res, nullptr) };
-            if(folder)
-            {
-                reinterpret_cast<MainWindow*>(data)->m_controller->openFolder(g_file_get_path(folder));
-            }
-        }), this);
-    }
-
-    void MainWindow::closeFolder()
-    {
-        m_controller->closeFolder();
-    }
-
     void MainWindow::preferences()
     {
         DialogPtr<PreferencesDialog> dialog{ m_controller->createPreferencesViewController(), GTK_WINDOW(m_window) };

org.nickvision.miniera.gnome/src/views/mainwindow.cpp

@@ -43,26 +43,8 @@ namespace Nickvision::Miniera::Qt::Views
          * @param event QCloseEvent
          */
         void closeEvent(QCloseEvent* event) override;
-        /**
-         * @brief Handles when a file is dragged into the window.
-         * @param event QDragEnterEvent
-         */
-        void dragEnterEvent(QDragEnterEvent* event) override;
-        /**
-         * @brief Handles when a file is dropped into the window.
-         * @param event QDropEvent
-         */
-        void dropEvent(QDropEvent* event) override;
 
     private Q_SLOTS:
-        /**
-         * @brief Prompts the user to open a folder.
-         */
-        void openFolder();
-        /**
-         * @brief Closes the folder if one is open.
-         */
-        void closeFolder();
         /**
          * @brief Opens the application's settings dialog.
          */
@@ -105,11 +87,6 @@ namespace Nickvision::Miniera::Qt::Views
          * @param args The ShellNotificationSentEventArgs
          */
         void onShellNotificationSent(const Notifications::ShellNotificationSentEventArgs& args);
-        /**
-         * @brief Handles when the folder is changed.
-         * @param args The EventArgs
-         */
-        void onFolderChanged(const Events::EventArgs& args);
         Ui::MainWindow* m_ui;
         std::shared_ptr<Shared::Controllers::MainWindowController> m_controller;
         oclero::qlementine::ThemeManager* m_themeManager;

org.nickvision.miniera.qt/include/views/mainwindow.h

@@ -39,14 +39,6 @@ namespace Ui
         void setupUi(Nickvision::Miniera::Qt::Views::MainWindow* parent) 
         {
             //Actions
-            actionOpenFolder = new QAction(parent);
-            actionOpenFolder->setText(_("Open Folder"));
-            actionOpenFolder->setIcon(QLEMENTINE_ICON(File_FolderOpen));
-            actionOpenFolder->setShortcut(Qt::CTRL | Qt::Key_O);
-            actionCloseFolder = new QAction(parent);
-            actionCloseFolder->setText(_("Close Folder"));
-            actionCloseFolder->setIcon(QLEMENTINE_ICON(File_Folder));
-            actionCloseFolder->setShortcut(Qt::CTRL | Qt::Key_W);
             actionExit = new QAction(parent);
             actionExit->setText(_("Exit"));
             actionExit->setIcon(QLEMENTINE_ICON(Action_Close));
@@ -77,9 +69,6 @@ namespace Ui
             //MenuBar
             QMenu* menuFile{ new QMenu(parent) };
             menuFile->setTitle(_("File"));
-            menuFile->addAction(actionOpenFolder);
-            menuFile->addAction(actionCloseFolder);
-            menuFile->addSeparator();
             menuFile->addAction(actionExit);
             QMenu* menuEdit{ new QMenu(parent) };
             menuEdit->setTitle(_("Edit"));
@@ -96,29 +85,9 @@ namespace Ui
             parent->menuBar()->addMenu(menuFile);
             parent->menuBar()->addMenu(menuEdit);
             parent->menuBar()->addMenu(menuHelp);
-            //ToolBar
-            QToolBar* toolBar{ new QToolBar(parent) };
-            toolBar->setAllowedAreas(::Qt::ToolBarArea::TopToolBarArea);
-            toolBar->setMovable(false);
-            toolBar->setFloatable(false);
-            toolBar->addAction(actionOpenFolder);
-            toolBar->addAction(actionCloseFolder);
-            parent->addToolBar(toolBar);
-            //Files View
-            listFiles = new QListWidget(parent);
-            listFiles->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
-            lblFiles = new QLabel(parent);
-            lblFiles->setAlignment(::Qt::AlignmentFlag::AlignCenter);
-            lblFiles->setText(_("No Folder Opened"));
             //Main Layout
             QWidget* centralWidget{ new QWidget(parent) };
-            QHBoxLayout* layoutMain{ new QHBoxLayout(parent) };
-            QScrollArea* scrollFiles{ new QScrollArea(parent) };
-            scrollFiles->setMaximumWidth(300);
-            scrollFiles->setWidgetResizable(true);
-            scrollFiles->setWidget(listFiles);
-            layoutMain->addWidget(scrollFiles);
-            layoutMain->addWidget(lblFiles);
+            QVBoxLayout* layoutMain{ new QVBoxLayout(parent) };
             centralWidget->setLayout(layoutMain);
             parent->setCentralWidget(centralWidget);
         }
@@ -133,8 +102,6 @@ namespace Ui
         QAction* actionDiscussions;
         QAction* actionAbout;
         Nickvision::Miniera::Qt::Controls::InfoBar* infoBar;
-        QListWidget* listFiles;
-        QLabel* lblFiles;
     };
 }
 
@@ -148,14 +115,12 @@ namespace Nickvision::Miniera::Qt::Views
     {
         //Window Settings
         bool stable{ m_controller->getAppInfo().getVersion().getVersionType() == VersionType::Stable };
-        setWindowTitle(stable ? _("Application") : _("Application (Preview)"));
+        setWindowTitle(stable ? _("Miniera") : _("Miniera (Preview)"));
         setWindowIcon(QIcon(":/icon.svg"));
         setAcceptDrops(true);
         //Load Ui
         m_ui->setupUi(this);
         //Signals
-        connect(m_ui->actionOpenFolder, &QAction::triggered, this, &MainWindow::openFolder);
-        connect(m_ui->actionCloseFolder, &QAction::triggered, this, &MainWindow::closeFolder);
         connect(m_ui->actionExit, &QAction::triggered, this, &MainWindow::close);
         connect(m_ui->actionSettings, &QAction::triggered, this, &MainWindow::settings);
         connect(m_ui->actionCheckForUpdates, &QAction::triggered, this, &MainWindow::checkForUpdates);
@@ -165,7 +130,6 @@ namespace Nickvision::Miniera::Qt::Views
         connect(m_ui->actionAbout, &QAction::triggered, this, &MainWindow::about);
         m_controller->notificationSent() += [&](const NotificationSentEventArgs& args) { QtHelpers::dispatchToMainThread([this, args]() { onNotificationSent(args); }); };
         m_controller->shellNotificationSent() += [&](const ShellNotificationSentEventArgs& args) { onShellNotificationSent(args); };
-        m_controller->folderChanged() += [&](const EventArgs& args) { onFolderChanged(args); };
     }
 
     MainWindow::~MainWindow()
@@ -200,33 +164,6 @@ namespace Nickvision::Miniera::Qt::Views
         event->accept();
     }
 
-    void MainWindow::dragEnterEvent(QDragEnterEvent* event)
-    {
-        if(event->mimeData()->hasUrls())
-        {
-            event->acceptProposedAction();
-        }
-    }
-
-    void MainWindow::dropEvent(QDropEvent* event)
-    {
-        if(event->mimeData()->hasUrls())
-        {
-            m_controller->openFolder(event->mimeData()->urls()[0].toLocalFile().toStdString());
-        }
-    }
-
-    void MainWindow::openFolder()
-    {
-        QString path{ QFileDialog::getExistingDirectory(this, _("Open Folder"), {}, QFileDialog::ShowDirsOnly) };
-        m_controller->openFolder(path.toStdString());
-    }
-
-    void MainWindow::closeFolder()
-    {
-        m_controller->closeFolder();
-    }
-
     void MainWindow::settings()
     {
         SettingsDialog dialog{ m_controller->createPreferencesViewController(), m_themeManager, this };
@@ -272,13 +209,8 @@ namespace Nickvision::Miniera::Qt::Views
     {
         QString actionText;
         std::function<void()> actionCallback;
-        if(args.getAction() == "close")
-        {
-            actionText = _("Close");
-            actionCallback = [this]() { closeFolder(); };
-        }
 #ifdef _WIN32
-        else if(args.getAction() == "update")
+        if(args.getAction() == "update")
         {
             actionText = _("Update");
             actionCallback = [this]() { windowsUpdate(); };
@@ -297,21 +229,4 @@ namespace Nickvision::Miniera::Qt::Views
         ShellNotification::send(args);
 #endif
     }
-
-    void MainWindow::onFolderChanged(const EventArgs& args)
-    {
-        if(m_controller->isFolderOpened())
-        {
-            m_ui->lblFiles->setText(QString::fromStdString(std::vformat(_n("There is {} file in the folder.", "There are {} files in the folder.", m_controller->getFiles().size()), std::make_format_args(CodeHelpers::unmove(m_controller->getFiles().size())))));
-            for(const std::filesystem::path& file : m_controller->getFiles())
-            {
-                m_ui->listFiles->addItem(QString::fromStdString(file.filename().string()));
-            }
-        }
-        else
-        {
-            m_ui->listFiles->clear();
-            m_ui->lblFiles->setText(_("No Folder Opened"));
-        }
-    }
 }