From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 20 Jan 2008 19:37:45 +0000 (+0000)
Subject: made the NickSelector at least show your current nick
X-Git-Tag: 0.2.0-alpha1~215
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e2aa07398950ba83b47d1772eb8fb23bc8fdd931;hp=a0754f069472a0ef611c191801d9f52b6357ef50

made the NickSelector at least show your current nick
---

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index cf6ae830..541ddb5d 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -24,10 +24,12 @@
 #include "chatwidget.h"
 #include "settings.h"
 #include "client.h"
+#include "network.h"
 
 BufferWidget::BufferWidget(QWidget *parent)
   : QWidget(parent),
-    _currentBuffer(0)
+    _currentBuffer(0),
+    _currentNetwork(0)
 {
   ui.setupUi(this);
   ui.ownNick->clear();  // TODO add nick history
@@ -76,6 +78,20 @@ void BufferWidget::setCurrentBuffer(BufferId bufferId) {
 
 }
 
+NetworkId BufferWidget::currentNetwork() const {
+  return _currentNetwork;
+}
+
+void BufferWidget::setCurrentNetwork(NetworkId networkId) {
+  Network *net = Client::network(networkId);
+  if(!net)
+    return;
+  _currentNetwork = networkId;
+  
+  ui.ownNick->clear();
+  ui.ownNick->addItem(net->myNick());
+}
+
 void BufferWidget::removeBuffer(BufferId bufferId) {
   if(!_chatWidgets.contains(bufferId))
     return;
diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index c5321b56..b805c666 100644
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -37,6 +37,7 @@ class BufferWidget : public QWidget {
   Q_OBJECT
 
   Q_PROPERTY(BufferId currentBuffer READ currentBuffer WRITE setCurrentBuffer);
+  Q_PROPERTY(NetworkId currentNetwork READ currentNetwork WRITE setCurrentNetwork);
 
 public:
   BufferWidget(QWidget *parent = 0);
@@ -52,6 +53,10 @@ signals:
 public slots:
   BufferId currentBuffer() const;
   void setCurrentBuffer(BufferId bufferId);
+
+  NetworkId currentNetwork() const;
+  void setCurrentNetwork(NetworkId networkId);
+
   void saveState();
 
 private slots:
@@ -62,6 +67,7 @@ private:
   Ui::BufferWidget ui;
   QHash<BufferId, ChatWidget *> _chatWidgets;
   BufferId _currentBuffer;
+  NetworkId _currentNetwork;
 };
 
 
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 7f8de3b1..8e2c006d 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -129,6 +129,7 @@ void MainWin::init() {
 
   // attach the BufferWidget to the PropertyMapper
   Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
+  Client::bufferModel()->mapProperty(0, NetworkModel::NetworkIdRole, ui.bufferWidget, "currentNetwork");
   connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
           ui.bufferWidget, SLOT(removeBuffer(BufferId)));
 
diff --git a/version.inc b/version.inc
index 1a2329e1..28569292 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-20";
-  quasselBuild = 364;
+  quasselBuild = 365;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;