Add new tab actions.

Only actions the current tab supports are enabled.

diff --git a/localmylist-management/abstracttab.cpp b/localmylist-management/abstracttab.cpp
index cbda5eb6050801d7c87274c37c4725e6ee30896c..d55fed6091ad91b9658aa07545e2ca54cc8b5560 100644 (file)
--- a/localmylist-management/abstracttab.cpp
+++ b/localmylist-management/abstracttab.cpp
@@ -45,6 +45,11 @@ void AbstractTab::deactivate()
 {
 }
 
+AbstractTab::TabActions AbstractTab::availableActions() const
+{
+       return AbstractTab::TabActions{};
+}
+
 void AbstractTab::reload()
 {
 }
@@ -57,6 +62,22 @@ void AbstractTab::clearSelection()
 {
 }
 
+void AbstractTab::saveChanges()
+{
+}
+
+void AbstractTab::discardChanges()
+{
+}
+
+void AbstractTab::addEntry()
+{
+}
+
+void AbstractTab::removeSelected()
+{
+}
+
 void AbstractTab::loadSettings(QSettings *settings)
 {
        Q_UNUSED(settings);

diff --git a/localmylist-management/abstracttab.h b/localmylist-management/abstracttab.h
index 94a6eb88b2b72bcf922059b43e7186f2e0ea5709..066f27df1d21e718a3e6ad8e0f348c5393ec6c0e 100644 (file)
--- a/localmylist-management/abstracttab.h
+++ b/localmylist-management/abstracttab.h
@@ -12,6 +12,21 @@ class AbstractTab : public QWidget
        Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY nameChanged)
 
 public:
+
+       enum TabAction
+       {
+               Reload                  = 1 << 0,
+               SelectAll               = 1 << 1,
+               ClearSelection  = 1 << 2,
+               SaveChanges             = 1 << 3,
+               DiscardChanges  = 1 << 4,
+               AddEntry                = 1 << 5,
+               RemoveSelected  = 1 << 6,
+       };
+
+       Q_FLAGS(TabActions)
+       Q_DECLARE_FLAGS(TabActions, TabAction)
+
        explicit AbstractTab(QWidget *parent = 0);
        ~AbstractTab();
 
@@ -28,9 +43,14 @@ public:
        virtual void activate();
        virtual void deactivate();
 
+       virtual TabActions availableActions() const;
        virtual void reload();
        virtual void selectAll();
        virtual void clearSelection();
+       virtual void saveChanges();
+       virtual void discardChanges();
+       virtual void addEntry();
+       virtual void removeSelected();
 
        virtual void loadSettings(QSettings *settings);
        virtual void saveSettings(QSettings *settings);
@@ -47,6 +67,8 @@ protected:
        MainWindow *m_mainWindow;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractTab::TabActions)
+
 template<typename T> class AbstractTabBase : public AbstractTab
 {
 public:

diff --git a/localmylist-management/mainwindow.cpp b/localmylist-management/mainwindow.cpp
index f7f023e4e0b229dbe7a4d6cb539d1a3c384fd491..dc233d9500fcd2315c146c5ff3f64fc6f32aaff7 100644 (file)
--- a/localmylist-management/mainwindow.cpp
+++ b/localmylist-management/mainwindow.cpp
@@ -31,8 +31,6 @@
 #include "reporteditordialog.h"
 #include "versiondialog.h"
 
-#include "tabs/mylisttab.h"
-#include "tabs/reportstab.h"
 
 #include <QDebug>
 
@@ -82,6 +80,10 @@ MainWindow::MainWindow(QWidget *parent) :
        connect(ui->actionReload, SIGNAL(triggered()), ui->tabWidget, SLOT(reloadCurrentTab()));
        connect(ui->actionSelectAll, SIGNAL(triggered()), ui->tabWidget, SLOT(tabSelectAll()));
        connect(ui->actionClearSelection, SIGNAL(triggered()), ui->tabWidget, SLOT(tabClearSelection()));
+       connect(ui->actionSaveChanges, SIGNAL(triggered()), ui->tabWidget, SLOT(tabSaveChanges()));
+       connect(ui->actionDiscardChanges, SIGNAL(triggered()), ui->tabWidget, SLOT(tabDiscardChanges()));
+       connect(ui->actionAdd, SIGNAL(triggered()), ui->tabWidget, SLOT(tabAddEntry()));
+       connect(ui->actionRemoveSelected, SIGNAL(triggered()), ui->tabWidget, SLOT(tabRemoveSelected()));
        registerTabs();
 
        ui->tabWidget->setMainWindow(this);
@@ -94,6 +96,7 @@ MainWindow::~MainWindow()
        saveSettings();
        ui->tabWidget->saveSettings(MyList::instance()->defaultLocalQSettings());
        delete ui;
+       ui = nullptr;
 }
 
 MyListModel *MainWindow::myListModel() const
