V2022.1.1

- Added confirm message for removing all queued downloads
NickvisionApps · Jan 6, 2022 · 018c92f · 018c92f
1 parent 4c32a10
commit 018c92f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/UpdateConfig.json b/UpdateConfig.json
@@ -1 +1 @@
-{"LatestVersion":"2022.1.0","Changelog":"- Rewrote Tube Converter in C++ using gtkmm\n- Removed support for Windows OS. Only Linux is now supported","LinkToExe":"https://github.com/nlogozzo/NickvisionTubeConverter/releases/download/2022.1.0/NickvisionTubeConverter"}
+{"LatestVersion":"2022.1.1","Changelog":"- Added confirm message for removing all queued downloads","LinkToExe":"https://github.com/nlogozzo/NickvisionTubeConverter/releases/download/2022.1.1/NickvisionTubeConverter"}
diff --git a/controls/headerbar.cpp b/controls/headerbar.cpp
@@ -18,7 +18,21 @@ namespace NickvisionTubeConverter::Controls
         m_btnRemoveSelectedDownloadFromQueue.set_icon_name("list-remove");
         m_btnRemoveSelectedDownloadFromQueue.set_tooltip_text("Remove Selected Download From Queue");
         //Clear
+        m_boxRemoveAllQueuedDownloads.set_orientation(Gtk::Orientation::VERTICAL);
+        m_lblRemoveAllQueuedDownloads.set_label("Are you sure you want to remove all downloads from the queue?");
+        m_lblRemoveAllQueuedDownloads.set_margin(4);
+        m_btnConfirmRemoveAllQueuedDownloads.set_label("Remove");
+        m_btnCancelRemoveAllQueuedDownloads.set_label("Cancel");
+        m_btnCancelRemoveAllQueuedDownloads.signal_clicked().connect(sigc::mem_fun(m_popRemoveAllQueuedDownloads, &Gtk::Popover::popdown));
+        m_boxBtnsRemoveAllQueuedDownloads.set_homogeneous(true);
+        m_boxBtnsRemoveAllQueuedDownloads.set_spacing(6);
+        m_boxBtnsRemoveAllQueuedDownloads.append(m_btnConfirmRemoveAllQueuedDownloads);
+        m_boxBtnsRemoveAllQueuedDownloads.append(m_btnCancelRemoveAllQueuedDownloads);
+        m_boxRemoveAllQueuedDownloads.append(m_lblRemoveAllQueuedDownloads);
+        m_boxRemoveAllQueuedDownloads.append(m_boxBtnsRemoveAllQueuedDownloads);
+        m_popRemoveAllQueuedDownloads.set_child(m_boxRemoveAllQueuedDownloads);
         m_btnRemoveAllQueuedDownloads.set_icon_name("edit-delete");
+        m_btnRemoveAllQueuedDownloads.set_popover(m_popRemoveAllQueuedDownloads);
         m_btnRemoveAllQueuedDownloads.set_tooltip_text("Clear All Queued Downloads");
         //==Settings==//
         m_btnSettings.set_icon_name("settings");
@@ -78,7 +92,17 @@ namespace NickvisionTubeConverter::Controls
         return m_btnRemoveSelectedDownloadFromQueue;
     }
 
-    Gtk::Button& HeaderBar::getBtnRemoveAllQueuedDownloads()
+    Gtk::Popover& HeaderBar::getPopRemoveAllQueuedDownloads()
+    {
+        return m_popRemoveAllQueuedDownloads;
+    }
+
+    Gtk::Button& HeaderBar::getBtnConfirmRemoveAllQueuedDownloads()
+    {
+        return m_btnConfirmRemoveAllQueuedDownloads;
+    }
+
+    Gtk::MenuButton& HeaderBar::getBtnRemoveAllQueuedDownloads()
     {
         return m_btnRemoveAllQueuedDownloads;
     }

diff --git a/controls/headerbar.h b/controls/headerbar.h
@@ -14,7 +14,9 @@ namespace NickvisionTubeConverter::Controls
         Gtk::Button& getBtnDownloadVideos();
         Gtk::Button& getBtnAddDownloadToQueue();
         Gtk::Button& getBtnRemoveSelectedDownloadFromQueue();
-        Gtk::Button& getBtnRemoveAllQueuedDownloads();
+        Gtk::Popover& getPopRemoveAllQueuedDownloads();
+        Gtk::Button& getBtnConfirmRemoveAllQueuedDownloads();
+        Gtk::MenuButton& getBtnRemoveAllQueuedDownloads();
         Gtk::Button& getBtnSettings();
         const std::shared_ptr<Gio::SimpleAction>& getActionCheckForUpdates() const;
         const std::shared_ptr<Gio::SimpleAction>& getActionGitHubRepo() const;
