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

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index cb646eda..bb55280a 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -28,7 +28,7 @@ TopicWidget::TopicWidget(QWidget *parent)
   ui.setupUi(this);
   ui.topicLineEdit->hide();
   ui.topicLineEdit->installEventFilter(this);
-  ui.topicButton->show();
+  ui.topicLabel->show();
 }
 
 void TopicWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
@@ -48,7 +48,7 @@ void TopicWidget::setTopic(const QString &newtopic) {
     return;
   
   _topic = newtopic;
-  ui.topicButton->setAndStyleText(newtopic);
+  ui.topicLabel->setText(newtopic);
   ui.topicLineEdit->setText(newtopic);
   switchPlain();
 }
@@ -58,19 +58,21 @@ void TopicWidget::on_topicLineEdit_returnPressed() {
   switchPlain();
 }
 
-void TopicWidget::on_topicButton_clicked() {
+void TopicWidget::on_topicEditButton_clicked() {
   switchEditable();
 }
 
 void TopicWidget::switchEditable() {
-  ui.topicButton->hide();
+  ui.topicLabel->hide();
+  ui.topicEditButton->hide();
   ui.topicLineEdit->show();
   ui.topicLineEdit->setFocus();
 }
 
 void TopicWidget::switchPlain() {
   ui.topicLineEdit->hide();
-  ui.topicButton->show();
+  ui.topicLabel->show();
+  ui.topicEditButton->show();
   ui.topicLineEdit->setText(_topic);
 }
 
@@ -93,3 +95,4 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
   
   return false;
 }
+