Commented out incomplete download action

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 774b8271574d0e8467721bd67110d8033617a018..423241dd751024cbd4e0e53198c416bdde416f95 100755 (executable)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -109,6 +109,7 @@ void MainWindow::createActions() {
     actions->insert("compactView", compactViewAct);
     connect(compactViewAct, SIGNAL(toggled(bool)), this, SLOT(compactView(bool)));
 
+    /*
     // icon should be document-save but it is ugly
     downloadAct = new QAction(QtIconLoader::icon("go-down", QIcon(":/images/go-down.png")), tr("&Download"), this);
     downloadAct->setStatusTip(tr("Download this video"));
@@ -116,6 +117,7 @@ void MainWindow::createActions() {
     downloadAct->setEnabled(false);
     actions->insert("download", downloadAct);
     connect(downloadAct, SIGNAL(triggered()), this, SLOT(download()));
+    */
 
     webPageAct = new QAction(QtIconLoader::icon("internet-web-browser", QIcon(":/images/internet-web-browser.png")), tr("&YouTube"), this);
     webPageAct->setStatusTip(tr("Open the YouTube video page"));
@@ -227,10 +229,8 @@ void MainWindow::createMenus() {
 
     fileMenu = menuBar()->addMenu(tr("&Application"));
     // menus->insert("file", fileMenu);
-    /*
-    fileMenu->addAction(settingsAct);
+    // fileMenu->addAction(settingsAct);
     fileMenu->addSeparator();
-    */
     fileMenu->addAction(quitAct);
 
     playlistMenu = menuBar()->addMenu(tr("&Playlist"));
@@ -249,7 +249,7 @@ void MainWindow::createMenus() {
     viewMenu->addSeparator();
     viewMenu->addAction(webPageAct);
     viewMenu->addSeparator();
-    viewMenu->addAction(downloadAct);
+    // viewMenu->addAction(downloadAct);
     viewMenu->addAction(compactViewAct);
     viewMenu->addAction(fullscreenAct);
 
@@ -358,9 +358,12 @@ void MainWindow::showWidget ( QWidget* widget ) {
     compactViewAct->setEnabled(widget == mediaView);
     webPageAct->setEnabled(widget == mediaView);
     aboutAct->setEnabled(widget != aboutView);
+
+    /*
     // this is not the best place to enable downloads, but the user is informed
     // if there really is no video is playing
     downloadAct->setEnabled(widget == mediaView);
+    */
 
     // cool toolbar on the Mac
     // setUnifiedTitleAndToolBarOnMac(widget == mediaView);
@@ -595,7 +598,7 @@ void MainWindow::initPhonon() {
 
 void MainWindow::tick(qint64 time) {
     if (time <= 0) {
-        totalTime->clear();
+        currentTime->clear();
         return;
     }
     QTime displayTime(0, (time / 60000) % 60, (time / 1000) % 60);
@@ -645,6 +648,7 @@ void MainWindow::volumeMutedChanged(bool muted) {
         statusBar()->showMessage(tr("Volume is unmuted"));
 }
 
+/*
 void MainWindow::abortDownload() {
     QProgressDialog* dlg = dynamic_cast<QProgressDialog*>(this->sender());
     QMap<QNetworkReply*, DownloadResource>::iterator cur;
@@ -727,3 +731,5 @@ void MainWindow::replyMetaDataChanged() {
         m_downloads.remove(r);
     }
 }
+
+*/

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 1f493f16e52c7df1d4600ae7991abfeb81a458da..967a2289c767a72f5efa6c939a9bd657955768ed 100755 (executable)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -14,7 +14,7 @@
 #include "SettingsView.h"
 #include "AboutView.h"
 
-#include <QProgressDialog>
+// #include <QProgressDialog>
 
 class MainWindow : public QMainWindow {
 
@@ -27,11 +27,12 @@ public:
 protected:
     void closeEvent(QCloseEvent *);
 
+    /*
     struct DownloadResource
     {
         QProgressDialog* dialog;
         QFile* file;
-    };
+    };*/
 
 private slots:
     void fadeInWidget(QWidget *oldWidget, QWidget *newWidget);
@@ -58,6 +59,7 @@ private slots:
     void volumeChanged(qreal newVolume);
     void volumeMutedChanged(bool muted);
 
+    /*
     // download related stuff
     void abortDownload();
     void download();
@@ -67,6 +69,7 @@ private slots:
     void replyError(QNetworkReply::NetworkError code);
     void replyFinished();
     void replyMetaDataChanged();
+    */
 
 private:
     void initPhonon();
@@ -138,7 +141,7 @@ private:
     bool m_fullscreen;
     bool m_maximized;
 
-    QMap<QNetworkReply*, DownloadResource> m_downloads;
+    // QMap<QNetworkReply*, DownloadResource> m_downloads;
 };
 
 #endif