User interface update

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

diff --git a/src/UserInterface/Views/SettingsView.cpp b/src/UserInterface/Views/SettingsView.cpp
index 30ab301..0cdb380 100644 (file)
--- a/src/UserInterface/Views/SettingsView.cpp
+++ b/src/UserInterface/Views/SettingsView.cpp
@@ -20,9 +20,18 @@
 #include "DisplaySettings.h"
 #include "ConnectionSettings.h"
 #include "StartupSettings.h"
+#include <QScrollArea>
 
 #include <QtDebug>
 
+#define QT_DELETE(X) \
+       if ( X != 0 ) \
+       { \
+               qDebug() << "delete " << X; \
+               delete X; \
+               X = 0; \
+       }
+
 SettingsView::SettingsView( QWidget *aParent ) :
                ViewBase( ViewBase::NormalView, aParent )
 {
@@ -66,96 +75,25 @@ SettingsView::SettingsView( QWidget *aParent ) :
 
 SettingsView::~SettingsView()
 {
-       if ( iTabWidget != 0 )
-       {
-               delete iTabWidget;
-               iTabWidget = 0;
-       }
-       if ( iOkButton != 0 )
-       {
-               delete iOkButton;
-               iOkButton = 0;
-       }
-       if ( iCancelButton != 0 )
-       {
-               delete iCancelButton;
-               iCancelButton = 0;
-       }
-       if ( iSettingsTab != 0 )
-       {
-               delete iSettingsTab;
-               iSettingsTab = 0;
-       }
-       if ( iWeekViewTab != 0 )
-       {
-               delete iWeekViewTab;
-               iWeekViewTab = 0;
-       }
-       if ( iResourcesTab != 0 )
-       {
-               delete iResourcesTab;
-               iResourcesTab = 0;
-       }
-       if ( iKioskModeTab != 0 )
-       {
-               delete iKioskModeTab;
-               iKioskModeTab = 0;
-       }
-       if ( iUserName != 0 )
-       {
-               delete iUserName;
-               iUserName = 0;
-       }
-       if ( iPassword != 0 )
-       {
-               delete iPassword;
-               iPassword = 0;
-       }
-       if ( iServerAddress != 0 )
-       {
-               delete iServerAddress;
-               iServerAddress = 0;
-       }
-       if ( iDayStartTime != 0 )
-       {
-               delete iDayStartTime;
-               iDayStartTime = 0;
-       }
-       if ( iDayEndTime != 0 )
-       {
-               delete iDayEndTime;
-               iDayEndTime = 0;
-       }
-       if ( iFiveDays != 0 )
-       {
-               delete iFiveDays;
-               iFiveDays = 0;
-       }
-       if ( iSevenDays != 0 )
-       {
-               delete iSevenDays;
-               iSevenDays = 0;
-       }
-       if ( iRefreshInterval != 0 )
-       {
-               delete iRefreshInterval;
-               iRefreshInterval = 0;
-       }
-       if ( iPowerSaveEnabled != 0 )
-       {
-               delete iPowerSaveEnabled;
-               iPowerSaveEnabled = 0;
-       }
-       if ( iPowerSaveStartTime != 0 )
-       {
-               delete iPowerSaveStartTime;
-               iPowerSaveStartTime = 0;
-       }
-       if ( iPowerSaveEndTime != 0 )
-       {
-               delete iPowerSaveEndTime;
-               iPowerSaveEndTime = 0;
-       }
+       QT_DELETE(iOkButton);
+       QT_DELETE(iCancelButton);
+       QT_DELETE(iUserName);
+       QT_DELETE(iPassword);
+       QT_DELETE(iServerAddress);
+       QT_DELETE(iDayStartTime);
+       QT_DELETE(iDayEndTime);
+       QT_DELETE(iFiveDays);
+       QT_DELETE(iSevenDays);
+       QT_DELETE(iRefreshInterval);
+       QT_DELETE(iPowerSaveEnabled);
+       QT_DELETE(iPowerSaveStartTime);
+       QT_DELETE(iPowerSaveEndTime);
+       QT_DELETE(iSettingsTab);
+       QT_DELETE(iWeekViewTab);
+       QT_DELETE(iResourcesTab);
+       QT_DELETE(iKioskModeTab);
+       QT_DELETE(iTabWidget);
+
 }
 
 QWidget *SettingsView::initSettingsTab()
@@ -208,7 +146,9 @@ QWidget *SettingsView::initSettingsTab()
 
        widget->setLayout( mainLayout );
 
-       return widget;
+       QScrollArea *scroll = new QScrollArea;
+       scroll->setWidget(widget);
+       return scroll;
 }
 
 QWidget *SettingsView::initWeekViewTab()
