uint -> NetworkId, uint -> BufferId almost everywhere. Conversion will be made explic...

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 1ad3141..38b07a2 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -39,6 +39,7 @@
 
 #include "settingspages/fontssettingspage.h"
 #include "settingspages/identitiessettingspage.h"
+#include "settingspages/networkssettingspage.h"
 
 #include "debugconsole.h"
 
@@ -127,12 +128,12 @@ void MainWin::init() {
 
 
   // attach the BufferWidget to the PropertyMapper
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferUidRole, ui.bufferWidget, "currentBuffer");
+  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
   connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
-         ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+          ui.bufferWidget, SLOT(removeBuffer(BufferId)));
 
   // attach the NickList to the PropertyMapper
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferUidRole, nickListWidget, "currentBuffer");
+  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
   
   
 #ifdef SPUTDEV
@@ -202,6 +203,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
 void MainWin::setupSettingsDlg() {
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+  settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
 }
 
 void MainWin::connectedToCore() {
@@ -237,14 +239,14 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) {
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
   coreConnectDlg->setModal(true);
-  if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
+  //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
     coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
-  if(autoConnect) coreConnectDlg->doAutoConnect();
+  //if(autoConnect) coreConnectDlg->doAutoConnect();
 }
 
 void MainWin::coreConnectionDlgFinished(int /*code*/) {
-
   coreConnectDlg->close();
+  //exit(1);
 }