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 2599,2596

Browse Source
This commit is contained in:
2008-05-25 15:31:41 +00:00
parent 025741ba41
commit 334191386a
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/FWObjectPropertiesFactory.cpp
+4 -4
View File
@@ -100,7 +100,7 @@ QString FWObjectPropertiesFactory::getObjectProperties(FWObject *obj)
{ {
str << IPv6::cast(obj)->getAddressPtr()->toString().c_str(); str << IPv6::cast(obj)->getAddressPtr()->toString().c_str();
str << "/"; str << "/";
str << IPv6::cast(obj)->getNetmaskPtr()->toString().c_str(); str << QString("%1").arg(IPv6::cast(obj)->getNetmaskPtr()->getLength());
} else if (physAddress::isA(obj)) } else if (physAddress::isA(obj))
{ {
@@ -164,7 +164,7 @@ QString FWObjectPropertiesFactory::getObjectProperties(FWObject *obj)
NetworkIPv6 *n=NetworkIPv6::cast(obj); NetworkIPv6 *n=NetworkIPv6::cast(obj);
str << n->getAddressPtr()->toString().c_str(); str << n->getAddressPtr()->toString().c_str();
str << "/"; str << "/";
str << n->getNetmaskPtr()->toString().c_str(); str << QString("%1").arg(n->getNetmaskPtr()->getLength());
} else if (Group::cast(obj)!=NULL) // just any group } else if (Group::cast(obj)!=NULL) // just any group
{ {
@@ -294,7 +294,7 @@ QString FWObjectPropertiesFactory::getObjectPropertiesDetailed(FWObject *obj,
if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n"; if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n";
str += IPv6::cast(obj)->getAddressPtr()->toString().c_str(); str += IPv6::cast(obj)->getAddressPtr()->toString().c_str();
str += "/"; str += "/";
str += IPv6::cast(obj)->getNetmaskPtr()->toString().c_str(); str += QString("%1").arg(IPv6::cast(obj)->getNetmaskPtr()->getLength());
} else if (physAddress::isA(obj)) } else if (physAddress::isA(obj))
{ {
if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n"; if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n";
@@ -350,7 +350,7 @@ QString FWObjectPropertiesFactory::getObjectPropertiesDetailed(FWObject *obj,
NetworkIPv6 *n=NetworkIPv6::cast(obj); NetworkIPv6 *n=NetworkIPv6::cast(obj);
str += n->getAddressPtr()->toString().c_str(); str += n->getAddressPtr()->toString().c_str();
str += "/"; str += "/";
str += n->getNetmaskPtr()->toString().c_str(); str += QString("%1").arg(n->getNetmaskPtr()->getLength());
} else if (Group::cast(obj)!=NULL) // just any group } else if (Group::cast(obj)!=NULL) // just any group
{ {
if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n"; if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n";
src/gui/networkdialogipv6_q.ui
+22 -6
View File
@@ -414,8 +414,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>101</x>
<y>20</y> <y>75</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -430,8 +430,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>101</x>
<y>20</y> <y>127</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -446,8 +446,8 @@
<slot>changed()</slot> <slot>changed()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>20</x> <x>307</x>
<y>20</y> <y>71</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>20</x> <x>20</x>
@@ -455,5 +455,21 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>netmask</sender>
<signal>textChanged(QString)</signal>
<receiver>NetworkDialogIPv6_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel" >
<x>201</x>
<y>152</y>
</hint>
<hint type="destinationlabel" >
<x>180</x>
<y>-2</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>