Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2009-11-02 20:18:17 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2009-11-02 20:18:17 (GMT) |
| commit | ff9b04252cbdd3bda5f1d01e1bad4a077f99791b (patch) | |
| tree | 66c364a7c4491a50ff5e4519b1450337e253a35e | |
| parent | 7ff184d4c980752d6e0c4f38a2eaadce4dead6f2 (diff) | |
| download | swift-ff9b04252cbdd3bda5f1d01e1bad4a077f99791b.zip swift-ff9b04252cbdd3bda5f1d01e1bad4a077f99791b.tar.bz2 | |
Set new status when Enter is pressed in the status change input.
| -rw-r--r-- | Swift/QtUI/QtRosterHeader.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/QtRosterHeader.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Swift/QtUI/QtRosterHeader.cpp b/Swift/QtUI/QtRosterHeader.cpp index 32ad9c6..1d7ce46 100644 --- a/Swift/QtUI/QtRosterHeader.cpp +++ b/Swift/QtUI/QtRosterHeader.cpp @@ -34,23 +34,24 @@ QtRosterHeader::QtRosterHeader(QWidget* parent) : QWidget(parent) { expandedLayout_->setSpacing(0); avatarLabel_ = new QLabel(this); setAvatar(":/icons/avatar.png"); expandedLayout_->addWidget(avatarLabel_); - statusEdit_ = new QTextEdit(this); + statusEdit_ = new QtTextEdit(this); expandedLayout_->addWidget(statusEdit_); statusEdit_->resize(statusEdit_->width(), 64); statusEdit_->setAcceptRichText(false); statusEdit_->setReadOnly(false); setStatusText(""); vLayout->addLayout(expandedLayout_); expanded_ = false; avatarLabel_->hide(); statusEdit_->hide(); + connect(statusEdit_, SIGNAL(returnPressed()), this, SLOT(emitStatus())); setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); } void QtRosterHeader::mousePressEvent(QMouseEvent* event) { if (nameLabel_->underMouse() || (toolBar_->underMouse() && !statusWidget_->underMouse())) { diff --git a/Swift/QtUI/QtRosterHeader.h b/Swift/QtUI/QtRosterHeader.h index 0c11c02..0a8a41f 100644 --- a/Swift/QtUI/QtRosterHeader.h +++ b/Swift/QtUI/QtRosterHeader.h @@ -1,18 +1,19 @@ #pragma once #include <QWidget> #include <QLabel> #include <QPixmap> -#include <QTextEdit> #include <QSize> #include <QToolBar> #include "Swiften/Base/String.h" #include "Swiften/Elements/StatusShow.h" +#include "QtTextEdit.h" + class QHBoxLayout; namespace Swift { class QtStatusWidget; class QtRosterHeader : public QWidget { @@ -21,12 +22,13 @@ namespace Swift { QtRosterHeader(QWidget* parent = NULL); void setAvatar(const QString& path); void setName(const QString& name); void setStatusText(const QString& statusMessage); void setStatusType(StatusShow::Type type); QSize sizeHint() const; + public slots: void emitStatus(); signals: void onChangeStatusRequest(StatusShow::Type showType, const QString &statusMessage); private slots: void handleChangeStatusRequest(StatusShow::Type type); protected: @@ -35,13 +37,13 @@ namespace Swift { private: void resizeNameLabel(); void toggleExpanded(); QString name_; QLabel* avatarLabel_; QLabel* nameLabel_; - QTextEdit* statusEdit_; + QtTextEdit* statusEdit_; QToolBar* toolBar_; QtStatusWidget* statusWidget_; QHBoxLayout* expandedLayout_; bool expanded_; }; } |