# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2015-09-20 18:09:27 # Node ID 1ab6199146580076452a136344bfeee29eea9235 # Parent f520f2a1546b0aac6c7e8b47ea2e508645c05c81 removed snapshot view toolbar diff --git a/snapshotmanager.cpp b/snapshotmanager.cpp --- a/snapshotmanager.cpp +++ b/snapshotmanager.cpp @@ -86,7 +86,8 @@ void SnapshotManager::clearSnapshots() void SnapshotManager::deleteSnapshot(SnapShot* snapshot) { - delete snapshots.takeAt(snapshots.indexOf(snapshot)); + snapshots.removeOne(snapshot); + snapshot->deleteLater(); // regular delete causes a crash when triggered from menu updateMenu(); } diff --git a/snapshotview.cpp b/snapshotview.cpp --- a/snapshotview.cpp +++ b/snapshotview.cpp @@ -9,7 +9,7 @@ SnapShotView::SnapShotView(QWidget *pare _snapShot = snapShot; ui->setupUi(this); - ui->toolBar->addAction(snapShot->deleteAction()); + ui->menuSnapshot->addAction(snapShot->deleteAction()); this->setWindowTitle(snapShot->name()); unsigned numOfChannels = snapShot->data.size(); diff --git a/snapshotview.ui b/snapshotview.ui --- a/snapshotview.ui +++ b/snapshotview.ui @@ -44,17 +44,6 @@ - - - toolBar - - - TopToolBarArea - - - false - - Export CSV