From: APTX <marek321@gmail.com>
Date: Fri, 3 May 2013 14:44:02 +0000 (+0200)
Subject: Remove all reload buttons from tabs and replace them with a generic reload action.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=02e08de8548ad0892adc3674cc9f0f7119215713;p=localmylist.git

Remove all reload buttons from tabs and replace them with a generic reload action.
---

diff --git a/localmylist-management/abstracttab.cpp b/localmylist-management/abstracttab.cpp
index 3b7adf2..0f9f11c 100644
--- a/localmylist-management/abstracttab.cpp
+++ b/localmylist-management/abstracttab.cpp
@@ -45,6 +45,10 @@ void AbstractTab::deactivate()
 {
 }
 
+void AbstractTab::reload()
+{
+}
+
 void AbstractTab::loadSettings(QSettings *settings)
 {
 	Q_UNUSED(settings);
diff --git a/localmylist-management/abstracttab.h b/localmylist-management/abstracttab.h
index 051c9fd..989e886 100644
--- a/localmylist-management/abstracttab.h
+++ b/localmylist-management/abstracttab.h
@@ -28,6 +28,8 @@ public:
 	virtual void activate();
 	virtual void deactivate();
 
+	virtual void reload();
+
 	virtual void loadSettings(QSettings *settings);
 	virtual void saveSettings(QSettings *settings);
 
diff --git a/localmylist-management/mainwindow.cpp b/localmylist-management/mainwindow.cpp
index 7f42ec7..4c69901 100644
--- a/localmylist-management/mainwindow.cpp
+++ b/localmylist-management/mainwindow.cpp
@@ -77,6 +77,7 @@ MainWindow::MainWindow(QWidget *parent) :
 		ui->actionRenameFiles->setDisabled(true);
 	}
 
+	connect(ui->actionReload, SIGNAL(triggered()), ui->tabWidget, SLOT(reloadCurrentTab()));
 	registerTabs();
 
 	ui->tabWidget->setMainWindow(this);
diff --git a/localmylist-management/mainwindow.ui b/localmylist-management/mainwindow.ui
index a3d45b8..00b4df0 100644
--- a/localmylist-management/mainwindow.ui
+++ b/localmylist-management/mainwindow.ui
@@ -116,6 +116,7 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="actionReload"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionConnect">
@@ -259,6 +260,11 @@
     <string>Check File Locations</string>
    </property>
   </action>
+  <action name="actionReload">
+   <property name="text">
+    <string>Reload</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/localmylist-management/tabs/mylisttab.cpp b/localmylist-management/tabs/mylisttab.cpp
index c119de3..133a9f0 100644
--- a/localmylist-management/tabs/mylisttab.cpp
+++ b/localmylist-management/tabs/mylisttab.cpp
@@ -74,6 +74,12 @@ void MyListTab::activate()
 	ui->filterInput->setFocus();
 }
 
+void MyListTab::reload()
+{
+	myListModel()->reload();
+	selectedRow = -1;
+}
+
 void MyListTab::loadSettings(QSettings *settings)
 {
 	ui->filterType->setCurrentIndex(settings->value("filterType", 0).toInt());
@@ -84,12 +90,6 @@ void MyListTab::saveSettings(QSettings *settings)
 	settings->setValue("filterType", ui->filterType->currentIndex());
 }
 
-void MyListTab::on_refreshButton_clicked()
-{
-	myListModel()->reload();
-	selectedRow = -1;
-}
-
 void MyListTab::on_myListView_openFileRequested(const QModelIndex &index)
 {
 	MyListNode *node = myListFilterModel->node(index);
diff --git a/localmylist-management/tabs/mylisttab.h b/localmylist-management/tabs/mylisttab.h
index 9ff1538..f71394f 100644
--- a/localmylist-management/tabs/mylisttab.h
+++ b/localmylist-management/tabs/mylisttab.h
@@ -29,11 +29,12 @@ public:
 	void init();
 	void activate();
 
+	void reload();
+
 	void loadSettings(QSettings *settings);
 	void saveSettings(QSettings *settings);
 
 private slots:
-	void on_refreshButton_clicked();
 	void on_myListView_openFileRequested(const QModelIndex &index);
 	void on_myListView_renameFilesRequested(const QModelIndex &index);
 	void on_myListView_dataRequested(const QModelIndex &index);
diff --git a/localmylist-management/tabs/mylisttab.ui b/localmylist-management/tabs/mylisttab.ui
index 16b6144..1d9aa83 100644
--- a/localmylist-management/tabs/mylisttab.ui
+++ b/localmylist-management/tabs/mylisttab.ui
@@ -36,43 +36,19 @@
    <item>
     <widget class="MyListView" name="myListView"/>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="refreshButtonLayout">
-     <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="refreshButton">
-       <property name="text">
-        <string>Refresh</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>MyListView</class>
-   <extends>QTreeView</extends>
-   <header>mylistview.h</header>
-  </customwidget>
   <customwidget>
    <class>FilterLineEdit</class>
    <extends>QLineEdit</extends>
    <header>filterlineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>MyListView</class>
+   <extends>QTreeView</extends>
+   <header>mylistview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/localmylist-management/tabs/reportstab.cpp b/localmylist-management/tabs/reportstab.cpp
index 571a9b9..f981b26 100644
--- a/localmylist-management/tabs/reportstab.cpp
+++ b/localmylist-management/tabs/reportstab.cpp
@@ -47,10 +47,10 @@ void ReportsTab::activate()
 	if (ui->reports->count())
 		return;
 
-	on_reloadReports_clicked();
+	reload();
 }
 
-void ReportsTab::on_reloadReports_clicked()
+void ReportsTab::reload()
 {
 	ui->reports->clear();
 
diff --git a/localmylist-management/tabs/reportstab.h b/localmylist-management/tabs/reportstab.h
index 57a92be..9fee45d 100644
--- a/localmylist-management/tabs/reportstab.h
+++ b/localmylist-management/tabs/reportstab.h
@@ -23,8 +23,9 @@ public:
 	void init();
 	void activate();
 
+	void reload();
+
 private slots:
-	void on_reloadReports_clicked();
 	void on_reports_currentIndexChanged(int index);
 	void on_runReport_clicked();
 	void on_editReport_clicked();
diff --git a/localmylist-management/tabs/reportstab.ui b/localmylist-management/tabs/reportstab.ui
index 493ddb1..29f427c 100644
--- a/localmylist-management/tabs/reportstab.ui
+++ b/localmylist-management/tabs/reportstab.ui
@@ -83,13 +83,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="reloadReports">
-       <property name="text">
-        <string>Reload</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp
index b2eec8f..3d18025 100644
--- a/localmylist-management/tabwidget.cpp
+++ b/localmylist-management/tabwidget.cpp
@@ -151,6 +151,16 @@ AbstractTab *TabWidget::tab(int index) const
 	return qobject_cast<AbstractTab *>(QTabWidget::widget(index));
 }
 
+void TabWidget::reloadCurrentTab()
+{
+	AbstractTab *t = tab(currentIndex());
+
+	if (!t)
+		return;
+
+	t->reload();
+}
+
 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 6816e7e..f0b1aa2 100644
--- a/localmylist-management/tabwidget.h
+++ b/localmylist-management/tabwidget.h
@@ -45,6 +45,7 @@ public slots:
 
 	AbstractTab *tab(int index) const;
 
+	void reloadCurrentTab();
 	void setMainWindow(MainWindow *mainWindow);
 	void setLockLayout(bool locked);