@@ -353,6 +356,19 @@ void MainWindow::showMessage(const QString &message)
        ui->statusBar->showMessage(message);
 }
 
+void MainWindow::updateTabActions(AbstractTab::TabActions actions)
+{
+       if (!ui) return;
+
+       ui->actionReload->setEnabled(actions.testFlag(AbstractTab::Reload));
+       ui->actionSelectAll->setEnabled(actions.testFlag(AbstractTab::SelectAll));
+       ui->actionClearSelection->setEnabled(actions.testFlag(AbstractTab::ClearSelection));
+       ui->actionSaveChanges->setEnabled(actions.testFlag(AbstractTab::SaveChanges));
+       ui->actionDiscardChanges->setEnabled(actions.testFlag(AbstractTab::DiscardChanges));
+       ui->actionAdd->setEnabled(actions.testFlag(AbstractTab::AddEntry));
+       ui->actionRemoveSelected->setEnabled(actions.testFlag(AbstractTab::RemoveSelected));
+}
+
 void MainWindow::on_actionConnection_triggered()
 {
        DatabaseConnectionDialog d;

diff --git a/localmylist-management/mainwindow.h b/localmylist-management/mainwindow.h
index 6e9cf46bf4e7f11742e11c8450848a547f51c785..089e25c55689a5708253f98161c3a22c6bb4e015 100644 (file)
--- a/localmylist-management/mainwindow.h
+++ b/localmylist-management/mainwindow.h
@@ -2,6 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include "abstracttab.h"
 
 namespace Ui {
        class MainWindow;
@@ -30,6 +31,8 @@ public:
 
        void showMessage(const QString &message);
 
+       void updateTabActions(AbstractTab::TabActions actions);
+
 private slots:
        void dbConnected();
        void dbDisconnected();
@@ -68,19 +71,12 @@ private slots:
        void on_actionClearFailedRequests_triggered();
 
        void on_actionCheckFileLocations_triggered();
-
        void on_actionRemoveKnownUnknownFiles_triggered();
-
        void on_actionRenameScript_triggered();
-
        void on_actionAddRelatedEpisodeInfo_triggered();
-
        void on_actionAboutLocalMyList_triggered();
-
        void on_actionConnection_triggered();
-
        void on_actionSettings_triggered();
-
        void on_actionQuit_triggered();
 
 protected:

diff --git a/localmylist-management/mainwindow.ui b/localmylist-management/mainwindow.ui
index b092b2e67e4fce44c9bddc5d966a775b26eab9f0..3351dd101f0e4445409d41eb35ce053b611a0cbe 100644 (file)
--- a/localmylist-management/mainwindow.ui
+++ b/localmylist-management/mainwindow.ui
@@ -119,8 +119,15 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionReload"/>
+   <addaction name="separator"/>
    <addaction name="actionSelectAll"/>
    <addaction name="actionClearSelection"/>
+   <addaction name="separator"/>
+   <addaction name="actionSaveChanges"/>
+   <addaction name="actionDiscardChanges"/>
+   <addaction name="separator"/>
+   <addaction name="actionAdd"/>
+   <addaction name="actionRemoveSelected"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionConnect">
@@ -290,6 +297,44 @@
     <string>Settings...</string>
    </property>
   </action>
+  <action name="actionSaveChanges">
+   <property name="text">
+    <string>Save Changes</string>
+   </property>
+   <property name="toolTip">
+    <string>Save changes made in the current tab</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionDiscardChanges">
+   <property name="text">
+    <string>Discard Changes</string>
+   </property>
+   <property name="toolTip">
+    <string>Discard Changes made in the current tab</string>
+   </property>
+  </action>
+  <action name="actionAdd">
+   <property name="text">
+    <string>Add</string>
+   </property>
+   <property name="toolTip">
+    <string>Add a new entry for the current tab</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="actionRemoveSelected">
+   <property name="text">
+    <string>Remove Selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected entries for the current tab</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

diff --git a/localmylist-management/tabs/databaselogtab.cpp b/localmylist-management/tabs/databaselogtab.cpp
index 34168a609a78693755ba6d3681f64602a9d73363..d0d2516e067cc9e5e39c150f57857087d837b060 100644 (file)
--- a/localmylist-management/tabs/databaselogtab.cpp
+++ b/localmylist-management/tabs/databaselogtab.cpp
@@ -41,6 +41,11 @@ void DatabaseLogTab::activate()
        reload();
 }
 
+AbstractTab::TabActions DatabaseLogTab::availableActions() const
+{
+       return Reload;
+}
+
 void DatabaseLogTab::reload()
 {
        QSqlQuery &q = LocalMyList::instance()->database()->prepare(

diff --git a/localmylist-management/tabs/databaselogtab.h b/localmylist-management/tabs/databaselogtab.h
index 44342838ceffb7730a748b0fd3729df2d88cab09..1c123401b70ba80043f868c6489fb278a46a125b 100644 (file)
--- a/localmylist-management/tabs/databaselogtab.h
+++ b/localmylist-management/tabs/databaselogtab.h
@@ -20,10 +20,11 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
+       void activate() override;
 
-       void reload();
+       TabActions availableActions() const override;
+       void reload() override;
 
 private:
        Ui::DatabaseLogTab *ui;

diff --git a/localmylist-management/tabs/dynamicmodeltab.cpp b/localmylist-management/tabs/dynamicmodeltab.cpp
index 1c8579103acda525488582e62313f579aae7deed..80ffd2aea1fcb1957fe9ef0c841bcbafd7902d5e 100644 (file)
--- a/localmylist-management/tabs/dynamicmodeltab.cpp
+++ b/localmylist-management/tabs/dynamicmodeltab.cpp
@@ -109,6 +109,11 @@ void DynamicModelTab::activate()
        ui->filterInput->setFocus();
 }
 
+AbstractTab::TabActions DynamicModelTab::availableActions() const
+{
+       return Reload;
+}
+
 void DynamicModelTab::reload()
 {
        model->reload();

diff --git a/localmylist-management/tabs/dynamicmodeltab.h b/localmylist-management/tabs/dynamicmodeltab.h
index 5297758c3462185d5eece9717bf08980f80c9de4..f19c715ea5febceaa63223a54feb945b320c7545 100644 (file)
--- a/localmylist-management/tabs/dynamicmodeltab.h
+++ b/localmylist-management/tabs/dynamicmodeltab.h
@@ -28,16 +28,17 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
+       void activate() override;
 
-       void reload();
+       TabActions availableActions() const override;
+       void reload() override;
 
-       void loadSettings(QSettings *settings);
-       void saveSettings(QSettings *settings);
+       void loadSettings(QSettings *settings) override;
+       void saveSettings(QSettings *settings) override;
 
 protected:
-       void changeEvent(QEvent *e);
+       void changeEvent(QEvent *e) override;
 
 private slots:
        void on_myListView_openFileRequested(const QModelIndex &index);

diff --git a/localmylist-management/tabs/mylisttab.cpp b/localmylist-management/tabs/mylisttab.cpp
index 375e1aadb757edba96f8e212e01f9df970e39d35..ec14e31fa33b8b712f0358218d277f9a8d022fe0 100644 (file)
--- a/localmylist-management/tabs/mylisttab.cpp
+++ b/localmylist-management/tabs/mylisttab.cpp
@@ -72,6 +72,11 @@ void MyListTab::activate()
        ui->filterInput->setFocus();
 }
 
+AbstractTab::TabActions MyListTab::availableActions() const
+{
+       return Reload;
+}
+
 void MyListTab::reload()
 {
        myListModel()->reload();

diff --git a/localmylist-management/tabs/mylisttab.h b/localmylist-management/tabs/mylisttab.h
index b50a47162d9903476b72133379ef27071fca2ee0..de58d30a2f5e9efbb31634db13944479114cc1d4 100644 (file)
--- a/localmylist-management/tabs/mylisttab.h
+++ b/localmylist-management/tabs/mylisttab.h
@@ -26,13 +26,14 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
+       void activate() override;
 
-       void reload();
+       TabActions availableActions() const override;
+       void reload() override;
 
-       void loadSettings(QSettings *settings);
-       void saveSettings(QSettings *settings);
+       void loadSettings(QSettings *settings) override;
+       void saveSettings(QSettings *settings) override;
 
 private slots:
        void on_myListView_openFileRequested(const QModelIndex &index);

diff --git a/localmylist-management/tabs/pathmappingtab.cpp b/localmylist-management/tabs/pathmappingtab.cpp
index b8f55fbd32673b9d2797f532fb9823821ffc9e85..243bbc1b3842aa57574907072e3d80a9dc86e606 100644 (file)
--- a/localmylist-management/tabs/pathmappingtab.cpp
+++ b/localmylist-management/tabs/pathmappingtab.cpp
@@ -58,8 +58,10 @@ void PathMappingTab::init()
        reload();
 }
 
-void PathMappingTab::activate()
+AbstractTab::TabActions PathMappingTab::availableActions() const
 {
+       return Reload | SelectAll | ClearSelection | SaveChanges | DiscardChanges
+                       | AddEntry | RemoveSelected;
 }
 
 void PathMappingTab::reload()
@@ -68,13 +70,13 @@ void PathMappingTab::reload()
        ui->pathMappingView->resizeColumnsToContents();
 }
 
-void PathMappingTab::on_addNewButton_clicked()
+void PathMappingTab::addEntry()
 {
        model->insertRecord(-1, QSqlRecord());
 }
 
 
-void PathMappingTab::on_saveButton_clicked()
+void PathMappingTab::saveChanges()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
        if(!model->isDirty())
@@ -88,12 +90,12 @@ void PathMappingTab::on_saveButton_clicked()
                                                  model->lastError().text());
 }
 
