fixes #580 - nick-dropdown is updated even if nickchange fails

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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index cd832a9..d4ca832 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -44,11 +44,9 @@ InputWidget::InputWidget(QWidget *parent)
   ui.ownNick->installEventFilter(new MouseWheelFilter(this));
   ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
 
-  QtUiSettings s;
-  bool useInputLineFont = s.value("UseInputLineFont", QVariant(false)).toBool();
-  if(useInputLineFont) {
-    ui.inputEdit->setFont(s.value("InputLineFont").value<QFont>());
-  }
+  QtUiStyleSettings s("Fonts");
+  s.notify("InputLine", this, SLOT(setCustomFont(QVariant)));
+  setCustomFont(s.value("InputLine", QFont()));
 
   ActionCollection *coll = QtUi::actionCollection();
 
@@ -61,10 +59,17 @@ InputWidget::InputWidget(QWidget *parent)
 InputWidget::~InputWidget() {
 }
 
+void InputWidget::setCustomFont(const QVariant &v) {
+  QFont font = v.value<QFont>();
+  if(font.family().isEmpty())
+    font = QApplication::font();
+  ui.inputEdit->setFont(font);
+}
+
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+  Q_UNUSED(previous)
   NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  NetworkId previousNetworkId = previous.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  if(networkId == previousNetworkId)
+  if(networkId == _networkId)
     return;
 
   setNetwork(networkId);
@@ -133,13 +138,11 @@ void InputWidget::setNetwork(NetworkId networkId) {
   const Network *network = Client::network(networkId);
   if(network) {
     connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId)));
-    if(network->me())
-      connectMyIrcUser();
-    else
-      connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+    connectMyIrcUser();
     setIdentity(network->identity());
   } else {
     setIdentity(0);
+    _networkId = 0;
   }
 }
 
@@ -152,6 +155,9 @@ void InputWidget::connectMyIrcUser() {
     connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector()));
     connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector()));
     disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+    updateNickSelector();
+  } else {
+    connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
   }
 }
 
@@ -167,8 +173,9 @@ void InputWidget::setIdentity(IdentityId identityId) {
 
   const Identity *identity = Client::identity(identityId);
   if(identity) {
-    connect(identity, SIGNAL(nicksSet(QStringList)),
-           this, SLOT(updateNickSelector()));
+    connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector()));
+  } else {
+    _identityId = 0;
   }
   updateNickSelector();
 }
@@ -182,7 +189,7 @@ void InputWidget::updateNickSelector() const {
 
   const Identity *identity = Client::identity(net->identity());
   if(!identity) {
-    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId();
+    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId() << "IdentityId:" << net->identity();
     return;
   }
 
@@ -197,8 +204,11 @@ void InputWidget::updateNickSelector() const {
     return;
 
   IrcUser *me = net->me();
-  if(me)
-    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes());
+  if(me) {
+    nicks[nickIdx] = net->myNick();
+    if(!me->userModes().isEmpty())
+      nicks[nickIdx] += QString(" (+%1)").arg(me->userModes());
+  }
       
   ui.ownNick->addItems(nicks);
 
@@ -212,7 +222,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
+
+  // we reset the nick selecter as we have no confirmation yet, that this will succeed.
+  // if the action succeeds it will be properly updated anyways.
+  updateNickSelector();
+  emit userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/nick %1").arg(newNick));
 }
 
 void InputWidget::sendText(QString text) {