<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/101165/">http://git.reviewboard.kde.org/r/101165/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On April 20th, 2011, 11:16 p.m., <b>Commit Hook</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This review has been submitted with commit ab05f9a030eab2f19af25ea7a535c56d14ce66e6 by Lamarque V. Souza.</pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Can't figure out how to update the diff, it keeps saying "revision xxx not found". Anyway, improved handling of switch from manual to DHCP: instead of just being greyed out, the address is pushed to additional addresses, the fields in the main ip widget are then cleared:
diff --git a/libs/ui/ipv4widget.cpp b/libs/ui/ipv4widget.cpp
index 1509084..2af67c4 100644
--- a/libs/ui/ipv4widget.cpp
+++ b/libs/ui/ipv4widget.cpp
@@ -311,10 +311,31 @@ void IpV4Widget::methodChanged(int currentIndex)
advancedSettingsPartEnabled = false;
}
- if (!addressPartEnabled && !advancedSettingsPartEnabled) {
+ if (!addressPartEnabled && advancedSettingsPartEnabled)
+ {
+ QList<Solid::Control::IPv4Address> addresses = d->ui.advancedSettings->additionalAddresses();
+ QNetworkAddressEntry entry;
+ // we need to set up IP before prefix/netmask manipulation
+ entry.setIp(QHostAddress(d->ui.address->text()));
+ entry.setNetmask(QHostAddress(d->ui.netMask->text()));
+
+ QHostAddress gateway(d->ui.gateway->text());
+ if (entry.ip() != QHostAddress::Null)
+ {
+ Solid::Control::IPv4Address addr(entry.ip().toIPv4Address(),
+ entry.prefixLength(), gateway.toIPv4Address());
+ addresses.prepend(addr);
+ }
+ d->ui.advancedSettings->setAdditionalAddresses(addresses);
+ }
+ if (!addressPartEnabled)
+ {
d->ui.address->clear();
d->ui.netMask->clear();
d->ui.gateway->clear();
+ }
+ if (!advancedSettingsPartEnabled)
+ {
d->ui.advancedSettings->setAdditionalAddresses(QList<Solid::Control::IPv4Address>());
}
</pre>
<br />
<p>- Ilia</p>
<br />
<p>On April 20th, 2011, 10:44 p.m., Ilia Kats wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Network Management.</div>
<div>By Ilia Kats.</div>
<p style="color: grey;"><i>Updated April 20, 2011, 10:44 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This is supported by NetworkManager, so let's add it to KDE. This patch also cleans up libs/ui/802_11_wirelesswidget.cpp (use enums instead of hardcoded values)</pre>
</td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=249016">249016</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>libs/ui/802_11_wirelesswidget.cpp <span style="color: grey">(cb103d2)</span></li>
<li>libs/ui/ipv4widget.cpp <span style="color: grey">(732a94e)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/101165/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>