@@ -27,10 +29,16 @@ namespace NickvisionTubeConverter::Controls
         Gtk::Button m_btnSelectSaveFolder;
         //==Download Videos==//
         Gtk::Button m_btnDownloadVideos;
-        //====//
+        //==Queue==//
         Gtk::Button m_btnAddDownloadToQueue;
         Gtk::Button m_btnRemoveSelectedDownloadFromQueue;
-        Gtk::Button m_btnRemoveAllQueuedDownloads;
+        Gtk::Popover m_popRemoveAllQueuedDownloads;
+        Gtk::Box m_boxRemoveAllQueuedDownloads;
+        Gtk::Label m_lblRemoveAllQueuedDownloads;
+        Gtk::Box m_boxBtnsRemoveAllQueuedDownloads;
+        Gtk::Button m_btnConfirmRemoveAllQueuedDownloads;
+        Gtk::Button m_btnCancelRemoveAllQueuedDownloads;
+        Gtk::MenuButton m_btnRemoveAllQueuedDownloads;
         //==Settings==//
         Gtk::Button m_btnSettings;
         //==Help==//

diff --git a/views/mainwindow.cpp b/views/mainwindow.cpp
@@ -13,7 +13,7 @@ namespace NickvisionTubeConverter::Views
     using namespace NickvisionTubeConverter::Models;
     using namespace NickvisionTubeConverter::Controls;
 
-    MainWindow::MainWindow() : m_opened(false), m_updater("https://raw.githubusercontent.com/nlogozzo/NickvisionTubeConverter/main/UpdateConfig.json", { "2022.1.0" })
+    MainWindow::MainWindow() : m_opened(false), m_updater("https://raw.githubusercontent.com/nlogozzo/NickvisionTubeConverter/main/UpdateConfig.json", { "2022.1.1" })
     {
         //==Settings==//
         set_default_size(800, 600);
@@ -25,7 +25,7 @@ namespace NickvisionTubeConverter::Views
         m_headerBar.getBtnDownloadVideos().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::downloadVideos));
         m_headerBar.getBtnAddDownloadToQueue().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::addDownloadToQueue));
         m_headerBar.getBtnRemoveSelectedDownloadFromQueue().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::removeSelectedDownloadFromQueue));
-        m_headerBar.getBtnRemoveAllQueuedDownloads().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::removeAllQueuedDownloads));
+        m_headerBar.getBtnConfirmRemoveAllQueuedDownloads().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::removeAllQueuedDownloads));
         m_headerBar.getBtnSettings().signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::settings));
         m_headerBar.getActionCheckForUpdates()->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::checkForUpdates));
         m_headerBar.getActionGitHubRepo()->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::gitHubRepo));
@@ -228,6 +228,7 @@ namespace NickvisionTubeConverter::Views
 
     void MainWindow::removeAllQueuedDownloads()
     {
+        m_headerBar.getPopRemoveAllQueuedDownloads().popdown();
         m_downloadManager.removeAllFromQueue();
         m_dataDownloadsModel->clear();
         m_headerBar.getBtnDownloadVideos().set_sensitive(false);
@@ -303,7 +304,7 @@ namespace NickvisionTubeConverter::Views
     void MainWindow::changelog(const Glib::VariantBase& args)
     {
         Gtk::MessageDialog* changelogDialog = new Gtk::MessageDialog(*this, "What's New?", false, Gtk::MessageType::INFO, Gtk::ButtonsType::OK, true);
-        changelogDialog->set_secondary_text("\n- Rewrote Tube Converter in C++ using gtkmm\n- Removed support for Windows OS. Only Linux is now supported");
+        changelogDialog->set_secondary_text("\n- Added confirm message for removing all queued downloads");
         changelogDialog->signal_response().connect(sigc::bind([](int response, Gtk::MessageDialog* dialog)
         {
            delete dialog;
@@ -318,7 +319,7 @@ namespace NickvisionTubeConverter::Views
         aboutDialog->set_modal(true);
         aboutDialog->set_hide_on_close(true);
         aboutDialog->set_program_name("Nickvision Tube Converter");
-        aboutDialog->set_version("2022.1.0");
+        aboutDialog->set_version("2022.1.1");
         aboutDialog->set_comments("An easy to use YouTube video downloader.");
         aboutDialog->set_copyright("(C) Nickvision 2021-2022");
         aboutDialog->set_license_type(Gtk::License::GPL_3_0);