X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=bb55280a90a47f2f60321d52562ce15f8c13b181;hp=f5e6c9e1ae93ed2c853aa659f3d5b1c67c1d92f7;hb=2a7928256ace73ac40b89b8c327cf08815da882d;hpb=1b2d3ea62867220d7bffc3b23dda1dc14d429007

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index f5e6c9e1..bb55280a 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -28,32 +28,27 @@ 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) {
   Q_UNUSED(previous);
-  setTopicForIndex(current);
+  setTopic(current.sibling(current.row(), 1).data().toString());
 }
 
 void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QItemSelectionRange changedArea(topLeft, bottomRight);
-  QModelIndex currentIndex = selectionModel()->currentIndex();
-  if(changedArea.contains(currentIndex))
-    setTopicForIndex(currentIndex);
+  QModelIndex currentTopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 1);
+  if(changedArea.contains(currentTopicIndex))
+    setTopic(currentTopicIndex.data().toString());
 };
 
-void TopicWidget::setTopicForIndex(const QModelIndex &index) {
-  QModelIndex topicIndex = index.sibling(index.row(), 1);
-  setTopic(topicIndex.data().toString());
-}
-				   
 void TopicWidget::setTopic(const QString &newtopic) {
   if(_topic == newtopic)
     return;
   
   _topic = newtopic;
-  ui.topicButton->setAndStyleText(newtopic);
+  ui.topicLabel->setText(newtopic);
   ui.topicLineEdit->setText(newtopic);
   switchPlain();
 }
@@ -63,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);
 }
 
@@ -98,3 +95,4 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
   
   return false;
 }
+