Start persisting settings. Portaudio devices are persisted.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16164 d0543943-73ff-0310-b7d9-9358b9ac24b2

fscomm/conf/portaudio.conf.xml

@@ -8,11 +8,11 @@
                 <!--<param name="ringdev" value="${ringdev}"/>-->
                 <param name="ring-file" value="${ring-file}"/>
                 <param name="ring-interval" value="${ring-interval}"/>
-                <param name="hold-file" value="$${hold_music}"/>
+                <param name="hold-file" value="${hold-file}"/>
                 <!--<param name="timer-name" value="soft"/>-->
                 <param name="dialplan" value="XML"/>
-                <param name="cid-name" value="$${outbound_caller_name}"/>
-                <param name="cid-num" value="$${outbound_caller_number}"/>
+                <param name="cid-name" value="${cid-name}"/>
+                <param name="cid-num" value="${cid-num}"/>
                 <param name="sample-rate" value="48000"/>
                 <param name="codec-ms" value="10"/>
             </settings>

fscomm/mod_qsettings/mod_qsettings.cpp

@@ -66,12 +66,15 @@ switch_xml_t XMLBinding::getConfigXML(QString tmpl)
     /* Open template file and expand all strings based on QSettings */
     QByteArray tmplContents(tmplFile.readAll());
     tmplFile.close();
-    _settings->beginGroup("FreeSIWTCH/conf");
+
+    _settings->beginGroup("FreeSWITCH/conf");
     _settings->beginGroup(tmpl);
     foreach(QString k, _settings->childKeys())
     {
         switch_event_add_header_string(e, SWITCH_STACK_BOTTOM, k.toAscii().constData(), _settings->value(k).toByteArray().constData());
     }
+    _settings->endGroup();
+    _settings->endGroup();
 
     char *res = switch_event_expand_headers(e, tmplContents.data());
     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);

fscomm/prefdialog.cpp

@@ -7,6 +7,8 @@ PrefDialog::PrefDialog(QWidget *parent) :
     ui(new Ui::PrefDialog)
 {
     ui->setupUi(this);
+    _settings = new QSettings();
+    connect(this, SIGNAL(accepted()), this, SLOT(configAccepted()));
     getPaDevlist();
 }
 
@@ -15,6 +17,25 @@ PrefDialog::~PrefDialog()
     delete ui;
 }
 
+void PrefDialog::configAccepted()
+{
+    _settings->beginGroup("FreeSWITCH/conf");
+
+    _settings->beginGroup("portaudio.conf");
+    _settings->setValue("cid-name", ui->PaCallerIdNameEdit->text());
+    _settings->setValue("cid-num", ui->PaCallerIdNumEdit->text());
+    _settings->setValue("indev", ui->PaIndevCombo->currentIndex());
+    _settings->setValue("outdev", ui->PaOutdevCombo->currentIndex());
+    _settings->setValue("ringdev", ui->PaRingdevCombo->currentIndex());
+    _settings->setValue("ring-file", ui->PaRingFileEdit->text());
+    _settings->setValue("ring-interval", ui->PaRingIntervalSpin->value());
+    _settings->setValue("hold-file", ui->PaHoldFileEdit->text());
+    _settings->endGroup();
+
+    _settings->endGroup();
+
+}
+
 void PrefDialog::getPaDevlist()
 {
     QString result;

fscomm/prefdialog.h

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QDomDocument>
+#include <QSettings>
 #include <fshost.h>
 
 namespace Ui {
@@ -18,10 +19,14 @@ public:
 protected:
     void changeEvent(QEvent *e);
 
+private slots:
+    void configAccepted();
+
 private:
     void getPaDevlist(void);
     Ui::PrefDialog *ui;
     QDomDocument _xmlPaDevList;
+    QSettings *_settings;
 };
 
 #endif // PREFDIALOG_H

fscomm/resources.qrc

@@ -3,6 +3,7 @@
         <file alias="splash.png">resources/splash.png</file>
         <file alias="pref_sip.png">resources/pref_sip.png</file>
         <file alias="pref_audio.gif">resources/pref_audio.gif</file>
+        <file alias="pref_general.jpg">resources/pref_general.jpg</file>
     </qresource>
     <qresource prefix="/confs">
         <file alias="freeswitch.xml">conf/freeswitch.xml</file>