- Made BufferId, NetworkId and BufferInfo available from all childs of BufferItems...

- some cleanup in Client

diff --git a/src/client/client.cpp b/src/client/client.cpp
index cedc042..e7ddd7f 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -249,11 +249,7 @@ void Client::fakeInput(BufferId bufferUid, QString message) {
   if(!buff)
     qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
   else
   if(!buff)
     qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
   else

-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
-
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
+    instance()->userInput(buff->bufferInfo(), message);

 }
 
 /*** core connection stuff ***/
 }
 
 /*** core connection stuff ***/

diff --git a/src/client/client.h b/src/client/client.h
index 32ae3a9..c156764 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -98,7 +98,6 @@ public:
   static bool isSynced();
 
   static void fakeInput(BufferId bufferUid, QString message);
   static bool isSynced();
 
   static void fakeInput(BufferId bufferUid, QString message);

-  static void fakeInput(BufferInfo bufferInfo, QString message);

 
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
 
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 4f4603d..f2fc6da 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -368,6 +368,22 @@ int UserCategoryItem::categoryFromModes(const QString &modes) {
   }
   return categories.count();
 }
   }
   return categories.count();
 }

+
+QVariant UserCategoryItem::data(int column, int role) const {
+  switch(role) {
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::UserCategoryItemType;
+  case NetworkModel::BufferIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::NetworkIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::BufferInfoRole:
+    return parent()->data(column, role);
+  default:
+    return PropertyMapItem::data(column, role);
+  }
+}
+

      
 /*****************************************
 *  Irc User Items
      
 /*****************************************
 *  Irc User Items


@@ -396,9 +412,22 @@ quint64 IrcUserItem::id() const {
 }
 
 QVariant IrcUserItem::data(int column, int role) const {
 }
 
 QVariant IrcUserItem::data(int column, int role) const {

-  if(role != Qt::ToolTipRole)
+  switch(role) {
+  case NetworkModel::ItemTypeRole:
+    return NetworkModel::IrcUserItemType;
+  case NetworkModel::BufferIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::NetworkIdRole:
+    return parent()->data(column, role);
+  case NetworkModel::BufferInfoRole:
+    return parent()->data(column, role);
+  default:

     return PropertyMapItem::data(column, role);
     return PropertyMapItem::data(column, role);

+  }
+}

 
 

+QString IrcUserItem::toolTip(int column) const {
+  Q_UNUSED(column);

   return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
 }
 
   return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
 }
 

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index dfea333..8213648 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -116,8 +116,8 @@ class NetworkItem : public PropertyMapItem {
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 

-  virtual QVariant data(int column, int row) const;

   virtual quint64 id() const;
   virtual quint64 id() const;

+  virtual QVariant data(int column, int row) const;

 
   bool isActive() const;
   
 
   bool isActive() const;
   


@@ -150,7 +150,8 @@ public:
 
   QString categoryId();
   virtual quint64 id() const;
 
   QString categoryId();
   virtual quint64 id() const;

-
+  virtual QVariant data(int column, int role) const;
+  

   void addUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
   void addUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);


@@ -180,9 +181,9 @@ public:
   QString nickName() const;
   IrcUser *ircUser();
   virtual quint64 id() const;
   QString nickName() const;
   IrcUser *ircUser();
   virtual quint64 id() const;

-

   virtual QVariant data(int column, int role) const;
   virtual QVariant data(int column, int role) const;

-
+  virtual QString toolTip(int column) const;
+                                  

 private slots:
   void setNick(QString newNick);
 
 private slots:
   void setNick(QString newNick);
 


@@ -208,11 +209,10 @@ public:
   };
 
   enum itemTypes {
   };
 
   enum itemTypes {

-    AbstractItemType,
-    SimpleItemType,

     NetworkItemType,
     BufferItemType,
     NetworkItemType,
     BufferItemType,

-    NickItemType
+    UserCategoryItemType,
+    IrcUserItemType

   };
     
   NetworkModel(QObject *parent = 0);
   };
     
   NetworkModel(QObject *parent = 0);

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index dd06446..f40fa7d 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -247,10 +247,18 @@ PropertyMapItem::~PropertyMapItem() {
 }
   
 QVariant PropertyMapItem::data(int column, int role) const {
 }
   
 QVariant PropertyMapItem::data(int column, int role) const {

-  if(column >= columnCount() || role != Qt::DisplayRole)
+  if(column >= columnCount())

     return QVariant();
 
     return QVariant();
 

-  return property(_propertyOrder[column].toAscii());
+  switch(role) {
+  case Qt::ToolTipRole:
+    return toolTip(column);
+  case Qt::DisplayRole:
+    return property(_propertyOrder[column].toAscii());
+  default:
+    return QVariant();
+  }
+  

 }
 
 bool PropertyMapItem::setData(int column, const QVariant &value, int role) {
 }
 
 bool PropertyMapItem::setData(int column, const QVariant &value, int role) {

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 5ff823a..2b77c5b 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -125,6 +125,7 @@ public:
   virtual QVariant data(int column, int role) const;
   virtual bool setData(int column, const QVariant &value, int role);
 
   virtual QVariant data(int column, int role) const;
   virtual bool setData(int column, const QVariant &value, int role);
 

+  virtual QString toolTip(int column) const { Q_UNUSED(column) return QString(); }

   virtual int columnCount() const;
   
   void appendProperty(const QString &property);
   virtual int columnCount() const;
   
   void appendProperty(const QString &property);

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index af6d25a..c108628 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -34,7 +34,7 @@ InputWidget::InputWidget(QWidget *parent)
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
   connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed()));
   connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));

-  connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SLOT(userInput(BufferInfo, QString)));
+  connect(this, SIGNAL(userInput(BufferInfo, QString)), Client::instance(), SIGNAL(sendInput(BufferInfo, QString)));

   setFocusProxy(ui.inputEdit);
 }
 
   setFocusProxy(ui.inputEdit);
 }
 

diff --git a/version.inc b/version.inc
index 2e7baf6..6d99efc 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-28";
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-28";

-  quasselBuild = 391;
+  quasselBuild = 393;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;