Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-24 17:14:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-24 18:49:25 (GMT) |
| commit | ff464cee022c75258405ab01ebeedf7bc1c79aa0 (patch) | |
| tree | cf580126009cb1b1af9d94178363c5460f2be632 /Swift | |
| parent | 688175f8bb6a4ae2c6589b5faabf08e3dd15e2f1 (diff) | |
| download | swift-ff464cee022c75258405ab01ebeedf7bc1c79aa0.zip swift-ff464cee022c75258405ab01ebeedf7bc1c79aa0.tar.bz2 | |
Escape to close status edit.
Resolves: #363
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtStatusWidget.cpp | 5 | ||||
| -rw-r--r-- | Swift/QtUI/QtStatusWidget.h | 4 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Swift/QtUI/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp index e7e2e5b..a5eda8b 100644 --- a/Swift/QtUI/QtStatusWidget.cpp +++ b/Swift/QtUI/QtStatusWidget.cpp @@ -8,7 +8,6 @@ #include <QBoxLayout> #include <QComboBox> -#include <QLineEdit> #include <QLabel> #include <QFrame> #include <QPoint> @@ -20,6 +19,7 @@ #include <QListWidgetItem> #include "Swift/QtUI/QtElidingLabel.h" +#include "Swift/QtUI/QtLineEdit.h" namespace Swift { @@ -64,9 +64,10 @@ QtStatusWidget::QtStatusWidget(QWidget *parent) : QWidget(parent), editCursor_(Q page2Layout->setContentsMargins(0,0,0,0); stack_->addWidget(page2); - statusEdit_ = new QLineEdit(this); + statusEdit_ = new QtLineEdit(this); page2Layout->addWidget(statusEdit_); connect(statusEdit_, SIGNAL(returnPressed()), this, SLOT(handleEditComplete())); + connect(statusEdit_, SIGNAL(escapePressed()), this, SLOT(handleEditCancelled())); connect(statusEdit_, SIGNAL(textChanged(const QString&)), this, SLOT(generateList())); setStatusText(""); diff --git a/Swift/QtUI/QtStatusWidget.h b/Swift/QtUI/QtStatusWidget.h index 4e6aa20..7317ea5 100644 --- a/Swift/QtUI/QtStatusWidget.h +++ b/Swift/QtUI/QtStatusWidget.h @@ -16,11 +16,11 @@ class QComboBox; class QLabel; class QStackedWidget; -class QLineEdit; class QListWidget; class QListWidgetItem; namespace Swift { + class QtLineEdit; class QtStatusWidget : public QWidget { Q_OBJECT public: @@ -47,7 +47,7 @@ namespace Swift { QStackedWidget* stack_; QLabel* statusIcon_; QLabel* statusTextLabel_; - QLineEdit* statusEdit_; + QtLineEdit* statusEdit_; QString statusText_; QMap<StatusShow::Type, QIcon> icons_; StatusShow::Type selectedStatusType_; diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index d948729..d4acc50 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -78,6 +78,7 @@ sources = [ "MessageSnippet.cpp", "SystemMessageSnippet.cpp", "QtElidingLabel.cpp", + "QtLineEdit.cpp", "Roster/RosterModel.cpp", "Roster/QtTreeWidget.cpp", # "Roster/QtTreeWidgetItem.cpp", |