From e377f99e1701bb2f5d583954485d1a1e6d031d05 Mon Sep 17 00:00:00 2001 From: Max Waterman Date: Tue, 23 Mar 2010 19:07:33 +0200 Subject: [PATCH] Added menu option to show/hide messages table. --- zouba/main.cpp | 2 +- zouba/route.cpp | 1 + zouba/ui.cpp | 28 +++++++++++++++++++++++++++- zouba/ui.h | 7 +++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/zouba/main.cpp b/zouba/main.cpp index 7a0020e..47402c8 100644 --- a/zouba/main.cpp +++ b/zouba/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[] ) { - //qInstallMsgHandler( messageHandler ); + qInstallMsgHandler( messageHandler ); QApplication app(argc, argv); QMainWindow *mainWindow = new QMainWindow; diff --git a/zouba/route.cpp b/zouba/route.cpp index 8604208..37c9377 100644 --- a/zouba/route.cpp +++ b/zouba/route.cpp @@ -47,6 +47,7 @@ void Route::getRoute() fullUrl.addQueryItem( "pass", Ytv::Password ); manager->get( QNetworkRequest( fullUrl ) ); + qDebug() << "getting url" << fullUrl.toEncoded(); qDebug() << "waiting for reply from Ytv"; } diff --git a/zouba/ui.cpp b/zouba/ui.cpp index 33319f0..b6a029b 100644 --- a/zouba/ui.cpp +++ b/zouba/ui.cpp @@ -34,12 +34,15 @@ Ui::~Ui() void Ui::setupUi( QMainWindow *mainWindow ) { mainWindow->resize(800,480); - QMenu *menu = mainWindow->menuBar()->addMenu("Settings"); + menu = mainWindow->menuBar()->addMenu("Settings"); QAction *setHomeAddressAction = new QAction("Set home address", this); QAction *setWorkAddressAction = new QAction("Set work address", this); + hideMessagesAction = new QAction("Hide messages", this); + showMessagesAction = new QAction("Show messages", this); menu->addAction(setHomeAddressAction); menu->addAction(setWorkAddressAction); + menu->addAction(showMessagesAction); connect( setHomeAddressAction, SIGNAL(triggered()), @@ -49,6 +52,14 @@ void Ui::setupUi( QMainWindow *mainWindow ) setWorkAddressAction, SIGNAL(triggered()), this, SLOT(setWorkAddress()) ); + connect( + hideMessagesAction, SIGNAL(triggered()), + this, SLOT(hideMessages()) + ); + connect( + showMessagesAction, SIGNAL(triggered()), + this, SLOT(showMessages()) + ); centralWidget = new QWidget( mainWindow ); mainWindow->setCentralWidget(centralWidget); @@ -86,6 +97,7 @@ void Ui::setupUi( QMainWindow *mainWindow ) messageTable = new MessageTable(); messageTable->setObjectName( QString::fromUtf8("messageTable") ); + messageTable->hide(); QVBoxLayout *mainLayout = new QVBoxLayout(); mainLayout->addLayout( topLayout ); @@ -104,6 +116,20 @@ void Ui::setWorkAddress() setAddress( "work" ); } +void Ui::hideMessages() +{ + messageTable->hide(); + menu->removeAction( hideMessagesAction ); + menu->addAction( showMessagesAction ); +} + +void Ui::showMessages() +{ + messageTable->show(); + menu->removeAction( showMessagesAction ); + menu->addAction( hideMessagesAction ); +} + void Ui::setAddress( const QString &label ) { Locations *locations=Locations::instance(); diff --git a/zouba/ui.h b/zouba/ui.h index f6fda1b..3bbca75 100644 --- a/zouba/ui.h +++ b/zouba/ui.h @@ -10,6 +10,8 @@ class QButtonGroup; class MessageTable; class QHBoxLayout; class QVBoxLayout; +class QMenu; +class QAction; class Ui : public QObject { @@ -41,6 +43,9 @@ public: static MessageTable *messageTable; QHBoxLayout *mainLayout; QVBoxLayout *buttonLayout; + QMenu *menu; + QAction *hideMessagesAction; + QAction *showMessagesAction; Q_SIGNALS: void homeAddressChanged( QString address ); @@ -49,6 +54,8 @@ Q_SIGNALS: private Q_SLOTS: void setHomeAddress(); void setWorkAddress(); + void hideMessages(); + void showMessages(); private: void setAddress( const QString &label ); -- 1.7.9.5