Merge pull request #294 from Modorganizer2/Develop

Release 2.1.2

1 files changed, 11 insertions, 1 deletions

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 312ff99e..9eb17be5 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -23,6 +23,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "modinfo.h"

 #include "tutorabledialog.h"

+#include "plugincontainer.h"

+#include "organizercore.h"

 

 #include <QDialog>

 #include <QSignalMapper>

@@ -76,7 +78,7 @@ public:
   * @param modInfo info structure about the mod to display

   * @param parent parend widget

   **/

- explicit ModInfoDialog(ModInfo::Ptr modInfo, const MOShared::DirectoryEntry *directory, bool unmanaged, QWidget *parent = 0);

+ explicit ModInfoDialog(ModInfo::Ptr modInfo, const MOShared::DirectoryEntry *directory, bool unmanaged, OrganizerCore *organizerCore, PluginContainer *pluginContainer,QWidget *parent = 0);

   ~ModInfoDialog();

 

   /**

@@ -155,6 +157,10 @@ private slots:
 

   void hideConflictFile();

   void unhideConflictFile();

+  int getBinaryExecuteInfo(const QFileInfo &targetInfo, QFileInfo &binaryInfo, QString &arguments);

+  void previewDataFile();

+  void openDataFile();

+

 

   void thumbnailClicked(const QString &fileName);

   void linkClicked(const QUrl &url);

@@ -185,6 +191,7 @@ private slots:
   void on_overwriteTree_itemDoubleClicked(QTreeWidgetItem *item, int column);

   void on_overwrittenTree_itemDoubleClicked(QTreeWidgetItem *item, int column);

   void on_overwriteTree_customContextMenuRequested(const QPoint &pos);

+  void on_overwrittenTree_customContextMenuRequested(const QPoint &pos);

   void on_fileTree_customContextMenuRequested(const QPoint &pos);

 

   void on_refreshButton_clicked();

@@ -208,6 +215,9 @@ private:
   QSignalMapper m_ThumbnailMapper;

   QString m_RootPath;

 

+  OrganizerCore *m_OrganizerCore;

+  PluginContainer *m_PluginContainer;

+

   QFileSystemModel *m_FileSystemModel;

   QTreeView *m_FileTree;

   QModelIndexList m_FileSelection;