projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't enable wordwrap for the input widget
[quassel.git]
/
src
/
qtui
/
topicwidget.cpp
diff --git
a/src/qtui/topicwidget.cpp
b/src/qtui/topicwidget.cpp
index
ab901fd
..
8a49d27
100644
(file)
--- a/
src/qtui/topicwidget.cpp
+++ b/
src/qtui/topicwidget.cpp
@@
-20,18
+20,18
@@
#include "topicwidget.h"
#include "topicwidget.h"
-#include <QDebug>
-
#include "client.h"
#include "client.h"
+#include "iconloader.h"
#include "networkmodel.h"
TopicWidget::TopicWidget(QWidget *parent)
: AbstractItemView(parent)
{
ui.setupUi(this);
#include "networkmodel.h"
TopicWidget::TopicWidget(QWidget *parent)
: AbstractItemView(parent)
{
ui.setupUi(this);
- ui.topicLineEdit->hide();
+ ui.topicEditButton->setIcon(SmallIcon("edit-rename"));
+ ui.topicLineEdit->setWordWrapEnabled(true);
+
ui.topicLineEdit->installEventFilter(this);
ui.topicLineEdit->installEventFilter(this);
- ui.topicLabel->show();
}
void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
}
void TopicWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
@@
-49,18
+49,21
@@
void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
void TopicWidget::setTopic(const QString &newtopic) {
if(_topic == newtopic)
return;
void TopicWidget::setTopic(const QString &newtopic) {
if(_topic == newtopic)
return;
-
+
_topic = newtopic;
ui.topicLabel->setText(newtopic);
ui.topicLineEdit->setText(newtopic);
switchPlain();
}
_topic = newtopic;
ui.topicLabel->setText(newtopic);
ui.topicLineEdit->setText(newtopic);
switchPlain();
}
-void TopicWidget::on_topicLineEdit_
returnPress
ed() {
+void TopicWidget::on_topicLineEdit_
textEnter
ed() {
QModelIndex currentIdx = currentIndex();
if(currentIdx.isValid() && currentIdx.data(NetworkModel::BufferTypeRole) == BufferInfo::ChannelBuffer) {
BufferInfo bufferInfo = currentIdx.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
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();
}
}
switchPlain();
}
@@
-70,17
+73,15
@@
void TopicWidget::on_topicEditButton_clicked() {
}
void TopicWidget::switchEditable() {
}
void TopicWidget::switchEditable() {
- ui.topicLabel->hide();
- ui.topicEditButton->hide();
- ui.topicLineEdit->show();
+ ui.stackedWidget->setCurrentIndex(1);
ui.topicLineEdit->setFocus();
ui.topicLineEdit->setFocus();
+ updateGeometry();
}
void TopicWidget::switchPlain() {
}
void TopicWidget::switchPlain() {
- ui.topicLineEdit->hide();
- ui.topicLabel->show();
- ui.topicEditButton->show();
+ ui.stackedWidget->setCurrentIndex(0);
ui.topicLineEdit->setText(_topic);
ui.topicLineEdit->setText(_topic);
+ updateGeometry();
}
// filter for the input widget to switch back to normal mode
}
// filter for the input widget to switch back to normal mode
@@
-99,7
+100,6
@@
bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
switchPlain();
return true;
}
switchPlain();
return true;
}
-
+
return false;
}
return false;
}
-