Move Select All/Clear Selection buttons to common actions toolbar.

diff --git a/localmylist-management/abstracttab.cpp b/localmylist-management/abstracttab.cpp
index 0f9f11c0016f0d3055b2554eb2ffdb94d1455def..cbda5eb6050801d7c87274c37c4725e6ee30896c 100644 (file)
--- 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 989e88688eb2f5c5112df8161c0bcea432457822..94a6eb88b2b72bcf922059b43e7186f2e0ea5709 100644 (file)
--- 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 3e0a512ddf818fd97b55c35ee85cab951e1d08a9..78845bc6bab0183485ea3bc4cb17be471cddbd68 100644 (file)
--- 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 294e0a5662416ae1fd15b844f2e40aba51262921..eb6548d397cbea7708ba5d792f424a2807b6ee10 100644 (file)
--- 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 df844d13d688af127baa77f4175350041c5f32f3..d39cd939fee114541829427f63dd54e1327eb63d 100644 (file)
--- a/localmylist-management/mainwindow.ui
+++ b/localmylist-management/mainwindow.ui
@@ -117,6 +117,8 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionReload"/>
+   <addaction name="actionSelectAll"/>
+   <addaction name="actionClearSelection"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionConnect">
@@ -268,6 +270,19 @@
     <string>F5</string>
    </property>
   </action>
+  <action name="actionSelectAll">
+   <property name="text">
+    <string>Select All</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+A</string>
+   </property>
+  </action>
+  <action name="actionClearSelection">
+   <property name="text">
+    <string>Clear Selection</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

diff --git a/localmylist-management/tabs/unknownfilestab.cpp b/localmylist-management/tabs/unknownfilestab.cpp
index 5f7e6419b1bf87ddd84b7d4ce856ad44b9c32626..6169533ef8f4771015febc4dd2d761372a181c7b 100644 (file)
--- 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 14d1cab315070d0bf8e1b2fe18defe7f7c84398f..99f5b7990aee2d972192d11ad98c25a433a4355b 100644 (file)
--- 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 815f384ddc5a9f0e73f1bb82f39fb03a08d2e945..b7513a7506ef0d49495b27d2db20413b94b2e33b 100644 (file)
--- a/localmylist-management/tabs/unknownfilestab.ui
+++ b/localmylist-management/tabs/unknownfilestab.ui
@@ -28,20 +28,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="selectAllButton">
-       <property name="text">
-        <string>Select All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="clearSelectionButton">
-       <property name="text">
-        <string>Clear Selection</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">

diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp
index 30ba9d13212737f3b09f2bf4a252206a94a4e769..a7443d31512275fe8709aea29c50ee3436500b36 100644 (file)
--- 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<AbstractTab *>(sender());

diff --git a/localmylist-management/tabwidget.h b/localmylist-management/tabwidget.h
index f0b1aa226acdc16cf669e15371d479d2363611a1..38a2e957a17d45ad845ba434f3ad915d0d2a8b45 100644 (file)
--- 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);