removing hardcoded aliases from userinputhandler. some minor, internal improvements...

[quassel.git] / src / qtui / settingspages / aliasesmodel.cpp

diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp
index 588673c..8df2279 100644 (file)
--- a/src/qtui/settingspages/aliasesmodel.cpp
+++ b/src/qtui/settingspages/aliasesmodel.cpp
@@ -30,15 +30,13 @@ AliasesModel::AliasesModel(QObject *parent)
   : QAbstractItemModel(parent),
     _configChanged(false)
 {
   : 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()));
   // 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();
   if(Client::isConnected())
     clientConnected();

+  else
+    emit modelReady(false);

 }
 
 QVariant AliasesModel::data(const QModelIndex &index, int role) const {
 }
 
 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:
       return QVariant();
     }
   case Qt::DisplayRole:

+  case Qt::EditRole:

     switch(index.column()) {
     case 0:
       return aliasManager()[index.row()].name;
     switch(index.column()) {
     case 0:
       return aliasManager()[index.row()].name;


@@ -192,7 +191,7 @@ void AliasesModel::commit() {
 
 void AliasesModel::initDone() {
   reset();
 
 void AliasesModel::initDone() {
   reset();

-  emit modelReady();
+  emit modelReady(true);

 }
 
 void AliasesModel::clientConnected() {
 }
 
 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()));
 }
   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);
+}