Index: DCPlusPlus.rc
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/DCPlusPlus.rc,v
retrieving revision 1.109
diff -u -r1.109 DCPlusPlus.rc
--- DCPlusPlus.rc	26 Jul 2004 20:01:16 -0000	1.109
+++ DCPlusPlus.rc	1 Aug 2004 14:11:13 -0000
@@ -648,6 +648,7 @@
     "D",            IDC_QUEUE,              VIRTKEY, CONTROL, NOINVERT
     "S",            IDC_SEND_MESSAGE,       VIRTKEY, ALT, NOINVERT
     "E",            IDC_REFRESH_FILE_LIST,  VIRTKEY, CONTROL, NOINVERT
+    "Q",            ID_FILE_QUICK_CONNECT,  VIRTKEY, CONTROL, NOINVERT
 END
 
 IDR_PUBLICHUBS ACCELERATORS 
Index: Example.xml
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/Example.xml,v
retrieving revision 1.70
diff -u -r1.70 Example.xml
--- Example.xml	27 Jul 2004 22:21:12 -0000	1.70
+++ Example.xml	1 Aug 2004 14:11:15 -0000
@@ -165,6 +166,7 @@
 		<String Name="MenuNotepad">&amp;Notepad	Ctrl+N</String>
 		<String Name="MenuOpenFileList">Open file list...</String>
 		<String Name="MenuPublicHubs">&amp;Public Hubs	Ctrl+P</String>
+		<String Name="MenuQuickConnect">&amp;Quick Connect ...	Ctrl+Q</String>
 		<String Name="MenuReconnect">&amp;Reconnect	Ctrl+R</String>
 		<String Name="MenuRefreshFileList">Refresh file list	Ctrl+E</String>
 		<String Name="MenuShow">Show</String>
@@ -243,6 +245,7 @@
 		<String Name="PrivateMessageFrom">Private message from </String>
 		<String Name="Properties">&amp;Properties</String>
 		<String Name="PublicHubs">Public Hubs</String>
+		<String Name="QuickConnect">Quick Connect</String>
 		<String Name="Ratio">Ratio</String>
 		<String Name="ReaddSource">Re-add source</String>
 		<String Name="ReallyExit">Really exit?</String>
Index: client/StringDefs.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/StringDefs.cpp,v
retrieving revision 1.79
diff -u -r1.79 StringDefs.cpp
--- client/StringDefs.cpp	27 Jul 2004 22:21:14 -0000	1.79
+++ client/StringDefs.cpp	1 Aug 2004 14:11:18 -0000
@@ -167,6 +167,7 @@
 "&Notepad\tCtrl+N", 
 "Open file list...", 
 "&Public Hubs\tCtrl+P", 
+"&Quick Connect ...\tCtrl+Q", 
 "&Reconnect\tCtrl+R", 
 "Refresh file list\tCtrl+E", 
 "Show", 
@@ -245,6 +246,7 @@
 "Private message from ", 
 "&Properties", 
 "Public Hubs", 
+"Quick Connect", 
 "Ratio", 
 "Re-add source", 
 "Really exit?", 
@@ -606,6 +608,7 @@
 "MenuNotepad", 
 "MenuOpenFileList", 
 "MenuPublicHubs", 
+"MenuQuickConnect", 
 "MenuReconnect", 
 "MenuRefreshFileList", 
 "MenuShow", 
@@ -684,6 +687,7 @@
 "PrivateMessageFrom", 
 "Properties", 
 "PublicHubs", 
+"QuickConnect", 
 "Ratio", 
 "ReaddSource", 
 "ReallyExit", 
Index: client/StringDefs.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/client/StringDefs.h,v
retrieving revision 1.78
diff -u -r1.78 StringDefs.h
--- client/StringDefs.h	27 Jul 2004 22:21:14 -0000	1.78
+++ client/StringDefs.h	1 Aug 2004 14:11:18 -0000
@@ -170,6 +170,7 @@
 	MENU_NOTEPAD, // "&Notepad\tCtrl+N"
 	MENU_OPEN_FILE_LIST, // "Open file list..."
 	MENU_PUBLIC_HUBS, // "&Public Hubs\tCtrl+P"
+	MENU_QUICK_CONNECT, // "&Quick Connect ...\tCtrl+Q"
 	MENU_RECONNECT, // "&Reconnect\tCtrl+R"
 	MENU_REFRESH_FILE_LIST, // "Refresh file list\tCtrl+E"
 	MENU_SHOW, // "Show"
@@ -248,6 +249,7 @@
 	PRIVATE_MESSAGE_FROM, // "Private message from "
 	PROPERTIES, // "&Properties"
 	PUBLIC_HUBS, // "Public Hubs"
+	QUICK_CONNECT, // "Quick Connect"
 	RATIO, // "Ratio"
 	READD_SOURCE, // "Re-add source"
 	REALLY_EXIT, // "Really exit?"
