projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed focus when closing ChatViewSearchbar
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
22e0602
..
e30ba78
100644
(file)
--- a/
src/qtui/inputwidget.cpp
+++ b/
src/qtui/inputwidget.cpp
@@
-37,7
+37,6
@@
InputWidget::InputWidget(QWidget *parent)
_networkId(0)
{
ui.setupUi(this);
_networkId(0)
{
ui.setupUi(this);
- connect(ui.inputEdit, SIGNAL(textEntered(QString)), this, SLOT(sendText(QString)));
connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
@@
-59,8
+58,10
@@
InputWidget::InputWidget(QWidget *parent)
new TabCompleter(ui.inputEdit);
UiStyleSettings fs("Fonts");
new TabCompleter(ui.inputEdit);
UiStyleSettings fs("Fonts");
+ fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant)));
fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant)));
fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant)));
- setCustomFont(fs.value("InputWidget", QFont()));
+ if(fs.value("UseCustomInputWidgetFont", false).toBool())
+ setCustomFont(fs.value("InputWidget", QFont()));
UiSettings s("InputWidget");
UiSettings s("InputWidget");
@@
-92,6
+93,14
@@
InputWidget::InputWidget(QWidget *parent)
InputWidget::~InputWidget() {
}
InputWidget::~InputWidget() {
}
+void InputWidget::setUseCustomFont(const QVariant &v) {
+ if(v.toBool()) {
+ UiStyleSettings fs("Fonts");
+ setCustomFont(fs.value("InputWidget"));
+ } else
+ setCustomFont(QFont());
+}
+
void InputWidget::setCustomFont(const QVariant &v) {
QFont font = v.value<QFont>();
if(font.family().isEmpty())
void InputWidget::setCustomFont(const QVariant &v) {
QFont font = v.value<QFont>();
if(font.family().isEmpty())
@@
-313,7
+322,7
@@
void InputWidget::changeNick(const QString &newNick) const {
Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
}
Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
}
-void InputWidget::
sendText
(const QString &text) const {
+void InputWidget::
on_inputEdit_textEntered
(const QString &text) const {
Client::userInput(currentBufferInfo(), text);
}
Client::userInput(currentBufferInfo(), text);
}