-void PathMappingTab::on_discardButton_clicked()
+void PathMappingTab::discardChanges()
 {
        model->revertAll();
 }
 
-void PathMappingTab::on_removeSelectedButton_clicked()
+void PathMappingTab::removeSelected()
 {
        using namespace LocalMyList;
 

diff --git a/localmylist-management/tabs/pathmappingtab.h b/localmylist-management/tabs/pathmappingtab.h
index 957c4e6a548254b821cce448402ab30c697b869c..844b89aab68a1de8c77ab770f9e1807f5bc08988 100644 (file)
--- a/localmylist-management/tabs/pathmappingtab.h
+++ b/localmylist-management/tabs/pathmappingtab.h
@@ -20,19 +20,14 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
-
-       void reload();
-
-private slots:
-       void on_addNewButton_clicked();
-
-       void on_saveButton_clicked();
-
-       void on_discardButton_clicked();
-
-       void on_removeSelectedButton_clicked();
+       void init() override;
+
+       TabActions availableActions() const override;
+       void reload() override;
+       void addEntry() override;
+       void saveChanges() override;
+       void discardChanges() override;
+       void removeSelected() override;
 
 private:
        Ui::PathMappingTab *ui;

diff --git a/localmylist-management/tabs/pathmappingtab.ui b/localmylist-management/tabs/pathmappingtab.ui
index 80518b87da358104ae29970a98306cba4444a722..31046c60d8acb891a2a832ef59e166a03593d5c7 100644 (file)
--- a/localmylist-management/tabs/pathmappingtab.ui
+++ b/localmylist-management/tabs/pathmappingtab.ui
@@ -26,51 +26,6 @@
    <item>
     <widget class="QTableView" name="pathMappingView"/>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="saveButton">
-       <property name="text">
-        <string>Save Changes</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="discardButton">
-       <property name="text">
-        <string>Discard Changes</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addNewButton">
-       <property name="text">
-        <string>Add New</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeSelectedButton">
-       <property name="text">
-        <string>Remove Selected</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/localmylist-management/tabs/pendingrequesttab.cpp b/localmylist-management/tabs/pendingrequesttab.cpp
index d5c7f4c981af7a54093755fcf213b690d34f3c66..5f60917bd2922a81f1cbb81133b4e31832c66b0b 100644 (file)
--- a/localmylist-management/tabs/pendingrequesttab.cpp
+++ b/localmylist-management/tabs/pendingrequesttab.cpp
@@ -36,7 +36,6 @@ void PendingRequestTab::init()
        ui->view->setSelectionMode(QAbstractItemView::MultiSelection);
 
        connect(ui->retryButton, SIGNAL(clicked()), this, SLOT(resetFailCount()));
-       connect(ui->deleteButton, SIGNAL(clicked()), this, SLOT(deleteSelected()));
 }
 
 void PendingRequestTab::activate()
