diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp
index 9cea36b..9aafd0a 100755
--- a/ProfileInterface.cpp
+++ b/ProfileInterface.cpp
@@ -325,8 +325,8 @@ void ProfileInterface::pictureDeleted_f(QWidget *picWidget_)
SnapmaticWidget *picWidget = (SnapmaticWidget*)picWidget_;
SnapmaticPicture *picture = picWidget->getPicture();
if (picWidget->isSelected()) { picWidget->setSelected(false); }
- picWidget->close();
widgets.remove(picWidget);
+ picWidget->close();
picWidget->deleteLater();
pictures.removeAll(picture);
delete picture;
@@ -774,3 +774,8 @@ void ProfileInterface::deleteSelected()
QMessageBox::information(this, tr("Remove selected"), tr("No Snapmatic pictures or Savegames files are selected"));
}
}
+
+void ProfileInterface::importFiles()
+{
+ on_cmdImport_clicked();
+}
diff --git a/ProfileInterface.h b/ProfileInterface.h
index 697635b..184d0c6 100755
--- a/ProfileInterface.h
+++ b/ProfileInterface.h
@@ -53,6 +53,7 @@ public slots:
void deselectAllWidgets();
void exportSelected();
void deleteSelected();
+ void importFiles();
private slots:
void on_cmdCloseProfile_clicked();
diff --git a/UserInterface.cpp b/UserInterface.cpp
index 4535659..34e0c61 100755
--- a/UserInterface.cpp
+++ b/UserInterface.cpp
@@ -250,3 +250,8 @@ void UserInterface::on_actionOptions_triggered()
optionsDialog->deleteLater();
delete optionsDialog;
}
+
+void UserInterface::on_action_Import_triggered()
+{
+ profileUI->importFiles();
+}
diff --git a/UserInterface.h b/UserInterface.h
index 7d07ab0..b0aed0a 100755
--- a/UserInterface.h
+++ b/UserInterface.h
@@ -53,6 +53,7 @@ private slots:
void on_actionExport_selected_triggered();
void on_actionDelete_selected_triggered();
void on_actionOptions_triggered();
+ void on_action_Import_triggered();
private:
ProfileDatabase *profileDB;
diff --git a/UserInterface.ui b/UserInterface.ui
index c0bc0cc..1a2cef4 100755
--- a/UserInterface.ui
+++ b/UserInterface.ui
@@ -154,11 +154,12 @@
&Profile
-
-
-
+
+
+
+
@@ -229,6 +230,14 @@
Ctrl+R
+
+
+ &Import files...
+
+
+ Ctrl+I
+
+