From 236db6ae69e6b75b83dc503178ab4e47411b7260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Mesquita?= <jmesquita@freeswitch.org>
Date: Tue, 19 Jan 2010 23:54:32 +0000
Subject: [PATCH] Fix a bug where we were setting default settings no matter
 what and do some minor UI enhancements.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16411 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 fscomm/fshost.cpp                      | 2 +-
 fscomm/main.cpp                        | 1 -
 fscomm/mainwindow.cpp                  | 3 +++
 fscomm/mod_qsettings/mod_qsettings.cpp | 7 ++++++-
 fscomm/preferences/accountdialog.cpp   | 9 +++++++++
 fscomm/preferences/prefaccounts.cpp    | 5 +++++
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/fscomm/fshost.cpp b/fscomm/fshost.cpp
index 39b1b72afd..736af8ed5e 100644
--- a/fscomm/fshost.cpp
+++ b/fscomm/fshost.cpp
@@ -366,7 +366,7 @@ void FSHost::generalEventHandler(switch_event_t *event)
             }
             else
             {
-                //qDebug() << QString("We got a not treated custom event: %1\n").arg(!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
+                printEventHeaders(event);
             }
             break;
         }
diff --git a/fscomm/main.cpp b/fscomm/main.cpp
index b86dc11217..9f8c461c7e 100644
--- a/fscomm/main.cpp
+++ b/fscomm/main.cpp
@@ -46,7 +46,6 @@ int main(int argc, char *argv[])
     QObject::connect(&g_FSHost, SIGNAL(ready()), splash, SLOT(close()));
     MainWindow w;    
     QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(show()));
-    QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(print()));
     g_FSHost.start();
     return a.exec();
 }
diff --git a/fscomm/mainwindow.cpp b/fscomm/mainwindow.cpp
index c7060b20c3..289a8ad463 100644
--- a/fscomm/mainwindow.cpp
+++ b/fscomm/mainwindow.cpp
@@ -98,6 +98,9 @@ MainWindow::MainWindow(QWidget *parent) :
     /* Set the context menus */
     ui->tableAccounts->addAction(ui->actionSetDefaultAccount);
 
+    /* Set other properties */
+    ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+
 }
 
 MainWindow::~MainWindow()
diff --git a/fscomm/mod_qsettings/mod_qsettings.cpp b/fscomm/mod_qsettings/mod_qsettings.cpp
index 1723963d60..bc3fb34e16 100644
--- a/fscomm/mod_qsettings/mod_qsettings.cpp
+++ b/fscomm/mod_qsettings/mod_qsettings.cpp
@@ -180,8 +180,13 @@ static switch_status_t do_config(void)
     switch_xml_free(xml);
 
     QSettings settings;
-    if (!settings.allKeys().contains("FreeSWITCH/conf"))
+    settings.beginGroup("FreeSWITCH/conf");
+    if (settings.childGroups().isEmpty())
+    {
+        qDebug() << "We are settings default.";
         setQSettingsDefaults();
+    }
+    settings.endGroup();
     setGlobals();
 
     return SWITCH_STATUS_SUCCESS;
diff --git a/fscomm/preferences/accountdialog.cpp b/fscomm/preferences/accountdialog.cpp
index 0a2a777448..3010d7f1f5 100644
--- a/fscomm/preferences/accountdialog.cpp
+++ b/fscomm/preferences/accountdialog.cpp
@@ -14,6 +14,8 @@ AccountDialog::AccountDialog(QString accId, QWidget *parent) :
     connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
     connect(ui->sofiaExtraParamAddBtn, SIGNAL(clicked()), this, SLOT(addExtraParam()));
     connect(ui->sofiaExtraParamRemBtn, SIGNAL(clicked()), this, SLOT(remExtraParam()));
+
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
 }
 
 AccountDialog::~AccountDialog()
@@ -55,6 +57,9 @@ void AccountDialog::addExtraParam()
     ui->sofiaExtraParamTable->setRowCount(ui->sofiaExtraParamTable->rowCount()+1);
     ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,0,paramNameItem);
     ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,1,paramValItem);
+    ui->sofiaExtraParamTable->resizeColumnsToContents();
+    ui->sofiaExtraParamTable->resizeRowsToContents();
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
 }
 
 void AccountDialog::readConfig()
@@ -95,6 +100,10 @@ void AccountDialog::readConfig()
 
     _settings->endGroup();
     _settings->endGroup();
+
+    ui->sofiaExtraParamTable->resizeColumnsToContents();
+    ui->sofiaExtraParamTable->resizeRowsToContents();
+    ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
 }
 
 void AccountDialog::writeConfig()
diff --git a/fscomm/preferences/prefaccounts.cpp b/fscomm/preferences/prefaccounts.cpp
index 4f0e86a124..0fed6d973f 100644
--- a/fscomm/preferences/prefaccounts.cpp
+++ b/fscomm/preferences/prefaccounts.cpp
@@ -11,6 +11,8 @@ PrefAccounts::PrefAccounts(Ui::PrefDialog *ui) :
     connect(_ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
     connect(_ui->sofiaGwRemBtn, SIGNAL(clicked()), this, SLOT(remAccountBtnClicked()));
     connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
+
+    _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
 }
 
 void PrefAccounts::addAccountBtnClicked()
@@ -131,6 +133,9 @@ void PrefAccounts::readConfig()
         _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 0, item0);
         _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 1, item1);
     }
+    _ui->accountsTable->resizeRowsToContents();
+    _ui->accountsTable->resizeColumnsToContents();
+    _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
 
     _settings->endGroup();