linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2148
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Thu 2010-05-13 16:03:23 +0200
message:
  Network settings arrangements
modified:
  changelog.txt
  win32/NetworkPage.cpp
  win32/NetworkPage.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2010-05-10 17:39:28 +0000
+++ changelog.txt	2010-05-13 14:03:23 +0000
@@ -20,6 +20,7 @@
 * [L#559544] Don't clear multiline boxes with Ctrl+Alt+A (poy)
 * [L#545264] Correct ADC hub counts (emtee)
 * Add an "Elapsed" column in finished transfer windows (poy)
+* [L#539841] Network settings arrangements (poy)
 
 -- 0.761 2010-03-14 --
 * [L#533840] Fix crashes with themed menus (poy)

=== modified file 'win32/NetworkPage.cpp'
--- win32/NetworkPage.cpp	2010-03-01 15:14:08 +0000
+++ win32/NetworkPage.cpp	2010-05-13 14:03:23 +0000
@@ -34,9 +34,7 @@
 upnp(0),
 nat(0),
 passive(0),
-ipGroup(0),
 externalIP(0),
-ports(0),
 tcp(0),
 udp(0),
 tls(0),
@@ -49,14 +47,15 @@
 
 	grid = addChild(Grid::Seed(2, 1));
 	grid->column(0).mode = GridInfo::FILL;
-	grid->setSpacing(10);
+	grid->setSpacing(20);
 
 	{
-		GridPtr cur = grid->addChild(GroupBox::Seed(T_("Incoming connection settings")))->addChild(Grid::Seed(1, 2));
+		GridPtr cur = grid->addChild(GroupBox::Seed(T_("Incoming connection settings")))->addChild(Grid::Seed(2, 2));
 		cur->column(0).mode = GridInfo::FILL;
 		cur->column(1).align = GridInfo::BOTTOM_RIGHT;
+		cur->setSpacing(10);
 
-		GridPtr connType = cur->addChild(Grid::Seed(6, 1));
+		GridPtr connType = cur->addChild(Grid::Seed(4, 1));
 		connType->setSpacing(6);
  
 		directIn = connType->addChild(RadioButton::Seed(T_("My computer is directly connected to Internet (no router)")));
@@ -68,8 +67,12 @@
 		nat = connType->addChild(RadioButton::Seed(T_("Manual port forwarding (I have configured my router by myself)")));
 		nat->setHelpId(IDH_SETTINGS_NETWORK_FIREWALL_NAT);
 
+		passive = connType->addChild(RadioButton::Seed(T_("Passive mode (last resort - has serious limitations)")));
+		passive->setHelpId(IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE);
+
 		{
-			ipGroup = connType->addChild(GroupBox::Seed(T_("External / WAN IP")));
+			GroupBoxPtr ipGroup = cur->addChild(GroupBox::Seed(T_("External / WAN IP")));
+			cur->setWidget(ipGroup, 1, 0);
 			ipGroup->setHelpId(IDH_SETTINGS_NETWORK_EXTERNAL_IP);
 
 			GridPtr ipGrid = ipGroup->addChild(Grid::Seed(2, 1));
@@ -83,11 +86,8 @@
 			overrideIP->setHelpId(IDH_SETTINGS_NETWORK_OVERRIDE);
 		}
 
-		passive = connType->addChild(RadioButton::Seed(T_("Passive mode (last resort - has serious limitations)")));
-		passive->setHelpId(IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE);
-
-		ports = cur->addChild(GroupBox::Seed(T_("Ports")));
-
+		GroupBoxPtr ports = cur->addChild(GroupBox::Seed(T_("Ports")));
+		cur->setWidget(ports, 0, 1, 2);
 		cur = ports->addChild(Grid::Seed(3, 2));
 		cur->column(1).size = 40;
 		cur->column(1).mode = GridInfo::STATIC;
@@ -170,14 +170,7 @@
 
 	PropPage::read(items);
 
-	fixControlsIn();
 	fixControlsOut();
-
-	directIn->onClicked(std::tr1::bind(&NetworkPage::fixControlsIn, this));
-	upnp->onClicked(std::tr1::bind(&NetworkPage::fixControlsIn, this));
-	nat->onClicked(std::tr1::bind(&NetworkPage::fixControlsIn, this));
-	passive->onClicked(std::tr1::bind(&NetworkPage::fixControlsIn, this));
-
 	directOut->onClicked(std::tr1::bind(&NetworkPage::fixControlsOut, this));
 	socks5->onClicked(std::tr1::bind(&NetworkPage::fixControlsOut, this));
 }
@@ -236,12 +229,6 @@
 	}
 }
 
-void NetworkPage::fixControlsIn() {
-	bool enable = directIn->getChecked() || upnp->getChecked() || nat->getChecked();
-	ipGroup->setEnabled(enable);
-	ports->setEnabled(enable);
-}
-
 void NetworkPage::fixControlsOut() {
 	socksSettings->setEnabled(socks5->getChecked());
 }

=== modified file 'win32/NetworkPage.h'
--- win32/NetworkPage.h	2010-02-11 21:44:13 +0000
+++ win32/NetworkPage.h	2010-05-13 14:03:23 +0000
@@ -40,11 +40,8 @@
 	RadioButtonPtr nat;
 	RadioButtonPtr passive;
 
-	GroupBoxPtr ipGroup;
 	TextBoxPtr externalIP;
 
-	GroupBoxPtr ports;
-
 	TextBoxPtr tcp;
 	TextBoxPtr udp;
 	TextBoxPtr tls;
@@ -56,7 +53,6 @@
 	TextBoxPtr socksServer;
 	CheckBoxPtr socksResolve;
 
-	void fixControlsIn();
 	void fixControlsOut();
 };