linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2700
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Mon 2011-12-05 23:02:01 +0100
message:
  Don't show the hubs selector in PrivateFrame for NMDC & offline users
modified:
  win32/PrivateFrame.cpp
  win32/PrivateFrame.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 'win32/PrivateFrame.cpp'
--- win32/PrivateFrame.cpp	2011-12-03 21:53:57 +0000
+++ win32/PrivateFrame.cpp	2011-12-05 22:02:01 +0000
@@ -33,7 +33,8 @@
 
 using dwt::Grid;
 using dwt::GridInfo;
-
+using dwt::Label;
+	
 using boost::range::for_each;
 
 const string PrivateFrame::id = "PM";
@@ -134,8 +135,11 @@
 	message->onChar([this](int c) { return handleMessageChar(c); });
 
 	initStatus();
-	hubBox = addChild(WinUtil::Seeds::comboBox);
 
+	hubGrid = addChild(Grid::Seed(1, 2));
+	hubGrid->addChild(Label::Seed(T_("Messages to go through : ")));
+	hubBox = hubGrid->addChild(WinUtil::Seeds::comboBox);
+	
 	status->onDblClicked(STATUS_STATUS, [this] { openLog(); });
 
 	initAccels();
@@ -259,7 +263,12 @@
 		}
 	}
 
-	status->setWidget(STATUS_HUBS, hubBox);
+	status->setWidget(STATUS_HUBS, hubGrid);
+
+	if(!online || replyTo.getUser().user->isNMDC()) {
+		status->setSize(STATUS_HUBS, 0);
+	}
+
 	status->refresh();
 }
 

=== modified file 'win32/PrivateFrame.h'
--- win32/PrivateFrame.h	2011-10-30 14:24:14 +0000
+++ win32/PrivateFrame.h	2011-12-05 22:02:01 +0000
@@ -71,6 +71,7 @@
 	void sendMessage(const tstring& msg, bool thirdPerson = false);
 
 private:
+	GridPtr hubGrid;
 	ComboBoxPtr hubBox;
 	StringPairList hubs;
 	ParamMap ucLineParams;