@@ -44,6 +43,11 @@ void PendingRequestTab::activate()
        reload();
 }
 
+AbstractTab::TabActions PendingRequestTab::availableActions() const
+{
+       return Reload | SelectAll | ClearSelection;
+}
+
 void PendingRequestTab::reload()
 {
        QSqlQuery &q = LocalMyList::instance()->database()->prepare(
@@ -68,25 +72,6 @@ void PendingRequestTab::clearSelection()
        ui->view->clearSelection();
 }
 
-void PendingRequestTab::deleteSelected()
-{
-       QList<LocalMyList::PendingRequest> requests = selectionToPendingRequestList();
-
-       if (!requests.count())
-               return;
-
-       {
-               LocalMyList::RaiiTransaction t(LocalMyList::instance()->database());
-               for (const LocalMyList::PendingRequest &request : requests)
-               {
-                       LocalMyList::instance()->database()->clearRequest(request);
-               }
-               t.commit();
-       }
-
-       reload();
-}
-
 void PendingRequestTab::resetFailCount()
 {
        QList<LocalMyList::PendingRequest> requests = selectionToPendingRequestList();

diff --git a/localmylist-management/tabs/pendingrequesttab.h b/localmylist-management/tabs/pendingrequesttab.h
index 0ac5603cb82419c82c2ef0c9a6398a0b48703b8f..f8f94eb7d4334712f4c118230638b4892f5cdb00 100644 (file)
--- a/localmylist-management/tabs/pendingrequesttab.h
+++ b/localmylist-management/tabs/pendingrequesttab.h
@@ -21,15 +21,15 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
+       void activate() override;
 
-       void reload();
-       void selectAll();
-       void clearSelection();
+       TabActions availableActions() const override;
+       void reload() override;
+       void selectAll() override;
+       void clearSelection() override;
 
 public slots:
-       void deleteSelected();
        void resetFailCount();
 
 private:

diff --git a/localmylist-management/tabs/pendingrequesttab.ui b/localmylist-management/tabs/pendingrequesttab.ui
index 22d8574a5f6d35d4f5282940608ab0977661fbbe..5e7b8bd029d66fc90c0052edeb58b7003a30726c 100644 (file)
--- a/localmylist-management/tabs/pendingrequesttab.ui
+++ b/localmylist-management/tabs/pendingrequesttab.ui
@@ -55,16 +55,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="deleteButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Delete</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>

diff --git a/localmylist-management/tabs/reportstab.cpp b/localmylist-management/tabs/reportstab.cpp
index f981b2671f07852a9316bc6ac40d274c9413264c..de76655a6b1d652ce1ca7d43af728b10c3c4f3ed 100644 (file)
--- a/localmylist-management/tabs/reportstab.cpp
+++ b/localmylist-management/tabs/reportstab.cpp
@@ -50,6 +50,11 @@ void ReportsTab::activate()
        reload();
 }
 
+AbstractTab::TabActions ReportsTab::availableActions() const
+{
+       return Reload;
+}
+
 void ReportsTab::reload()
 {
        ui->reports->clear();

diff --git a/localmylist-management/tabs/reportstab.h b/localmylist-management/tabs/reportstab.h
index 9fee45d29eef5db8f7cf8d0ce54c86e9ae4d3eeb..a5ea36053a53084d467a981408c8213eeeffe0db 100644 (file)
--- a/localmylist-management/tabs/reportstab.h
+++ b/localmylist-management/tabs/reportstab.h
@@ -20,10 +20,11 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
+       void activate() override;
 
-       void reload();
+       TabActions availableActions() const override;
+       void reload() override;
 
 private slots:
        void on_reports_currentIndexChanged(int index);

diff --git a/localmylist-management/tabs/searchtab.cpp b/localmylist-management/tabs/searchtab.cpp
index c894983dd4f3a841e78705766fcbada76e88d769..45d86958f4e2e472f14eb331ae83eb408e08403c 100644 (file)
--- a/localmylist-management/tabs/searchtab.cpp
+++ b/localmylist-management/tabs/searchtab.cpp
@@ -40,10 +40,6 @@ void SearchTab::init()
        ui->view->setModel(model);
 }
 
-void SearchTab::activate()
-{
-}
-
 void SearchTab::on_input_textChanged(const QString &text)
 {
        QString query;

diff --git a/localmylist-management/tabs/searchtab.h b/localmylist-management/tabs/searchtab.h
index 00cdbb8c3e983ad5b4db355a14ab7cfa7a651c19..e890b77ddf269bf7f398fc9498258fd617222106 100644 (file)
--- a/localmylist-management/tabs/searchtab.h
+++ b/localmylist-management/tabs/searchtab.h
@@ -20,8 +20,7 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
+       void init() override;
 
 private slots:
        void on_input_textChanged(const QString &text);

diff --git a/localmylist-management/tabs/unknownfilestab.cpp b/localmylist-management/tabs/unknownfilestab.cpp
index 63553b5e6b768ad946df876e12874db1dc8c1d74..5e56d4e88b283560fe194c527117c244b2285476 100644 (file)
--- a/localmylist-management/tabs/unknownfilestab.cpp
+++ b/localmylist-management/tabs/unknownfilestab.cpp
@@ -42,8 +42,6 @@ void UnknownFilesTab::init()
        model->setHeaderData(1, Qt::Horizontal, tr("Size"));
        model->setHeaderData(2, Qt::Horizontal, tr("Host"));
        model->setHeaderData(3, Qt::Horizontal, tr("Path"));
-
-       connect(ui->deleteButton, SIGNAL(clicked()), this, SLOT(deleteSelected()));
 }
 
 void UnknownFilesTab::activate()
@@ -51,6 +49,11 @@ void UnknownFilesTab::activate()
        reload();
 }
 
