From 16d4e9f40159aaec12c0812cff5bb399a05a06e7 Mon Sep 17 00:00:00 2001 From: APTX Date: Sun, 2 Jun 2013 18:33:21 +0200 Subject: [PATCH] Move Select All/Clear Selection buttons to common actions toolbar. --- localmylist-management/abstracttab.cpp | 8 ++++++++ localmylist-management/abstracttab.h | 2 ++ .../localmylist-management.pro | 6 ++++-- localmylist-management/mainwindow.cpp | 2 ++ localmylist-management/mainwindow.ui | 15 ++++++++++++++ .../tabs/unknownfilestab.cpp | 12 +++++++++-- localmylist-management/tabs/unknownfilestab.h | 3 +++ .../tabs/unknownfilestab.ui | 14 ------------- localmylist-management/tabwidget.cpp | 20 +++++++++++++++++++ localmylist-management/tabwidget.h | 3 +++ 10 files changed, 67 insertions(+), 18 deletions(-) diff --git a/localmylist-management/abstracttab.cpp b/localmylist-management/abstracttab.cpp index 0f9f11c..cbda5eb 100644 --- a/localmylist-management/abstracttab.cpp +++ b/localmylist-management/abstracttab.cpp @@ -49,6 +49,14 @@ void AbstractTab::reload() { } +void AbstractTab::selectAll() +{ +} + +void AbstractTab::clearSelection() +{ +} + void AbstractTab::loadSettings(QSettings *settings) { Q_UNUSED(settings); diff --git a/localmylist-management/abstracttab.h b/localmylist-management/abstracttab.h index 989e886..94a6eb8 100644 --- a/localmylist-management/abstracttab.h +++ b/localmylist-management/abstracttab.h @@ -29,6 +29,8 @@ public: virtual void deactivate(); virtual void reload(); + virtual void selectAll(); + virtual void clearSelection(); virtual void loadSettings(QSettings *settings); virtual void saveSettings(QSettings *settings); diff --git a/localmylist-management/localmylist-management.pro b/localmylist-management/localmylist-management.pro index 3e0a512..78845bc 100644 --- a/localmylist-management/localmylist-management.pro +++ b/localmylist-management/localmylist-management.pro @@ -39,14 +39,16 @@ HEADERS += mainwindow.h \ tabs/mylisttab.h \ tabs/searchtab.h \ tabs/reportstab.h \ - tabs/unknownfilestab.h + tabs/unknownfilestab.h \ + tabs/pendingrequesttab.h FORMS += mainwindow.ui \ databaseconnectiondialog.ui \ tabs/mylisttab.ui \ tabs/searchtab.ui \ tabs/reportstab.ui \ - tabs/unknownfilestab.ui + tabs/unknownfilestab.ui \ + tabs/pendingrequesttab.ui include(../localmylist.pri) include(qtsingleapplication/qtsingleapplication.pri) diff --git a/localmylist-management/mainwindow.cpp b/localmylist-management/mainwindow.cpp index 294e0a5..eb6548d 100644 --- a/localmylist-management/mainwindow.cpp +++ b/localmylist-management/mainwindow.cpp @@ -78,6 +78,8 @@ 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())); registerTabs(); ui->tabWidget->setMainWindow(this); diff --git a/localmylist-management/mainwindow.ui b/localmylist-management/mainwindow.ui index df844d1..d39cd93 100644 --- a/localmylist-management/mainwindow.ui +++ b/localmylist-management/mainwindow.ui @@ -117,6 +117,8 @@ false + + @@ -268,6 +270,19 @@ F5 + + + Select All + + + Ctrl+A + + + + + Clear Selection + + diff --git a/localmylist-management/tabs/unknownfilestab.cpp b/localmylist-management/tabs/unknownfilestab.cpp index 5f7e641..6169533 100644 --- a/localmylist-management/tabs/unknownfilestab.cpp +++ b/localmylist-management/tabs/unknownfilestab.cpp @@ -44,8 +44,6 @@ void UnknownFilesTab::init() ui->unknownFilesView->setSelectionMode(QAbstractItemView::ContiguousSelection); - connect(ui->clearSelectionButton, SIGNAL(clicked()), ui->unknownFilesView, SLOT(clearSelection())); - connect(ui->selectAllButton, SIGNAL(clicked()), ui->unknownFilesView, SLOT(selectAll())); connect(ui->deleteButton, SIGNAL(clicked()), this, SLOT(deleteSelected())); } @@ -55,6 +53,16 @@ void UnknownFilesTab::activate() ui->unknownFilesView->setModel(model); } +void UnknownFilesTab::selectAll() +{ + ui->unknownFilesView->selectAll(); +} + +void UnknownFilesTab::clearSelection() +{ + ui->unknownFilesView->clearSelection(); +} + void UnknownFilesTab::deleteSelected() { using namespace LocalMyList; diff --git a/localmylist-management/tabs/unknownfilestab.h b/localmylist-management/tabs/unknownfilestab.h index 14d1cab..99f5b79 100644 --- a/localmylist-management/tabs/unknownfilestab.h +++ b/localmylist-management/tabs/unknownfilestab.h @@ -22,6 +22,9 @@ public: void init(); void activate(); + void selectAll(); + void clearSelection(); + public slots: void deleteSelected(); diff --git a/localmylist-management/tabs/unknownfilestab.ui b/localmylist-management/tabs/unknownfilestab.ui index 815f384..b7513a7 100644 --- a/localmylist-management/tabs/unknownfilestab.ui +++ b/localmylist-management/tabs/unknownfilestab.ui @@ -28,20 +28,6 @@ - - - - Select All - - - - - - - Clear Selection - - - diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp index 30ba9d1..a7443d3 100644 --- a/localmylist-management/tabwidget.cpp +++ b/localmylist-management/tabwidget.cpp @@ -163,6 +163,26 @@ void TabWidget::reloadCurrentTab() t->reload(); } +void TabWidget::tabSelectAll() +{ + AbstractTab *t = tab(currentIndex()); + + if (!t) + return; + + t->selectAll(); +} + +void TabWidget::tabClearSelection() +{ + AbstractTab *t = tab(currentIndex()); + + if (!t) + return; + + t->clearSelection(); +} + void TabWidget::tabNameChanged(const QString &newName) { AbstractTab *tab = qobject_cast(sender()); diff --git a/localmylist-management/tabwidget.h b/localmylist-management/tabwidget.h index f0b1aa2..38a2e95 100644 --- a/localmylist-management/tabwidget.h +++ b/localmylist-management/tabwidget.h @@ -46,6 +46,9 @@ public slots: AbstractTab *tab(int index) const; void reloadCurrentTab(); + void tabSelectAll(); + void tabClearSelection(); + void setMainWindow(MainWindow *mainWindow); void setLockLayout(bool locked); -- 2.52.0