diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-16 11:19:31 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-16 12:22:56 -0700 |
| commit | f98ace681acbc3aba64779d639fef4686c6f3474 (patch) | |
| tree | 68341813f61cd198149abf146ac6e515e7f3c130 /qt-ui | |
| parent | 4ec27b17513cd0c6ff6eeb8e55d6f4bd8cb11b5b (diff) | |
| download | subsurface-f98ace681acbc3aba64779d639fef4686c6f3474.tar.gz | |
Dive site edit: add second "create" line without completion
We now have TWO special entries. One with just what the user has typed and
one with the first completion of that text. This way both Henrik and Linus
can get what they want. I'm not sure I love this, but it's easy to revert
if the consensus is that this is too confusing. But it's much easier to
discuss this if people can actually play with it.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/locationinformation.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/modeldelegates.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp index 39a8341cd..2e296450d 100644 --- a/qt-ui/locationinformation.cpp +++ b/qt-ui/locationinformation.cpp @@ -256,8 +256,8 @@ void LocationManagementEditHelper::handleActivation(const QModelIndex& activated activated.row(), LocationInformationModel::UUID); last_uuid = uuidIdx.data().toInt(); - // Special case: first option, add dive site. - if (activated.row() == 0) { + // Special case: first two options: add dive site. + if (activated.row() < 2) { qDebug() << "Setting to " << activated.data().toString(); emit setLineEditText(activated.data().toString()); } diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 4a54eebf0..a3978ce54 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -503,9 +503,8 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem struct dive_site *ds = get_dive_site_by_uuid( index.model()->data(index.model()->index(index.row(),0)).toInt() ); - //Special case: do not show name, but instead, show - if (index.row() == 0) { + if (index.row() < 2) { diveSiteName = index.data().toString(); bottomText = index.data(Qt::ToolTipRole).toString(); goto print_part; |