- Fixed KineticScrolling due to Qt 4.6.1 changes.

[qtrapids] / src / client / MainWindow.cpp

diff --git a/src/client/MainWindow.cpp b/src/client/MainWindow.cpp
index 8b89ae8..b589dc3 100644 (file)
--- a/src/client/MainWindow.cpp
+++ b/src/client/MainWindow.cpp
@@ -27,12 +27,14 @@
 #include <QAction>
 #include <QFileDialog>
 #include <QMessageBox>
+//#include <QTreeWidgetItem>
 #include <QApplication>
 #include <QPluginLoader>
 
 #include "DownloadView.h"
 #include "SeedView.h"
 #include "PreferencesDialog.h"
+#include "ColumnSelectorDialog.h"
 
 #include "MainWindow.h"
 
@@ -44,7 +46,7 @@ const QString ABOUT_TEXT
                           "\nQt and Libtorrent."
                           "\n\nURL: http://qtrapids.garage.maemo.org/"
                           "\n\nAuthors:\nLassi Väätämöinen, lassi.vaatamoinen@ixonos.com"
-                          "\nDenis Zalevskiy, denis.zalewsky@ixonos.com"
+                          "\nDenis Zalevskiy, denis.zalewsky@gmail.com"
                           "\n\nIxonos Plc, Finland\n"));
 
 const QString PLUGINS_DIR = "plugins";
@@ -64,6 +66,9 @@ MainWindow::MainWindow() :
                        , "/qtrapids", QDBusConnection::sessionBus())
                //      torrentHandles_(),
 {
+       
+       setWindowTitle("QtRapids");
+       
        // MENUBAR
        QMenuBar *menuBar = new QMenuBar();
        QMenu *tempMenu = NULL;
@@ -73,7 +78,12 @@ MainWindow::MainWindow() :
        QAction *removeAction = tempMenu->addAction(tr("&Remove"));
        removeAction->setEnabled(false);
        QAction *quitAction = tempMenu->addAction(tr("&Quit"));
+       QAction *stopDaemonAction = tempMenu->addAction(tr("Stop &daemon"));
+       
 
+       tempMenu = menuBar->addMenu(tr("&View"));
+       QAction *columnsAction = tempMenu->addAction(tr("&Columns"));
+       
        tempMenu = menuBar->addMenu(tr("&Settings"));
        QAction *preferencesAction = tempMenu->addAction(tr("&Preferences"));
 
@@ -86,6 +96,8 @@ MainWindow::MainWindow() :
        connect(removeAction, SIGNAL(triggered()), this, SLOT(on_removeAction_clicked()));
        connect(this, SIGNAL(itemSelected(bool)), removeAction, SLOT(setEnabled(bool)));
        connect(quitAction, SIGNAL(triggered()), this, SLOT(on_quitAction_clicked()));
+       connect(stopDaemonAction, SIGNAL(triggered()), this, SLOT(on_stopDaemonAction_clicked()));
+       connect(columnsAction, SIGNAL(triggered()), this, SLOT(on_columnsAction_clicked()));
        connect(preferencesAction, SIGNAL(triggered()), this, SLOT(on_preferencesAction_clicked()));
        connect(aboutAction, SIGNAL(triggered()), this, SLOT(on_aboutAction_clicked()));
        connect(aboutQtAction, SIGNAL(triggered()), this, SLOT(on_aboutQtAction_clicked()));
@@ -290,6 +302,9 @@ void MainWindow::RestoreSettings()
                restoreGeometry(geometry.toByteArray());
        }
        
+       // Restore DownloadView columns:
+       dlView_->restoreView();
+       
        // Restore torrent session settings to server:
        qtrapids::ParamsMap_t options;
        options["net/downloadRate"] = settings_.value("net/downloadRate").toString();
@@ -320,7 +335,7 @@ void MainWindow::on_removeAction_clicked()
        try {
                server_.removeTorrent(hash);
        } catch (...) {
-               qDebug() << "Exception removing torrent";
+               qDebug() << "Exception while removing torrent";
        }
 }
 
@@ -331,6 +346,28 @@ void MainWindow::on_quitAction_clicked()
 }
 
 
+void MainWindow::on_stopDaemonAction_clicked()
+{
+       server_.terminateSession();
+}
+
+
+void MainWindow::on_columnsAction_clicked()
+{      
+       ColumnSelectorDialog *dialog = new ColumnSelectorDialog(dlView_);
+       dialog->show();
+       dialog->exec();
+//     dialog->raise();
+//     dialog->activateWindow();
+       qDebug() << "dialog exit";
+
+       if (dialog->result() == QDialog::Accepted) {
+       qDebug() << "saved";
+               dlView_->saveView();
+       }
+}
+
+
 void MainWindow::on_preferencesAction_clicked()
 {
        if (!preferencesDialog_) {