r3230 - in trunk/minisip: minisip/gui/gtkgui share
mikma at minisip.org
mikma at minisip.org
Wed Mar 7 10:55:30 CET 2007
Author: mikma
Date: 2007-03-07 10:55:29 +0100 (Wed, 07 Mar 2007)
New Revision: 3230
Modified:
trunk/minisip/minisip/gui/gtkgui/SettingsDialog.cxx
trunk/minisip/minisip/gui/gtkgui/SettingsDialog.h
trunk/minisip/share/minisip.glade
Log:
Add use_100rel and use_anat settings to Gtk+ GUI.
Modified: trunk/minisip/minisip/gui/gtkgui/SettingsDialog.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/SettingsDialog.cxx 2007-03-07 09:44:35 UTC (rev 3229)
+++ trunk/minisip/minisip/gui/gtkgui/SettingsDialog.cxx 2007-03-07 09:55:29 UTC (rev 3230)
@@ -61,6 +61,7 @@
mediaSettings = new MediaSettings( refXml );
deviceSettings = new DeviceSettings( refXml );
advancedSettings = new AdvancedSettings( refXml );
+ sipSettings = new SipSettings( refXml );
dialogWindow->hide();
@@ -75,6 +76,7 @@
delete mediaSettings;
delete deviceSettings;
delete advancedSettings;
+ delete sipSettings;
delete dialogWindow;
}
@@ -92,6 +94,7 @@
mediaSettings->setConfig( config );
deviceSettings->setConfig( config );
advancedSettings->setConfig( config );
+ sipSettings->setConfig( config );
}
@@ -115,6 +118,7 @@
warning += mediaSettings->apply();
warning += deviceSettings->apply();
warning += advancedSettings->apply();
+ warning += sipSettings->apply();
config->save();
// FIXME: only reload the mediahandler when something actually
@@ -889,3 +893,27 @@
return "";
}
+
+// SipSettings
+SipSettings::SipSettings( Glib::RefPtr<Gnome::Glade::Xml> refXml ){
+ refXml->get_widget( "anatCheck", anatCheck );
+ refXml->get_widget( "100relCheck", use100RelCheck );
+}
+
+void SipSettings::setConfig( MRef<SipSoftPhoneConfiguration *> config ){
+ this->config = config;
+
+ MRef<SipStackConfig*> stackConfig = config->sipStack->getStackConfig();
+
+ anatCheck->set_active( config->useAnat );
+ use100RelCheck->set_active( stackConfig->use100Rel );
+}
+
+string SipSettings::apply(){
+ MRef<SipStackConfig*> stackConfig = config->sipStack->getStackConfig();
+
+ config->useAnat = anatCheck->get_active();
+ stackConfig->use100Rel = use100RelCheck->get_active();
+
+ return "";
+}
Modified: trunk/minisip/minisip/gui/gtkgui/SettingsDialog.h
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/SettingsDialog.h 2007-03-07 09:44:35 UTC (rev 3229)
+++ trunk/minisip/minisip/gui/gtkgui/SettingsDialog.h 2007-03-07 09:55:29 UTC (rev 3230)
@@ -40,6 +40,7 @@
class DeviceSettings;
class SecuritySettings;
class AdvancedSettings;
+class SipSettings;
class SipSoftPhoneConfiguration;
class CertificateDialog;
@@ -65,13 +66,14 @@
private:
MRef<CommandReceiver*> callback;
//GuiCallback * callback;
-
+
Gtk::Dialog * dialogWindow;
GeneralSettings * generalSettings;
MediaSettings * mediaSettings;
DeviceSettings * deviceSettings;
SecuritySettings * securitySettings;
AdvancedSettings * advancedSettings;
+ SipSettings * sipSettings;
MRef<SipSoftPhoneConfiguration *> config;
};
@@ -277,5 +279,25 @@
};
+class SipSettings
+#ifdef OLDLIBGLADEMM
+: public SigC::Object
+#endif
+{
+ public:
+ SipSettings( Glib::RefPtr<Gnome::Glade::Xml> refXml );
+
+ std::string apply();
+
+ void setConfig( MRef<SipSoftPhoneConfiguration *> config );
+
+ private:
+ Gtk::CheckButton * use100RelCheck;
+ Gtk::CheckButton * anatCheck;
+
+ MRef<SipSoftPhoneConfiguration *> config;
+
+};
+
#endif
Modified: trunk/minisip/share/minisip.glade
===================================================================
--- trunk/minisip/share/minisip.glade 2007-03-07 09:44:35 UTC (rev 3229)
+++ trunk/minisip/share/minisip.glade 2007-03-07 09:55:29 UTC (rev 3230)
@@ -1357,7 +1357,7 @@
</child>
</widget>
<packing>
- <property name="tab_expand">False</property>
+ <property name="tab_expand">True</property>
<property name="tab_fill">True</property>
</packing>
</child>
@@ -1923,6 +1923,150 @@
<property name="type">tab</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow17">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkViewport" id="viewport11">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment34">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox38">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label197">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b><big>SIP extensions</big></b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox39">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="100relCheck">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">100rel (RFC 3262: Reliability of Provisional Responses)</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="anatCheck">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">sdp-anat (RFC 4092: Dual IPv4/IPv6 in SDP)</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">True</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label196">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">SIP</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
More information about the Minisip-devel
mailing list