From f35647f76c5435f0bec16fd46594b29d022877a0 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Wed, 13 Apr 2016 00:47:07 +0200
Subject: [PATCH] added import files into Profile menu

---
 ProfileInterface.cpp |  7 ++++++-
 ProfileInterface.h   |  1 +
 UserInterface.cpp    |  5 +++++
 UserInterface.h      |  1 +
 UserInterface.ui     | 15 ++++++++++++---
 5 files changed, 25 insertions(+), 4 deletions(-)

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 @@
     <property name="title">
      <string>&amp;Profile</string>
     </property>
-    <addaction name="actionSelect_all"/>
-    <addaction name="actionDeselect_all"/>
-    <addaction name="separator"/>
+    <addaction name="action_Import"/>
     <addaction name="actionExport_selected"/>
     <addaction name="actionDelete_selected"/>
+    <addaction name="separator"/>
+    <addaction name="actionSelect_all"/>
+    <addaction name="actionDeselect_all"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
@@ -229,6 +230,14 @@
     <string>Ctrl+R</string>
    </property>
   </action>
+  <action name="action_Import">
+   <property name="text">
+    <string>&amp;Import files...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+I</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections>