mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve the tag widget to allow us to tab to the next field

Browse source 
If the last key that went in ended a tag and the next key is a tab -
deliver that to the TabWidget instead so we can navigate between input
fields.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-16 15:12:46 +09:00
parent 531a5db2f1
commit 6d42a99e7f
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/maintab.cpp
View file

@ -335,6 +335,11 @@ void MainTab::clearEquipment()
weightModel->clear(); weightModel->clear();
} }
void MainTab::nextInputField(QKeyEvent *event)
{
keyPressEvent(event);
}
void MainTab::clearInfo() void MainTab::clearInfo()
{ {
ui.sacText->clear(); ui.sacText->clear();

1
qt-ui/maintab.h
View file

@ -66,6 +66,7 @@ public:
void initialUiSetup(); void initialUiSetup();
bool isEditing(); bool isEditing();
void updateCoordinatesText(qreal lat, qreal lon); void updateCoordinatesText(qreal lat, qreal lon);
void nextInputField(QKeyEvent *event);
public public
slots: slots:
void addCylinder_clicked(); void addCylinder_clicked();

10
qt-ui/tagwidget.cpp
View file

@ -4,8 +4,9 @@
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QSettings> #include <QSettings>
#include <QFont> #include <QFont>
#include "mainwindow.h"
TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL) TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL), lastFinishedTag(false)
{ {
connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(reparse())); connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(reparse()));
connect(this, SIGNAL(textChanged()), this, SLOT(reparse())); connect(this, SIGNAL(textChanged()), this, SLOT(reparse()));
@ -176,6 +177,7 @@ void TagWidget::keyPressEvent(QKeyEvent *e)
{ {
QPair<int, int> pos; QPair<int, int> pos;
QAbstractItemView *popup; QAbstractItemView *popup;
bool finishedTag = false;
switch (e->key()) { switch (e->key()) {
case Qt::Key_Escape: case Qt::Key_Escape:
pos = getCursorTagPosition(); pos = getCursorTagPosition();
@ -199,13 +201,17 @@ void TagWidget::keyPressEvent(QKeyEvent *e)
if (popup) if (popup)
popup->hide(); popup->hide();
} }
finishedTag = true;
} }
if (e->key() == Qt::Key_Tab || e->key() == Qt::Key_Return) { // let's pretend this is a comma instead if (e->key() == Qt::Key_Tab && lastFinishedTag) { // if we already end in comma, go to next/prev field
MainWindow::instance()->information()->nextInputField(e); // by sending the key event to the MainTab widget
} else if (e->key() == Qt::Key_Tab || e->key() == Qt::Key_Return) { // otherwise let's pretend this is a comma instead
QKeyEvent fakeEvent(e->type(), Qt::Key_Comma, e->modifiers(), QString(",")); QKeyEvent fakeEvent(e->type(), Qt::Key_Comma, e->modifiers(), QString(","));
GroupedLineEdit::keyPressEvent(&fakeEvent); GroupedLineEdit::keyPressEvent(&fakeEvent);
} else { } else {
GroupedLineEdit::keyPressEvent(e); GroupedLineEdit::keyPressEvent(e);
} }
lastFinishedTag = finishedTag;
} }
void TagWidget::wheelEvent(QWheelEvent *event) void TagWidget::wheelEvent(QWheelEvent *event)

1
qt-ui/tagwidget.h
View file

@ -27,6 +27,7 @@ protected:
private: private:
QCompleter *m_completer; QCompleter *m_completer;
bool lastFinishedTag;
}; };
#endif // TAGWIDGET_H #endif // TAGWIDGET_H