@@ -251,7 +191,9 @@ QWidget *SettingsView::initWeekViewTab()
 
        widget->setLayout( mainLayout );
 
-       return widget;
+       QScrollArea *scroll = new QScrollArea;
+       scroll->setWidget(widget);
+       return scroll;
 }
 
 QWidget *SettingsView::initResourcesTab()
@@ -298,7 +240,9 @@ QWidget *SettingsView::initResourcesTab()
 
        widget->setLayout( mainLayout );
 
-       return widget;
+       QScrollArea *scroll = new QScrollArea;
+       scroll->setWidget(widget);
+       return scroll;
 }
 
 QWidget *SettingsView::initKioskModeTab()
@@ -369,7 +313,9 @@ QWidget *SettingsView::initKioskModeTab()
 
        widget->setLayout( mainLayout );
 
-       return widget;
+       QScrollArea *scroll = new QScrollArea;
+       scroll->setWidget(widget);
+       return scroll;
 }
 
 void SettingsView::handleOkClicked()
@@ -394,14 +340,14 @@ void SettingsView::handleOkClicked()
 
        // set values to Configuration
        // set user information
-       Configuration::instance()->connectionSettings()->setUsername( userName );
-       Configuration::instance()->connectionSettings()->setPassword( password );
+       Configuration::instance()->setUsername(userName);//connectionSettings()->setUsername( userName );
+       Configuration::instance()->setPassword(password);//connectionSettings()->setPassword( password );
        
        // set server information
-       Configuration::instance()->connectionSettings()->setServerUrl( serverAddress );
+       Configuration::instance()->setServerUrl(serverAddress);//connectionSettings()->setServerUrl( serverAddress );
        if ( ok )
        {
-               Configuration::instance()->connectionSettings()->setRefreshInterval( refreshInterval );
+               Configuration::instance()->setRefreshinterval(refreshInterval);//connectionSettings()->setRefreshInterval( refreshInterval );
        }
        
        // set weekly view settings
@@ -448,12 +394,12 @@ void SettingsView::handleCancelClicked()
 void SettingsView::setValues()
 {
        // set user information
-       iUserName->setText( Configuration::instance()->connectionSettings()->username() );
-       iPassword->setText( Configuration::instance()->connectionSettings()->password() );
+       iUserName->setText( Configuration::instance()->getUsername() );
+       iPassword->setText( Configuration::instance()->getPassword());//connectionSettings()->password() );
        // set server information
-       iServerAddress->setText( Configuration::instance()->connectionSettings()->serverUrl().toString() );
+       iServerAddress->setText( Configuration::instance()->getServerUrl().toString());//connectionSettings()->serverUrl().toString() );
        QString refreshIntervalStr;
-       refreshIntervalStr.setNum( Configuration::instance()->connectionSettings()->refreshInterval() );
+       refreshIntervalStr.setNum( Configuration::instance()->getRefreshinterval());//connectionSettings()->refreshInterval() );
        iRefreshInterval->setText( refreshIntervalStr );
        // set weekly view display settings
        if ( Configuration::instance()->displaySettings()->daysInSchedule() == DisplaySettings::WeekdaysInSchedule )