Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

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
This commit is contained in:
João Mesquita 2010-01-19 23:54:32 +00:00
parent a2710c9ccb
commit 236db6ae69
6 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fscomm/fshost.cpp
View File

@ -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;
}

1
fscomm/main.cpp
View File

@ -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();
}

3
fscomm/mainwindow.cpp
View File

@ -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()

7
fscomm/mod_qsettings/mod_qsettings.cpp
View File

@ -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;

9
fscomm/preferences/accountdialog.cpp
View File

@ -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()

5
fscomm/preferences/prefaccounts.cpp
View File

@ -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();