X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=2f8f5fa4e29c62f75f4c8813c2dfbd987db4993f;hb=09d19fe065125ccc6e406fa325d675387788ab3c;hp=bb55280a90a47f2f60321d52562ce15f8c13b181;hpb=982ece4929696e3817875543cab527740cc7e023;p=quassel.git

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index bb55280a..2f8f5fa4 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -20,15 +20,19 @@
 
 #include "topicwidget.h"
 
-#include <QDebug>
+#include "client.h"
+#include "iconloader.h"
+#include "networkmodel.h"
 
 TopicWidget::TopicWidget(QWidget *parent)
   : AbstractItemView(parent)
 {
   ui.setupUi(this);
-  ui.topicLineEdit->hide();
+  ui.topicEditButton->setIcon(SmallIcon("edit-rename"));
+  ui.topicLineEdit->setWordWrapEnabled(true);
   ui.topicLineEdit->installEventFilter(this);
-  ui.topicLabel->show();
+
+  connect(ui.topicLabel, SIGNAL(clickableActivated(Clickable)), SLOT(clickableActivated(Clickable)));
 }
 
 void TopicWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -46,15 +50,27 @@ 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);
   switchPlain();
 }
 
-void TopicWidget::on_topicLineEdit_returnPressed() {
-  emit topicChanged(ui.topicLineEdit->text());
+void TopicWidget::clickableActivated(const Clickable &click) {
+  NetworkId networkId = selectionModel()->currentIndex().data(NetworkModel::NetworkIdRole).value<NetworkId>();
+  click.activate(networkId, _topic);
+}
+
+void TopicWidget::on_topicLineEdit_textEntered() {
+  QModelIndex currentIdx = currentIndex();
+  if(currentIdx.isValid() && currentIdx.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
+    BufferInfo bufferInfo = currentIdx.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+    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();
 }
 
@@ -63,17 +79,15 @@ void TopicWidget::on_topicEditButton_clicked() {
 }
 
 void TopicWidget::switchEditable() {
-  ui.topicLabel->hide();
-  ui.topicEditButton->hide();
-  ui.topicLineEdit->show();
+  ui.stackedWidget->setCurrentIndex(1);
   ui.topicLineEdit->setFocus();
+  updateGeometry();
 }
 
 void TopicWidget::switchPlain() {
-  ui.topicLineEdit->hide();
-  ui.topicLabel->show();
-  ui.topicEditButton->show();
+  ui.stackedWidget->setCurrentIndex(0);
   ui.topicLineEdit->setText(_topic);
+  updateGeometry();
 }
 
 // filter for the input widget to switch back to normal mode
@@ -92,7 +106,6 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
     switchPlain();
     return true;
   }
-  
+
   return false;
 }
-