X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasesmodel.cpp;h=8df227910d1e4ca6f095c30c41cc58cfe0591504;hp=588673c20c2400937025685ab92312478b8e7892;hb=f7eb3911860f30e6bccce3c77d03fc25e87d7f93;hpb=6579cd49c867ce3fb6c99127851a881ea82d1b1b

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index 588673c2..8df22791 100644
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -30,15 +30,13 @@ AliasesModel::AliasesModel(QObject *parent)
   : QAbstractItemModel(parent),
     _configChanged(false)
 {
-//   _aliasManager.addAlias("a", "aa");
-//   _aliasManager.addAlias("b", "bb");
-//   _aliasManager.addAlias("c", "cc");
-//   _aliasManager.addAlias("d", "dd");
-
   // we need this signal for future connects to reset the data;
   connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
+  connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
   if(Client::isConnected())
     clientConnected();
+  else
+    emit modelReady(false);
 }
 
 QVariant AliasesModel::data(const QModelIndex &index, int role) const {
@@ -61,6 +59,7 @@ QVariant AliasesModel::data(const QModelIndex &index, int role) const {
       return QVariant();
     }
   case Qt::DisplayRole:
+  case Qt::EditRole:
     switch(index.column()) {
     case 0:
       return aliasManager()[index.row()].name;
@@ -192,7 +191,7 @@ void AliasesModel::commit() {
 
 void AliasesModel::initDone() {
   reset();
-  emit modelReady();
+  emit modelReady(true);
 }
 
 void AliasesModel::clientConnected() {
@@ -201,3 +200,11 @@ void AliasesModel::clientConnected() {
   connect(&_aliasManager, SIGNAL(initDone()), this, SLOT(initDone()));
   connect(&_aliasManager, SIGNAL(updated(const QVariantMap &)), this, SLOT(revert()));
 }
+
+void AliasesModel::clientDisconnected() {
+  // clear alias managers
+  _aliasManager = AliasManager();
+  _clonedAliasManager = AliasManager();
+  reset();
+  emit modelReady(false);
+}