Index: windows/MainFrm.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.cpp,v
retrieving revision 1.59
diff -u -r1.59 MainFrm.cpp
--- windows/MainFrm.cpp	27 Jul 2004 22:21:14 -0000	1.59
+++ windows/MainFrm.cpp	1 Aug 2004 14:49:42 -0000
@@ -37,6 +37,7 @@
 #include "FinishedULFrame.h"
 #include "TextFrame.h"
 #include "StatsFrame.h"
+#include "LineDlg.h"
 
 #include "../client/ConnectionManager.h"
 #include "../client/DownloadManager.h"
@@ -1017,6 +1018,25 @@
 	return 0;
 }
 
+LRESULT MainFrame::onQuickConnect(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/){
+	LineDlg dlg;
+	dlg.description = STRING(HUB_ADDRESS);
+	dlg.title = STRING(QUICK_CONNECT);
+	if(dlg.DoModal(m_hWnd) == IDOK){
+		if(SETTING(NICK).empty())
+			return 0;
+
+		string tmp = dlg.line;
+		// Strip out all the spaces
+		string::size_type i;
+		while((i = tmp.find(' ')) != string::npos)
+			tmp.erase(i, 1);
+
+		HubFrame::openWindow(tmp);
+	}
+	return 0;
+}
+
 void MainFrame::on(TimerManagerListener::Second, u_int32_t aTick) throw() {
 	int64_t diff = (int64_t)((lastUpdate == 0) ? aTick - 1000 : aTick - lastUpdate);
 	int64_t updiff = Socket::getTotalUp() - lastUp;
Index: windows/MainFrm.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.h,v
retrieving revision 1.40
diff -u -r1.40 MainFrm.h
--- windows/MainFrm.h	26 Jul 2004 20:01:22 -0000	1.40
+++ windows/MainFrm.h	1 Aug 2004 14:49:42 -0000
@@ -130,6 +130,7 @@
 		COMMAND_ID_HANDLER(IDC_CLOSE_DISCONNECTED, onCloseDisconnected)
 		COMMAND_ID_HANDLER(IDC_OPEN_DOWNLOADS, onOpenDownloads)
 		COMMAND_ID_HANDLER(IDC_REFRESH_FILE_LIST, onRefreshFileList)
+		COMMAND_ID_HANDLER(ID_FILE_QUICK_CONNECT, onQuickConnect)
 		NOTIFY_CODE_HANDLER(TTN_GETDISPINFO, onGetToolTip)
 		CHAIN_MDI_CHILD_COMMANDS()
 		CHAIN_MSG_MAP(CUpdateUI<MainFrame>)
@@ -173,6 +174,7 @@
 	LRESULT onCloseDisconnected(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT onServerSocket(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT onRefreshFileList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT onQuickConnect(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 
 	static DWORD WINAPI stopper(void* p);
 	void UpdateLayout(BOOL bResizeBars = TRUE);
Index: windows/WinUtil.cpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WinUtil.cpp,v
retrieving revision 1.47
diff -u -r1.47 WinUtil.cpp
--- windows/WinUtil.cpp	26 Jul 2004 20:01:22 -0000	1.47
+++ windows/WinUtil.cpp	1 Aug 2004 14:49:45 -0000
@@ -195,6 +195,7 @@
 	file.AppendMenu(MF_STRING, IDC_REFRESH_FILE_LIST, CSTRING(MENU_REFRESH_FILE_LIST));
 	file.AppendMenu(MF_STRING, IDC_OPEN_DOWNLOADS, CSTRING(MENU_OPEN_DOWNLOADS_DIR));
 	file.AppendMenu(MF_SEPARATOR, 0, (LPCTSTR)NULL);
+	file.AppendMenu(MF_STRING, ID_FILE_QUICK_CONNECT, CSTRING(MENU_QUICK_CONNECT));
 	file.AppendMenu(MF_STRING, IDC_FOLLOW, CSTRING(MENU_FOLLOW_REDIRECT));
 	file.AppendMenu(MF_STRING, ID_FILE_RECONNECT, CSTRING(MENU_RECONNECT));
 	file.AppendMenu(MF_SEPARATOR, 0, (LPCTSTR)NULL);
Index: windows/resource.h
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/windows/resource.h,v
retrieving revision 1.53
diff -u -r1.53 resource.h
--- windows/resource.h	26 Jul 2004 20:01:22 -0000	1.53
+++ windows/resource.h	1 Aug 2004 14:57:59 -0000
@@ -276,6 +276,7 @@
 #define ID_FILE_SETTINGS                32774
 #define ID_FILE_RECONNECT               32775
 #define ID_FILE_SEARCH                  32776
+#define ID_FILE_QUICK_CONNECT           32777
 #define IDC_DOWNLOAD                    32780
 #define IDC_DOWNLOADTO                  32781
 #define IDC_FAVORITES                   32783