X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=cc66bd460427f108ef65108d5b926daecbbed460;hp=7d2d90bddbe2ba3985e6e35c4b82d60de777a503;hb=f448828fb29f3d23d9306f777cd264a13fde0e9a;hpb=9861cef46e8a052140070b4c643092f9c62aa6df

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index 7d2d90bd..cc66bd46 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -23,12 +23,15 @@
 #include <QDebug>
 
 #include "client.h"
+#include "iconloader.h"
 #include "networkmodel.h"
 
 TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
   ui.setupUi(this);
+  ui.topicEditButton->setPixmap(BarIcon("edit-rename"));
+
   ui.topicLineEdit->hide();
   ui.topicLineEdit->installEventFilter(this);
   ui.topicLabel->show();
@@ -51,7 +54,7 @@ void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
 void TopicWidget::setTopic(const QString &newtopic) {
   if(_topic == newtopic)
     return;
-  
+
   _topic = newtopic;
   ui.topicLabel->setText(newtopic);
   ui.topicLineEdit->setText(newtopic);
@@ -62,7 +65,10 @@ void TopicWidget::on_topicLineEdit_returnPressed() {
   QModelIndex currentIdx = currentIndex();
   if(currentIdx.isValid() && currentIdx.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
     BufferInfo bufferInfo = currentIdx.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-    Client::userInput(bufferInfo, QString("/topic %1").arg(ui.topicLineEdit->text()));
+    if(ui.topicLineEdit->text().isEmpty())
+      Client::userInput(bufferInfo, QString("/quote TOPIC %1 :").arg(bufferInfo.bufferName()));
+    else
+      Client::userInput(bufferInfo, QString("/topic %1").arg(ui.topicLineEdit->text()));
   }
   switchPlain();
 }
@@ -110,6 +116,6 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
     switchPlain();
     return true;
   }
-  
+
   return false;
 }