- About dialogs and menubar

git-svn-id: file:///svnroot/qtrapids/trunk@9 42ac0dd5-4c8c-4c71-bb3e-ecdfe252ffda

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 7412e5b..dc1d73e 100644 (file)
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -21,10 +21,11 @@
 
 #include <QDebug>
 
 
 #include <QDebug>
 

-
+#include <QMenuBar>

 #include <QToolBar>
 #include <QAction>
 #include <QFileDialog>
 #include <QToolBar>
 #include <QAction>
 #include <QFileDialog>

+#include <QMessageBox>

 
 #include "DownloadView.h"
 #include "SeedView.h"
 
 #include "DownloadView.h"
 #include "SeedView.h"

@@ -32,29 +33,58 @@
 #include "MainWindow.h"
 
 
 #include "MainWindow.h"
 
 

+const QString ABOUT_TEXT 
+       = QString(QObject::trUtf8("QtRapids, a simple BitTorrent client based on"
+               "\nQt and Libtorrent."
+               "\n\nURL: http://qtrapids.garage.maemo.org/"
+               "\n\nAuthor(s):\nLassi Väätämöinen, lassi.vaatamoinen@ixonos.com"
+               "\n\nIxonos Plc, Finland\n"));
+
+

 
 

-MainWindow::MainWindow()
+MainWindow::MainWindow():
+       QMainWindow(), // Superclass
+       tabWidget_(NULL),
+       dlView_(NULL),
+       seedView_(NULL)

 {
        
 {
        

+       // MENUBAR 
+       QMenuBar *menuBar = new QMenuBar();
+       QMenu *tempMenu = NULL;
+       
+       tempMenu = menuBar->addMenu(tr("&File"));
+       tempMenu->addAction(tr("&Open"));
+       
+       tempMenu = menuBar->addMenu(tr("&Help"));
+       QAction *aboutAction = tempMenu->addAction(tr("&About"));
+       QAction *aboutQtAction = tempMenu->addAction(tr("About &Qt"));
+       
+       setMenuBar(menuBar);
+       connect(aboutAction, SIGNAL(triggered()), this, SLOT(on_aboutAction_clicked()));
+       connect(aboutQtAction, SIGNAL(triggered()), this, SLOT(on_aboutQtAction_clicked()));
+       
+       
+       // TABWIDGET (central widget)

        tabWidget_ = new QTabWidget();
        
        /// @todo Exception handling
        dlView_ = new DownloadView(this);
        seedView_ = new SeedView(this);
        
        tabWidget_ = new QTabWidget();
        
        /// @todo Exception handling
        dlView_ = new DownloadView(this);
        seedView_ = new SeedView(this);
        

-       tabWidget_->addTab(dlView_, "Downloads");
-       tabWidget_->addTab(seedView_, "Seeds");
+       tabWidget_->addTab(dlView_, tr("Downloads"));
+       tabWidget_->addTab(seedView_, tr("Seeds"));

        
        // Tab widget as central widget.
        setCentralWidget(tabWidget_);
        
        
        // Tab widget as central widget.
        setCentralWidget(tabWidget_);
        

+       
+       // TOOLBAR

        QToolBar *toolBar = new QToolBar();
        QToolBar *toolBar = new QToolBar();

-       toolBar->addAction("Open");
+       toolBar->addAction(tr("Open"));

        
        addToolBar(Qt::TopToolBarArea, toolBar);
        
        addToolBar(Qt::TopToolBarArea, toolBar);

-       

        connect(toolBar, SIGNAL(actionTriggered(QAction*)), this, SLOT(handleToolBarAction(QAction*)));
        connect(toolBar, SIGNAL(actionTriggered(QAction*)), this, SLOT(handleToolBarAction(QAction*)));

-       

 }
 
 
 }
 
 

@@ -63,16 +93,24 @@ MainWindow::~MainWindow()
 }
 
 
 }
 
 

+void MainWindow::on_aboutAction_clicked()
+{
+       QMessageBox::about(this, tr("About QtRapids"), ABOUT_TEXT); 
+}
+               
+void MainWindow::on_aboutQtAction_clicked()
+{
+       QMessageBox::aboutQt (this, tr("About Qt"));
+}
+
+

 void MainWindow::handleToolBarAction(QAction* action)
 {
 void MainWindow::handleToolBarAction(QAction* action)
 {

-       

        if (action->text() == "Open") {
                QFileDialog *dialog = new QFileDialog( this, "Open torrent file", QString(), tr("Torrent files (*.torrent)"));
                dialog->setFileMode(QFileDialog::ExistingFile);
                dialog->show();
        } else {
        }
        if (action->text() == "Open") {
                QFileDialog *dialog = new QFileDialog( this, "Open torrent file", QString(), tr("Torrent files (*.torrent)"));
                dialog->setFileMode(QFileDialog::ExistingFile);
                dialog->show();
        } else {
        }

-
-

 }
 
 }
 

diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 766b659..fc89cdc 100644 (file)
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -40,6 +40,8 @@ class MainWindow : public QMainWindow {
                
        public slots:
        private slots:
                
        public slots:
        private slots:

+               void on_aboutAction_clicked();
+               void on_aboutQtAction_clicked();

                void handleToolBarAction(QAction* action);
                
        private:
                void handleToolBarAction(QAction* action);
                
        private:

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 801ae6d..25426e8 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -31,7 +31,8 @@ int main(int argc, char *argv[])
      // Q_INIT_RESOURCE(application);
        QApplication app(argc, argv);
        MainWindow *mainWindow = new MainWindow();
      // Q_INIT_RESOURCE(application);
        QApplication app(argc, argv);
        MainWindow *mainWindow = new MainWindow();

-       mainWindow->show(); 
+       mainWindow->show();
+

        /*
        DownloadView* dlw = new DownloadView(NULL);
       //qtrapids * mw = new qtrapids();
        /*
        DownloadView* dlw = new DownloadView(NULL);
       //qtrapids * mw = new qtrapids();