Fixed bug #149 Deleting a mapping actually deletes a paint when the paint tab is chosen

This commit is contained in:
baydam
2015-12-09 18:30:39 +00:00
parent 4aa71c1fb3
commit 317d87b2dd
2 changed files with 18 additions and 4 deletions
+15 -3
View File
@@ -734,7 +734,19 @@ void MainWindow::cloneItem()
else
{
qCritical() << "No selected mapping" << endl;
}
}
}
void MainWindow::deleteMappingItem()
{
if (currentSelectedItem)
{
deleteMapping(getItemId(*mappingList->currentItem()));
}
else
{
qCritical() << "No selected mapping" << endl;
}
}
void MainWindow::renameMappingItem()
@@ -1421,7 +1433,7 @@ void MainWindow::createActions()
//deletePaintAction->setShortcut(tr("CTRL+DEL"));
deletePaintAction->setStatusTip(tr("Delete item"));
deletePaintAction->setIconVisibleInMenu(false);
connect(deletePaintAction, SIGNAL(triggered()), this, SLOT(deletePaintItem()));
connect(deletePaintAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
// Rename paint.
renamePaintAction = new QAction(tr("Rename"), this);
@@ -2325,7 +2337,7 @@ QString MainWindow::locateMediaFile(const QString &uri, bool isImage)
// Set the new uri
url = QFileDialog::getOpenFileName(this,
tr("Locate file"),
tr("Locate file « %1 »").arg(filename),
directory,
tr("%1 files (%2)")
.arg(mediaType)
+3 -1
View File
@@ -91,9 +91,11 @@ private slots:
void openRecentVideo();
// Edit menu.
void deleteItem();
// Context menu.
// Context menu for mappings.
void cloneItem();
void deleteMappingItem();
void renameMappingItem();
// Context menu for paints
void deletePaintItem();
void renamePaintItem();