<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16411] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16411">16411</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-19 17:54:32 -0600 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix a bug where we were setting default settings no matter what and do some minor UI enhancements.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmaincpp">freeswitch/trunk/fscomm/main.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogcpp">freeswitch/trunk/fscomm/preferences/accountdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountscpp">freeswitch/trunk/fscomm/preferences/prefaccounts.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- //qDebug() << QString("We got a not treated custom event: %1\n").arg(!zstr(event->subclass_name) ? event->subclass_name : "NULL"));
</del><ins>+ printEventHeaders(event);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmaincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/main.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/main.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/main.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> QObject::connect(&g_FSHost, SIGNAL(ready()), splash, SLOT(close()));
</span><span class="cx"> MainWindow w;
</span><span class="cx"> QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(show()));
</span><del>- QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(print()));
</del><span class="cx"> g_FSHost.start();
</span><span class="cx"> return a.exec();
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -98,6 +98,9 @@
</span><span class="cx"> /* Set the context menus */
</span><span class="cx"> ui->tableAccounts->addAction(ui->actionSetDefaultAccount);
</span><span class="cx">
</span><ins>+ /* Set other properties */
+ ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MainWindow::~MainWindow()
</span></span></pre></div>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -180,8 +180,13 @@
</span><span class="cx"> switch_xml_free(xml);
</span><span class="cx">
</span><span class="cx"> QSettings settings;
</span><del>- if (!settings.allKeys().contains("FreeSWITCH/conf"))
</del><ins>+ settings.beginGroup("FreeSWITCH/conf");
+ if (settings.childGroups().isEmpty())
+ {
+ qDebug() << "We are settings default.";
</ins><span class="cx"> setQSettingsDefaults();
</span><ins>+ }
+ settings.endGroup();
</ins><span class="cx"> setGlobals();
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -14,6 +14,8 @@
</span><span class="cx"> connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
</span><span class="cx"> connect(ui->sofiaExtraParamAddBtn, SIGNAL(clicked()), this, SLOT(addExtraParam()));
</span><span class="cx"> connect(ui->sofiaExtraParamRemBtn, SIGNAL(clicked()), this, SLOT(remExtraParam()));
</span><ins>+
+ ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccountDialog::~AccountDialog()
</span><span class="lines">@@ -55,6 +57,9 @@
</span><span class="cx"> ui->sofiaExtraParamTable->setRowCount(ui->sofiaExtraParamTable->rowCount()+1);
</span><span class="cx"> ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,0,paramNameItem);
</span><span class="cx"> ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,1,paramValItem);
</span><ins>+ ui->sofiaExtraParamTable->resizeColumnsToContents();
+ ui->sofiaExtraParamTable->resizeRowsToContents();
+ ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccountDialog::readConfig()
</span><span class="lines">@@ -95,6 +100,10 @@
</span><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span><span class="cx"> _settings->endGroup();
</span><ins>+
+ ui->sofiaExtraParamTable->resizeColumnsToContents();
+ ui->sofiaExtraParamTable->resizeRowsToContents();
+ ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccountDialog::writeConfig()
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16410 => 16411)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-19 18:54:33 UTC (rev 16410)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-19 23:54:32 UTC (rev 16411)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> connect(_ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
</span><span class="cx"> connect(_ui->sofiaGwRemBtn, SIGNAL(clicked()), this, SLOT(remAccountBtnClicked()));
</span><span class="cx"> connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
</span><ins>+
+ _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::addAccountBtnClicked()
</span><span class="lines">@@ -131,6 +133,9 @@
</span><span class="cx"> _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 0, item0);
</span><span class="cx"> _ui->accountsTable->setItem(_ui->accountsTable->rowCount()-1, 1, item1);
</span><span class="cx"> }
</span><ins>+ _ui->accountsTable->resizeRowsToContents();
+ _ui->accountsTable->resizeColumnsToContents();
+ _ui->accountsTable->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>