From 0f5664e584fc402be13754d9ee4ee33e1eca3e25 Mon Sep 17 00:00:00 2001 From: Yosef Hamza Date: Thu, 3 Apr 2014 21:16:15 +0200 Subject: [PATCH] Edit name option for bookmarks Add the option to edit the name of a bookmark to be more meaningful for the user they prefer. It works just as simple bookmarks and can be removed and hidden. It won't accept names longer than 22 characters because longer names will display as garbage text. Also changed the code from displaying flag depending on event name to depending on event type. Signed-off-by: Yousef Hamza Signed-off-by: Dirk Hohndel --- qt-ui/profile/diveeventitem.cpp | 2 +- qt-ui/profile/profilewidget2.cpp | 32 ++++++++++++++++++++++++++++++++ qt-ui/profile/profilewidget2.h | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp index 3f75ab10a..54e3e4cbf 100644 --- a/qt-ui/profile/diveeventitem.cpp +++ b/qt-ui/profile/diveeventitem.cpp @@ -59,7 +59,7 @@ void DiveEventItem::setupPixmap() #define EVENT_PIXMAP(PIX) QPixmap(QString(PIX)).scaled(20, 20, Qt::KeepAspectRatio, Qt::SmoothTransformation) if (!internalEvent->name) { setPixmap(EVENT_PIXMAP(":warning")); - } else if ((strcmp(internalEvent->name, "bookmark") == 0)) { + } else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) { setPixmap(EVENT_PIXMAP(":flag")); } else if (strcmp(internalEvent->name, "heading") == 0) { setPixmap(EVENT_PIXMAP(":flag")); diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index a58244689..922836d65 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #ifndef QT_NO_DEBUG #include @@ -709,6 +710,13 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) action->setData(QVariant::fromValue(item)); connect(action, SIGNAL(triggered(bool)), this, SLOT(hideEvents())); m.addAction(action); + if(item->getEvent()->type == SAMPLE_EVENT_BOOKMARK){ + action = new QAction(&m); + action->setText(tr("Edit name")); + action->setData(QVariant::fromValue(item)); + connect(action, SIGNAL(triggered(bool)), this, SLOT(editName())); + m.addAction(action); + } } bool some_hidden = false; for (int i = 0; i < evn_used; i++) { @@ -810,3 +818,27 @@ void ProfileWidget2::setPrintMode(bool mode, bool grayscale) printMode = mode; isGrayscale = mode ? grayscale : false; } + +void ProfileWidget2::editName() +{ + QAction *action = qobject_cast(sender()); + DiveEventItem *item = static_cast(action->data().value()); + struct event *event = item->getEvent(); + bool ok; + QString newName = QInputDialog::getText(MainWindow::instance(), tr("Edit name of bookmark"), + tr("Custom name:"), QLineEdit::Normal, + event->name, &ok); + if(ok && !newName.isEmpty()){ + if(newName.length() > 22){//longer names will display as garbage. + QMessageBox lengthWarning; + lengthWarning.setText("Name is too long!"); + lengthWarning.exec(); + return; + } + const char* temp; + temp = newName.toStdString().c_str(); + strcpy(event->name, temp); + remember_event(temp); + } + replot(); +} diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h index eb7486e8d..d00cb26c1 100644 --- a/qt-ui/profile/profilewidget2.h +++ b/qt-ui/profile/profilewidget2.h @@ -79,6 +79,7 @@ slots: // Necessary to call from QAction's signals. void hideEvents(); void unhideEvents(); void removeEvent(); + void editName(); protected: virtual void resizeEvent(QResizeEvent *event);