+AbstractTab::TabActions UnknownFilesTab::availableActions() const
+{
+       return Reload | SelectAll | ClearSelection | RemoveSelected;
+}
+
 void UnknownFilesTab::reload()
 {
        model->select();
@@ -68,7 +71,7 @@ void UnknownFilesTab::clearSelection()
        ui->unknownFilesView->clearSelection();
 }
 
-void UnknownFilesTab::deleteSelected()
+void UnknownFilesTab::removeSelected()
 {
        using namespace LocalMyList;
 

diff --git a/localmylist-management/tabs/unknownfilestab.h b/localmylist-management/tabs/unknownfilestab.h
index 7be63a7964624ddc66973076b197ab1bc8e8a7ae..b7f9901879d93c242162863412bb0314f579356d 100644 (file)
--- a/localmylist-management/tabs/unknownfilestab.h
+++ b/localmylist-management/tabs/unknownfilestab.h
@@ -19,15 +19,14 @@ public:
        static QString staticId();
        static QString name();
 
-       void init();
-       void activate();
-
-       void reload();
-       void selectAll();
-       void clearSelection();
-
-public slots:
-       void deleteSelected();
+       void init() override;
+       void activate() override;
+
+       TabActions availableActions() const override;
+       void reload() override;
+       void selectAll() override;
+       void clearSelection() override;
+       void removeSelected() override;
 
 private:
        Ui::UnknownFilesTab *ui;

diff --git a/localmylist-management/tabs/unknownfilestab.ui b/localmylist-management/tabs/unknownfilestab.ui
index b7513a7506ef0d49495b27d2db20413b94b2e33b..a9a291aa5a2985bad3833547677eeafee60dbd1f 100644 (file)
--- a/localmylist-management/tabs/unknownfilestab.ui
+++ b/localmylist-management/tabs/unknownfilestab.ui
@@ -26,30 +26,6 @@
    <item>
     <widget class="QTableView" name="unknownFilesView"/>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="deleteButton">
-       <property name="text">
-        <string>Delete Selected</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp
index a7443d31512275fe8709aea29c50ee3436500b36..cfc8a39eb4d4a6b7147917720f22842a1f1972bf 100644 (file)
--- a/localmylist-management/tabwidget.cpp
+++ b/localmylist-management/tabwidget.cpp
@@ -156,31 +156,50 @@ AbstractTab *TabWidget::tab(int index) const
 void TabWidget::reloadCurrentTab()
 {
        AbstractTab *t = tab(currentIndex());
-
-       if (!t)
-               return;
-
+       if (!t) return;
        t->reload();
 }
 
 void TabWidget::tabSelectAll()
 {
        AbstractTab *t = tab(currentIndex());
-
-       if (!t)
-               return;
-
+       if (!t) return;
        t->selectAll();
 }
 
 void TabWidget::tabClearSelection()
 {
        AbstractTab *t = tab(currentIndex());
+       if (!t) return;
+       t->clearSelection();
+}
 
-       if (!t)
-               return;
+void TabWidget::tabSaveChanges()
+{
+       AbstractTab *t = tab(currentIndex());
+       if (!t) return;
+       t->saveChanges();
+}
 
-       t->clearSelection();
+void TabWidget::tabDiscardChanges()
+{
+       AbstractTab *t = tab(currentIndex());
+       if (!t) return;
+       t->discardChanges();
+}
+
+void TabWidget::tabAddEntry()
+{
+       AbstractTab *t = tab(currentIndex());
+       if (!t) return;
+       t->addEntry();
+}
+
+void TabWidget::tabRemoveSelected()
+{
+       AbstractTab *t = tab(currentIndex());
+       if (!t) return;
+       t->removeSelected();
 }
 
 void TabWidget::tabNameChanged(const QString &newName)
@@ -203,7 +222,14 @@ void TabWidget::currentTabChanged(int newIndex)
        previousTab = tab(newIndex);
 
        if (previousTab)
+       {
+               mainWindow()->updateTabActions(previousTab->availableActions());
                previousTab->activate();
+       }
+       else
+       {
+               mainWindow()->updateTabActions(AbstractTab::TabActions{});
+       }
 }
 
 void TabWidget::addTabRequested(const QString &id)

diff --git a/localmylist-management/tabwidget.h b/localmylist-management/tabwidget.h
index 38a2e957a17d45ad845ba434f3ad915d0d2a8b45..84572680ec1eae7b30df4c474d0c136e52c7af03 100644 (file)
--- a/localmylist-management/tabwidget.h
+++ b/localmylist-management/tabwidget.h
@@ -48,6 +48,10 @@ public slots:
        void reloadCurrentTab();
        void tabSelectAll();
        void tabClearSelection();
+       void tabSaveChanges();
+       void tabDiscardChanges();
+       void tabAddEntry();
+       void tabRemoveSelected();
 
        void setMainWindow(MainWindow *mainWindow);
        void setLockLayout(bool locked);