onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-11 15:41:41 +02:00
Code Issues Releases Wiki Activity

bugfix 2567

Browse Source
This commit is contained in:
2008-05-29 14:40:11 +00:00
parent d4361a109f
commit faf5b726ab
2 changed files with 103 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/IPServiceDialog.cpp
+22 -2
View File
@@ -83,7 +83,17 @@ void IPServiceDialog::loadFWObject(FWObject *o)
m_dialog->timestamp->setChecked( s->getBool("ts") ); m_dialog->timestamp->setChecked( s->getBool("ts") );
m_dialog->all_fragments->setChecked( s->getBool("fragm") ); m_dialog->all_fragments->setChecked( s->getBool("fragm") );
m_dialog->short_fragments->setChecked( s->getBool("short_fragm") ); m_dialog->short_fragments->setChecked( s->getBool("short_fragm") );
if(s->getBool("use_dscp"))
{
m_dialog->use_dscp->setCheckable ( true );
m_dialog->code_label->setText("DSCP code:");
}
else
{
m_dialog->use_tos->setCheckable ( true );
m_dialog->code_label->setText("TOS code:");
}
m_dialog->code->setText(s->getStr("dscp_tos_code").c_str());
m_dialog->comment->setText( QString::fromUtf8(s->getComment().c_str()) ); m_dialog->comment->setText( QString::fromUtf8(s->getComment().c_str()) );
//apply->setEnabled( false ); //apply->setEnabled( false );
@@ -125,6 +135,14 @@ void IPServiceDialog::loadFWObject(FWObject *o)
void IPServiceDialog::changed() void IPServiceDialog::changed()
{ {
//apply->setEnabled( true ); //apply->setEnabled( true );
if (m_dialog->use_dscp->isChecked())
{
m_dialog->code_label->setText("DSCP code:");
}
else
{
m_dialog->code_label->setText("TOS code:");
}
emit changed_sign(); emit changed_sign();
} }
@@ -158,7 +176,9 @@ void IPServiceDialog::applyChanges()
obj->setBool("ts", m_dialog->timestamp->isChecked() ); obj->setBool("ts", m_dialog->timestamp->isChecked() );
obj->setBool("fragm", m_dialog->all_fragments->isChecked() ); obj->setBool("fragm", m_dialog->all_fragments->isChecked() );
obj->setBool("short_fragm", m_dialog->short_fragments->isChecked() ); obj->setBool("short_fragm", m_dialog->short_fragments->isChecked() );
obj->setBool("use_dscp", m_dialog->use_dscp->isChecked());
obj->setBool("use_tos", m_dialog->use_tos->isChecked());
obj->setStr("dscp_tos_code", m_dialog->code->text().toUtf8().constData());
mw->updateObjName(obj,QString::fromUtf8(oldname.c_str())); mw->updateObjName(obj,QString::fromUtf8(oldname.c_str()));
init=true; init=true;
src/gui/ipservicedialog_q.ui
+81 -22
View File
@@ -9,7 +9,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>652</width> <width>652</width>
<height>203</height> <height>244</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@@ -320,7 +320,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2" > <item row="7" column="0" colspan="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -389,6 +389,33 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2" >
<widget class="QRadioButton" name="use_dscp" >
<property name="text" >
<string>Use DSCP</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2" >
<widget class="QRadioButton" name="use_tos" >
<property name="text" >
<string>Use TOS</string>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QLabel" name="code_label" >
<property name="text" >
<string>DSCP code:</string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="2" >
<widget class="QLineEdit" name="code" />
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@@ -421,8 +448,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>109</x>
<y>20</y> <y>75</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -437,8 +464,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>174</x>
<y>20</y> <y>129</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -453,8 +480,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>81</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -469,8 +496,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>109</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -485,8 +512,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>137</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -501,8 +528,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>165</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -517,8 +544,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>193</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -533,8 +560,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>251</x>
<y>20</y> <y>221</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -549,8 +576,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>425</x>
<y>20</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -565,8 +592,8 @@
<slot>libChanged()</slot> <slot>libChanged()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>109</x>
<y>20</y> <y>98</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -574,5 +601,37 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>use_dscp</sender>
<signal>clicked()</signal>
<receiver>IPServiceDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel" >
<x>65</x>
<y>157</y>
</hint>
<hint type="destinationlabel" >
<x>193</x>
<y>-4</y>
</hint>
</hints>
</connection>
<connection>
<sender>use_tos</sender>
<signal>clicked()</signal>
<receiver>IPServiceDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel" >
<x>40</x>
<y>178</y>
</hint>
<hint type="destinationlabel" >
<x>293</x>
<y>0</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>