[Dcplusplus-commit] SF.net SVN: dcplusplus: [925] dcplusplus/trunk

[<zou...@us...>]

Revision: 925
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=925&view=rev
Author:   zouzou123gen
Date:     2007-12-01 15:34:02 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
tab order & missing addWidget in PublicHubsFrame

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/win32/PublicHubsFrame.cpp

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2007-12-01 23:05:03 UTC (rev 924)
+++ dcplusplus/trunk/changelog.txt	2007-12-01 23:34:02 UTC (rev 925)
@@ -18,6 +18,7 @@
 * Fixed missing title changes on tab change (thanks poy)
 * Fixed user list filter (poy)
 * Readded chat message box auto-scroll (poy)
+* Fixed tab order in public hubs (poy)
 
 -- 0.703 2007-11-08 --
 * Fixed invalid strings (thanks james ross)

Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp	2007-12-01 23:05:03 UTC (rev 924)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp	2007-12-01 23:34:02 UTC (rev 925)
@@ -120,8 +120,33 @@
 		hubs->onKeyDown(std::tr1::bind(&PublicHubsFrame::handleKeyDown, this, _1));
 		hubs->onContextMenu(std::tr1::bind(&PublicHubsFrame::handleContextMenu, this, _1));
 	}
-	
+
 	{
+		WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
+		cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
+		filter = createTextBox(cs);
+		addWidget(filter);
+		filter->onKeyDown(std::tr1::bind(&PublicHubsFrame::handleFilterKeyDown, this, _1));
+	}
+
+	{
+		filterSel = createComboBox(WinUtil::Seeds::comboBoxStatic);
+		addWidget(filterSel);
+
+		//populate the filter list with the column names
+		for(int j=0; j<COLUMN_LAST; j++) {
+			filterSel->addValue(TSTRING_I(columnNames[j]));
+		}
+		filterSel->addValue(TSTRING(ANY));
+		filterSel->setSelectedIndex(COLUMN_LAST);
+		filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
+
+		pubLists = createComboBox(WinUtil::Seeds::comboBoxStatic);
+		addWidget(pubLists);
+		pubLists->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::handleListSelChanged, this));
+	}
+
+	{
 		WidgetButton::Seed cs = WinUtil::Seeds::button;
 		
 		cs.caption = TSTRING(CONFIGURE);
@@ -145,32 +170,8 @@
 		cs.caption = TSTRING(FILTER);
 		filterDesc = createButton(cs);
 		filterDesc->setFont(WinUtil::font);
-
 	}
 
-	{
-		pubLists = createComboBox(WinUtil::Seeds::comboBoxStatic);
-		pubLists->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::handleListSelChanged, this));
-		
-		filterSel = createComboBox(WinUtil::Seeds::comboBoxStatic);
-		addWidget(filterSel);
-
-		//populate the filter list with the column names
-		for(int j=0; j<COLUMN_LAST; j++) {
-			filterSel->addValue(TSTRING_I(columnNames[j]));
-		}
-		filterSel->addValue(TSTRING(ANY));
-		filterSel->setSelectedIndex(COLUMN_LAST);
-		filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
-	}
-	{
-		WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
-		cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
-		filter = createTextBox(cs);
-		addWidget(filter);
-		filter->onKeyDown(std::tr1::bind(&PublicHubsFrame::handleFilterKeyDown, this, _1));
-	}
-	
 	initStatus();
 
 	FavoriteManager::getInstance()->addListener(this);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.