Still working

[qtmeetings] / src / UserInterface / Views / SettingsView.cpp

diff --git a/src/UserInterface/Views/SettingsView.cpp b/src/UserInterface/Views/SettingsView.cpp
index caa5cfe..d233662 100644 (file)
--- a/src/UserInterface/Views/SettingsView.cpp
+++ b/src/UserInterface/Views/SettingsView.cpp
@@ -24,7 +24,7 @@
 #include <QtDebug>
 
 SettingsView::SettingsView( QWidget *aParent ) :
-               ObservedWidget( aParent )
+               ViewBase( ViewBase::NormalView, aParent )
 {
        qDebug() << "SettingsView::ctor invoked";
        // Prepare the tabbed view
@@ -44,10 +44,7 @@ SettingsView::SettingsView( QWidget *aParent ) :
        QHBoxLayout *buttonLayout = new QHBoxLayout;
        iOkButton = new QPushButton;
        iOkButton->setText( tr( "OK" ) );
-       iCancelButton = new QPushButton;
-       iCancelButton->setText( tr( "Cancel" ) );
        buttonLayout->addWidget( iOkButton );
-       buttonLayout->addWidget( iCancelButton );
 
        // Handle the main layout
        QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -57,8 +54,7 @@ SettingsView::SettingsView( QWidget *aParent ) :
        setLayout( mainLayout );
 
        // Handle component connections
-       connect( iOkButton, SIGNAL( pressed() ), this, SLOT( okClicked() ) );
-       connect( iCancelButton, SIGNAL( pressed() ), this, SLOT( cancelClicked() ) );
+       connect( iOkButton, SIGNAL( clicked() ), this, SLOT( handleOkClicked() ) );
 }
 
 SettingsView::~SettingsView()
@@ -73,11 +69,6 @@ SettingsView::~SettingsView()
                delete iOkButton;
                iOkButton = 0;
        }
-       if ( iCancelButton != 0 )
-       {
-               delete iCancelButton;
-               iCancelButton = 0;
-       }
        if ( iSettingsTab != 0 )
        {
                delete iSettingsTab;
@@ -389,7 +380,7 @@ QWidget *SettingsView::initKioskModeTab()
        return widget;
 }
 
-void SettingsView::okClicked()
+void SettingsView::handleOkClicked()
 {
        qDebug() << "[SettingsView::okClicked] <Invoked>";
 
@@ -409,12 +400,14 @@ void SettingsView::okClicked()
        bool powerSaveEnabled = iPowerSaveEnabled->isChecked();
 
        // TODO : Set the values to configuration and save it
-
-       close();
+       
+       // Emit the signal to notify that ok is pressed and data is saved.
+       emit okClicked();
 }
 
-void SettingsView::cancelClicked()
+void SettingsView::viewResized(const QSize &size)
 {
-       qDebug() << "[SettingsView::cancelClicked] <Invoked>";
-       close();
-}
+       qDebug() << "[SettingsView::viewResized] <Invoked>";
+       
+       qDebug() << "[SettingsView::viewResized] <Finished>";
+}
\ No newline at end of file