diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | qt-ui/profilegraphics.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 7709ff10b..4489569fb 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -280,8 +280,7 @@ void MainWindow::on_actionAddDive_triggered() // now cheat - create one dive that we use to store the info tab data in struct dive *dive = alloc_dive(); dive->when = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset(); - const char* model = strdup(tr("manually added dive").toLocal8Bit().constData()); - dive->dc.model = model; // do not use tr here since it expects a char*. + dive->dc.model = "manually added dive"; // don't translate! this is stored in the XML file record_dive(dive); select_dive(get_divenr(dive)); ui.InfoWidget->updateDiveInfo(selected_dive); @@ -826,7 +825,7 @@ void MainWindow::editCurrentDive() struct dive *d = current_dive; QString defaultDC(d->dc.model); - if (defaultDC == tr("manually added dive")){ + if (defaultDC == "manually added dive"){ disableDcShortcuts(); DivePlannerPointsModel::instance()->setPlanMode(false); ui.stackedWidget->setCurrentIndex(PLANNERPROFILE); // Planner. @@ -834,7 +833,7 @@ void MainWindow::editCurrentDive() DivePlannerPointsModel::instance()->loadFromDive(d); ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE); } - else if (defaultDC == tr("Simulated Dive")){ + else if (defaultDC == "planned dive"){ // this looks like something is missing here } } diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index 0eed723dd..d2fa701f7 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -394,7 +394,7 @@ void ProfileGraphicsView::addControlItems(struct dive *d) //Put it into the lower right corner of the profile QString defaultDC(d->dc.model); - if (defaultDC == tr("manually added dive") || defaultDC == tr("Simulated Dive")) { + if (defaultDC == "manually added dive" || defaultDC == "planned dive") { QAction *editAction = new QAction(QIcon(":edit"), tr("Edit"), this); toolBar->addAction(editAction); connect(editAction, SIGNAL(triggered()), mainWindow(), SLOT(editCurrentDive())); |