projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing Topic Widget (vertical centering, scrolling and doubleclickination)
[quassel.git]
/
src
/
qtui
/
topicwidget.cpp
diff --git
a/src/qtui/topicwidget.cpp
b/src/qtui/topicwidget.cpp
index
cb646ed
..
bb55280
100644
(file)
--- 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.setupUi(this);
ui.topicLineEdit->hide();
ui.topicLineEdit->installEventFilter(this);
- ui.topic
Button
->show();
+ ui.topic
Label
->show();
}
void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
}
void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
@@
-48,7
+48,7
@@
void TopicWidget::setTopic(const QString &newtopic) {
return;
_topic = newtopic;
return;
_topic = newtopic;
- ui.topic
Button->setAndStyle
Text(newtopic);
+ ui.topic
Label->set
Text(newtopic);
ui.topicLineEdit->setText(newtopic);
switchPlain();
}
ui.topicLineEdit->setText(newtopic);
switchPlain();
}
@@
-58,19
+58,21
@@
void TopicWidget::on_topicLineEdit_returnPressed() {
switchPlain();
}
switchPlain();
}
-void TopicWidget::on_topicButton_clicked() {
+void TopicWidget::on_topic
Edit
Button_clicked() {
switchEditable();
}
void TopicWidget::switchEditable() {
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.topicLineEdit->show();
ui.topicLineEdit->setFocus();
}
void TopicWidget::switchPlain() {
ui.topicLineEdit->hide();
- ui.topicButton->show();
+ ui.topicLabel->show();
+ ui.topicEditButton->show();
ui.topicLineEdit->setText(_topic);
}
ui.topicLineEdit->setText(_topic);
}
@@
-93,3
+95,4
@@
bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
return false;
}
return false;
}
+