projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing multiple adds of the same entry to the input history (thanks seezer for pointi...
[quassel.git]
/
src
/
qtui
/
topicwidget.cpp
diff --git
a/src/qtui/topicwidget.cpp
b/src/qtui/topicwidget.cpp
index
f5e6c9e
..
bb55280
100644
(file)
--- 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.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) {
Q_UNUSED(previous);
}
void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
Q_UNUSED(previous);
- setTopic
ForIndex(current
);
+ setTopic
(current.sibling(current.row(), 1).data().toString()
);
}
void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
QItemSelectionRange changedArea(topLeft, bottomRight);
}
void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
QItemSelectionRange changedArea(topLeft, bottomRight);
- QModelIndex current
Index = selectionModel()->currentIndex(
);
- if(changedArea.contains(currentIndex))
- setTopic
ForIndex(currentIndex
);
+ QModelIndex current
TopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 1
);
+ if(changedArea.contains(current
Topic
Index))
+ 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;
void TopicWidget::setTopic(const QString &newtopic) {
if(_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();
}
@@
-63,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);
}
@@
-98,3
+95,4
@@
bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
return false;
}
return false;
}
+