mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-11 15:41:41 +02:00
bugfix 2599,2596
This commit is contained in:
@@ -100,7 +100,7 @@ QString FWObjectPropertiesFactory::getObjectProperties(FWObject *obj)
|
||||
{
|
||||
str << IPv6::cast(obj)->getAddressPtr()->toString().c_str();
|
||||
str << "/";
|
||||
str << IPv6::cast(obj)->getNetmaskPtr()->toString().c_str();
|
||||
str << QString("%1").arg(IPv6::cast(obj)->getNetmaskPtr()->getLength());
|
||||
|
||||
} else if (physAddress::isA(obj))
|
||||
{
|
||||
@@ -164,7 +164,7 @@ QString FWObjectPropertiesFactory::getObjectProperties(FWObject *obj)
|
||||
NetworkIPv6 *n=NetworkIPv6::cast(obj);
|
||||
str << n->getAddressPtr()->toString().c_str();
|
||||
str << "/";
|
||||
str << n->getNetmaskPtr()->toString().c_str();
|
||||
str << QString("%1").arg(n->getNetmaskPtr()->getLength());
|
||||
|
||||
} 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";
|
||||
str += IPv6::cast(obj)->getAddressPtr()->toString().c_str();
|
||||
str += "/";
|
||||
str += IPv6::cast(obj)->getNetmaskPtr()->toString().c_str();
|
||||
str += QString("%1").arg(IPv6::cast(obj)->getNetmaskPtr()->getLength());
|
||||
} else if (physAddress::isA(obj))
|
||||
{
|
||||
if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n";
|
||||
@@ -350,7 +350,7 @@ QString FWObjectPropertiesFactory::getObjectPropertiesDetailed(FWObject *obj,
|
||||
NetworkIPv6 *n=NetworkIPv6::cast(obj);
|
||||
str += n->getAddressPtr()->toString().c_str();
|
||||
str += "/";
|
||||
str += n->getNetmaskPtr()->toString().c_str();
|
||||
str += QString("%1").arg(n->getNetmaskPtr()->getLength());
|
||||
} else if (Group::cast(obj)!=NULL) // just any group
|
||||
{
|
||||
if (showPath && !tooltip) str += "<b>Path: </b>" + path + "<br>\n";
|
||||
|
||||
@@ -414,8 +414,8 @@
|
||||
<slot>changed()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>20</x>
|
||||
<y>20</y>
|
||||
<x>101</x>
|
||||
<y>75</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>20</x>
|
||||
@@ -430,8 +430,8 @@
|
||||
<slot>changed()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>20</x>
|
||||
<y>20</y>
|
||||
<x>101</x>
|
||||
<y>127</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>20</x>
|
||||
@@ -446,8 +446,8 @@
|
||||
<slot>changed()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>20</x>
|
||||
<y>20</y>
|
||||
<x>307</x>
|
||||
<y>71</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>20</x>
|
||||
@@ -455,5 +455,21 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</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>
|
||||
</ui>
|
||||
|
||||
Reference in New Issue
Block a user