server handling: avoid to pick up the first available server from the first available network: open up the server list instead;

other small fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4421 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 7 insertions, 0 deletions

diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 484947500..5fda94784 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -148,6 +148,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 	m_pFilter = f;
 
 	QLabel * l = new QLabel(this);
+	l->setWordWrap(true);
 	l->setText(__tr2qs("<center><b>Welcome!</b><br><br>This wizard will guide you in the process of " \
 			"downloading a list of IRC servers. Please click \"<b>Next</b>\" to begin the operation.</center>"));
 	addPage(l,capt);
@@ -155,6 +156,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 
 	KviTalVBox * vb = new KviTalVBox(this);
 	l = new QLabel(vb);
+	l->setWordWrap(true);
 	l->setText(__tr2qs("<center>Here you can modify the URL that the list will be downloaded from. In most cases the default URL is acceptable.</center>"));
 
 	vb->setStretchFactor(l,1);
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 4e8359469..6cdf12408 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1531,6 +1531,9 @@ void KviServerOptionsWidget::fillServerList()
 
 	KviPointerHashTableIterator<QString,KviNetwork> it(*(g_pServerDataBase->recordDict()));
 
+	if(m_pConnectCurrent)
+		m_pConnectCurrent->setEnabled(false);
+
 	while(KviNetwork * r = it.current())
 	{
 		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
@@ -1554,6 +1557,8 @@ void KviServerOptionsWidget::fillServerList()
 		cur->setSelected(true);
 		m_pTreeWidget->setCurrentItem(cur);
 		m_pTreeWidget->scrollToItem(cur);
+		if(m_pConnectCurrent)
+			m_pConnectCurrent->setEnabled(false);
 	}
 }