X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.cpp;h=ac2ab6607ae2a4e8829fa67da11dbaaae6106d68;hp=75e6e8efff848e0df70ec77369aac98766e77e42;hb=c351c94e52a01571c34a18ddb5947b9e1f771d8c;hpb=846375c0a783fa99c0780a0d701ccb21e0bffd61

diff --git a/src/uisupport/networkmodelcontroller.cpp b/src/uisupport/networkmodelcontroller.cpp
index 75e6e8ef..ac2ab660 100644
--- a/src/uisupport/networkmodelcontroller.cpp
+++ b/src/uisupport/networkmodelcontroller.cpp
@@ -153,9 +153,18 @@ void NetworkModelController::removeBuffers(const QModelIndexList &indexList) {
   if(inactive.count()) {
     msg = tr("Do you want to delete the following buffer(s) permanently?", 0, inactive.count());
     msg += "<ul>";
-    foreach(BufferInfo info, inactive)
-      msg += QString("<li>%1</li>").arg(info.bufferName());
+    int count = 0;
+    foreach(BufferInfo info, inactive) {
+      if(count < 10) {
+	msg += QString("<li>%1</li>").arg(info.bufferName());
+	count++;
+      }
+      else
+	break;
+    }
     msg += "</ul>";
+    if(count > 9 && inactive.size() - count != 0)
+      msg += tr("...and <b>%1</b> more<br><br>").arg(inactive.size() - count);
     msg += tr("<b>Note:</b> This will delete all related data, including all backlog data, from the core's database and cannot be undone.");
     if(inactive.count() != indexList.count())
       msg += tr("<br>Active channel buffers cannot be deleted, please part the channel first.");
@@ -384,8 +393,8 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action)
       case NickCtcpTime:
         Client::userInput(bufferInfo, QString("/CTCP %1 TIME").arg(nick));
         break;
-      case NickCtcpFinger:
-        Client::userInput(bufferInfo, QString("/CTCP %1 FINGER").arg(nick));
+      case NickCtcpClientinfo:
+        Client::userInput(bufferInfo, QString("/CTCP %1 CLIENTINFO").arg(nick));
         break;
       case NickOp:
         Client::userInput(bufferInfo, QString("/OP %1").arg(nick));
@@ -393,6 +402,12 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action)
       case NickDeop:
         Client::userInput(bufferInfo, QString("/DEOP %1").arg(nick));
         break;
+      case NickHalfop:
+        Client::userInput(bufferInfo, QString("/HALFOP %1").arg(nick));
+        break;
+      case NickDehalfop:
+        Client::userInput(bufferInfo, QString("/DEHALFOP %1").arg(nick));
+        break;
       case NickVoice:
         Client::userInput(bufferInfo, QString("/VOICE %1").arg(nick));
         break;