X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=cc66bd460427f108ef65108d5b926daecbbed460;hp=ab901fd6193e17d8aa40d21f99eed0e7bb6359b0;hb=a25d2ec9cf8caf283624eef270998c0ba9e903dd;hpb=4df7862b00b2113dabdf52342b2c15560313f476

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index ab901fd6..cc66bd46 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -23,15 +23,20 @@
 #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();
+  setContentsMargins(0,0,0,0);
+  parent->setMinimumHeight(layout()->sizeHint().height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
 }
 
 void TopicWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -49,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);
@@ -60,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();
 }
@@ -74,6 +82,11 @@ void TopicWidget::switchEditable() {
   ui.topicEditButton->hide();
   ui.topicLineEdit->show();
   ui.topicLineEdit->setFocus();
+
+  setFixedHeight(layout()->sizeHint().height());
+  // Update the dock widget too, else it won't resize in all styles... FIXME try to sanitize this
+  qobject_cast<QWidget *>(parent())->setMinimumHeight(height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
+  qobject_cast<QWidget *>(parent())->adjustSize();
 }
 
 void TopicWidget::switchPlain() {
@@ -81,6 +94,10 @@ void TopicWidget::switchPlain() {
   ui.topicLabel->show();
   ui.topicEditButton->show();
   ui.topicLineEdit->setText(_topic);
+  setFixedHeight(layout()->sizeHint().height());
+  // Update the dock widget too, else it won't resize in all styles... FIXME try to sanitize this
+  qobject_cast<QWidget *>(parent())->setMinimumHeight(height() + 2*qApp->style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin));
+  qobject_cast<QWidget *>(parent())->adjustSize();
 }
 
 // filter for the input widget to switch back to normal mode
@@ -99,7 +116,6 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
     switchPlain();
     return true;
   }
-  
+
   return false;
 }
-