- hooks for CreateHardLink

- createprocess hook will now reroute the cwd (fixes SUM, may break other tools?)
- profile code moved to separate file
- executables can now be linked to toolbar
- category filters are now represented as a tree
- csv export of mod list
- ModInfoDialog is now "window modal" instead of "application modal"
- nexus dialog now updates the mod-id field while browsing
- right-click in nexus browser allows to open in external browser
- ini viewer is no longer modal
- bugfix: another attempt to fix processing of invalid header lines in fomod xmls (bom now handled)
- bugfix: integrated fomod installer will no longer overwrite detected mod name by the one from the xml
- bugfix: "hide file" from conflicted files list now updates that list
- bugfix: conflicted files list no longer offers to hide files in BSAs
- bugfix: pressing delete on the mod list with multiplie files selected offered to delete the wrong files
- regression: mod name guessing with the old regular expression was less likely to lead to an empty mod name. Now both are tried

1 files changed, 199 insertions, 198 deletions

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 8c91b74d..07aa8e84 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -17,201 +17,202 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MODINFODIALOG_H

-#define MODINFODIALOG_H

-

-

-#include "modinfo.h"

-#include "categories.h"

-#include "tutorabledialog.h"

-#include <directoryentry.h>

-

-#include <QDialog>

-#include <QSignalMapper>

-#include <QSettings>

-#include <QNetworkAccessManager>

-#include <QNetworkReply>

-#include <QModelIndex>

-#include <QAction>

-#include <QListWidgetItem>

-#include <QTreeWidgetItem>

-#include <QTextCodec>

-#include <set>

-

-

-namespace Ui {

-    class ModInfoDialog;

-}

-

-class QFileSystemModel;

-class QTreeView;

-

-

-/**

- * this is a larger dialog used to visualise information abount the mod.

- * @todo this would probably a good place for a plugin-system

- **/

-class ModInfoDialog : public TutorableDialog

-{

-    Q_OBJECT

-

-public:

-

-  enum ETabs {

-    TAB_TEXTFILES,

-    TAB_INIFILES,

-    TAB_IMAGES,

-    TAB_ESPS,

-    TAB_CONFLICTS,

-    TAB_CATEGORIES,

-    TAB_NEXUS,

-    TAB_FILETREE

-  };

-

-public:

-

- /**

-  * @brief constructor

-  *

-  * @param modInfo info structure about the mod to display

-  * @param parent parend widget

-  **/

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

-  ~ModInfoDialog();

-

-  /**

-   * @brief retrieve the (user-modified) version of the mod

-   *

-   * @return the (user-modified) version of the mod

-   **/

-  QString getModVersion() const;

-

-  /**

-   * @brief retrieve the (user-modified) mod id

-   *

-   * @return the (user-modified) id of the mod

-   **/

-  const int getModID() const;

-

-  /**

-   * @brief open the specified tab in the dialog if it's enabled

-   *

-   * @param tab the tab to activate

-   **/

-  void openTab(int tab);

-

-signals:

-

-  void thumbnailClickedSignal(const QString &filename);

-  void nexusLinkActivated(const QString &link);

-  void downloadRequest(const QString &link);

-  void modOpen(const QString &modName, int tab);

-  void originModified(int originID);

-  void endorseMod(ModInfo::Ptr nexusID);

-

-public slots:

-

-  void modDetailsUpdated(bool success);

-

-private:

-

-  void refreshLists();

-

-  void addCategories(const CategoryFactory &factory, const std::set<int> &enabledCategories, QTreeWidgetItem *root, int rootLevel);

-

-  void updateVersionColor();

-

-  void refreshNexusData(int modID);

-  void activateNexusTab();

-  QString getFileCategory(int categoryID);

-  bool recursiveDelete(const QModelIndex &index);

-  void deleteFile(const QModelIndex &index);

-  void openFile(const QModelIndex &index);

-  void saveIniTweaks();

-  void saveCategories(QTreeWidgetItem *currentNode);

-  void saveCurrentTextFile();

-  void saveCurrentIniFile();

-  void openTextFile(const QString &fileName);

-  void openIniFile(const QString &fileName);

-  bool allowNavigateFromTXT();

-  bool allowNavigateFromINI();

-  bool hideFile(const QString &oldName);

-  bool unhideFile(const QString &oldName);

-  void addCheckedCategories(QTreeWidgetItem *tree);

-  void refreshPrimaryCategoriesBox();

-

-private slots:

-

-  void hideConflictFile();

-  void unhideConflictFile();

-

-  void thumbnailClicked(const QString &fileName);

-  void linkClicked(const QUrl &url);

-

-  void deleteTriggered();

-  void renameTriggered();

-  void openTriggered();

-  void createDirectoryTriggered();

-  void hideTriggered();

-  void unhideTriggered();

-

-  void on_closeButton_clicked();

-  void on_saveButton_clicked();

-  void on_activateESP_clicked();

-  void on_deactivateESP_clicked();

-  void on_saveTXTButton_clicked();

-  void on_filesWidget_doubleClicked(const QModelIndex &index);

-  void on_visitNexusLabel_linkActivated(const QString &link);

-  void on_modIDEdit_editingFinished();

-  void on_versionEdit_editingFinished();

-  void on_iniFileView_textChanged();

-  void on_textFileView_textChanged();

-  void on_tabWidget_currentChanged(int index);

-  void on_primaryCategoryBox_currentIndexChanged(int index);

-  void on_categoriesTree_itemChanged(QTreeWidgetItem *item, int column);

-  void on_textFileList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);

-  void on_iniFileList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);

-  void on_iniTweaksList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);

-  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_fileTree_customContextMenuRequested(const QPoint &pos);

-

-  void on_refreshButton_clicked();

-

-  void on_endorseBtn_clicked();

-

-private:

-

-  Ui::ModInfoDialog *ui;

-

-  ModInfo::Ptr m_ModInfo;

-

-  QSignalMapper m_ThumbnailMapper;

-  QString m_RootPath;

-

-  QFileSystemModel *m_FileSystemModel;

-  QTreeView *m_FileTree;

-  QModelIndexList m_FileSelection;

-

-  QSettings *m_Settings;

-

-  std::set<int> m_RequestIDs;

-  bool m_RequestStarted;

-

-  QAction *m_DeleteAction;

-  QAction *m_RenameAction;

-  QAction *m_OpenAction;

-  QAction *m_NewFolderAction;

-  QAction *m_HideAction;

-  QAction *m_UnhideAction;

-

-  QTreeWidgetItem *m_ConflictsContextItem;

-

-  const DirectoryEntry *m_Directory;

-  FilesOrigin *m_Origin;

-  QTextCodec *m_UTF8Codec;

-

-};

-

-#endif // MODINFODIALOG_H

+#ifndef MODINFODIALOG_H
+#define MODINFODIALOG_H
+
+
+#include "modinfo.h"
+#include "categories.h"
+#include "tutorabledialog.h"
+#include <directoryentry.h>
+
+#include <QDialog>
+#include <QSignalMapper>
+#include <QSettings>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QModelIndex>
+#include <QAction>
+#include <QListWidgetItem>
+#include <QTreeWidgetItem>
+#include <QTextCodec>
+#include <set>
+
+
+namespace Ui {
+    class ModInfoDialog;
+}
+
+class QFileSystemModel;
+class QTreeView;
+
+
+/**
+ * this is a larger dialog used to visualise information abount the mod.
+ * @todo this would probably a good place for a plugin-system
+ **/
+class ModInfoDialog : public TutorableDialog
+{
+    Q_OBJECT
+
+public:
+
+  enum ETabs {
+    TAB_TEXTFILES,
+    TAB_INIFILES,
+    TAB_IMAGES,
+    TAB_ESPS,
+    TAB_CONFLICTS,
+    TAB_CATEGORIES,
+    TAB_NEXUS,
+    TAB_FILETREE
+  };
+
+public:
+
+ /**
+  * @brief constructor
+  *
+  * @param modInfo info structure about the mod to display
+  * @param parent parend widget
+  **/
+ explicit ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directory, QWidget *parent = 0);
+  ~ModInfoDialog();
+
+  /**
+   * @brief retrieve the (user-modified) version of the mod
+   *
+   * @return the (user-modified) version of the mod
+   **/
+  QString getModVersion() const;
+
+  /**
+   * @brief retrieve the (user-modified) mod id
+   *
+   * @return the (user-modified) id of the mod
+   **/
+  const int getModID() const;
+
+  /**
+   * @brief open the specified tab in the dialog if it's enabled
+   *
+   * @param tab the tab to activate
+   **/
+  void openTab(int tab);
+
+signals:
+
+  void thumbnailClickedSignal(const QString &filename);
+  void nexusLinkActivated(const QString &link);
+  void downloadRequest(const QString &link);
+  void modOpen(const QString &modName, int tab);
+  void originModified(int originID);
+  void endorseMod(ModInfo::Ptr nexusID);
+
+public slots:
+
+  void modDetailsUpdated(bool success);
+
+private:
+
+  void refreshLists();
+
+  void addCategories(const CategoryFactory &factory, const std::set<int> &enabledCategories, QTreeWidgetItem *root, int rootLevel);
+
+  void updateVersionColor();
+
+  void refreshNexusData(int modID);
+  void activateNexusTab();
+  QString getFileCategory(int categoryID);
+  bool recursiveDelete(const QModelIndex &index);
+  void deleteFile(const QModelIndex &index);
+  void openFile(const QModelIndex &index);
+  void saveIniTweaks();
+  void saveCategories(QTreeWidgetItem *currentNode);
+  void saveCurrentTextFile();
+  void saveCurrentIniFile();
+  void openTextFile(const QString &fileName);
+  void openIniFile(const QString &fileName);
+  bool allowNavigateFromTXT();
+  bool allowNavigateFromINI();
+  bool hideFile(const QString &oldName);
+  bool unhideFile(const QString &oldName);
+  void addCheckedCategories(QTreeWidgetItem *tree);
+  void refreshPrimaryCategoriesBox();
+
+private slots:
+
+  void hideConflictFile();
+  void unhideConflictFile();
+
+  void thumbnailClicked(const QString &fileName);
+  void linkClicked(const QUrl &url);
+
+  void deleteTriggered();
+  void renameTriggered();
+  void openTriggered();
+  void createDirectoryTriggered();
+  void hideTriggered();
+  void unhideTriggered();
+
+  void on_closeButton_clicked();
+  void on_saveButton_clicked();
+  void on_activateESP_clicked();
+  void on_deactivateESP_clicked();
+  void on_saveTXTButton_clicked();
+  void on_filesWidget_doubleClicked(const QModelIndex &index);
+  void on_visitNexusLabel_linkActivated(const QString &link);
+  void on_modIDEdit_editingFinished();
+  void on_versionEdit_editingFinished();
+  void on_iniFileView_textChanged();
+  void on_textFileView_textChanged();
+  void on_tabWidget_currentChanged(int index);
+  void on_primaryCategoryBox_currentIndexChanged(int index);
+  void on_categoriesTree_itemChanged(QTreeWidgetItem *item, int column);
+  void on_textFileList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void on_iniFileList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void on_iniTweaksList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  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_fileTree_customContextMenuRequested(const QPoint &pos);
+
+  void on_refreshButton_clicked();
+
+  void on_endorseBtn_clicked();
+
+private:
+
+  Ui::ModInfoDialog *ui;
+
+  ModInfo::Ptr m_ModInfo;
+  int m_OriginID;
+
+  QSignalMapper m_ThumbnailMapper;
+  QString m_RootPath;
+
+  QFileSystemModel *m_FileSystemModel;
+  QTreeView *m_FileTree;
+  QModelIndexList m_FileSelection;
+
+  QSettings *m_Settings;
+
+  std::set<int> m_RequestIDs;
+  bool m_RequestStarted;
+
+  QAction *m_DeleteAction;
+  QAction *m_RenameAction;
+  QAction *m_OpenAction;
+  QAction *m_NewFolderAction;
+  QAction *m_HideAction;
+  QAction *m_UnhideAction;
+
+  QTreeWidgetItem *m_ConflictsContextItem;
+
+  const DirectoryEntry *m_Directory;
+  FilesOrigin *m_Origin;
+  QTextCodec *m_UTF8Codec;
+
+};
+
+#endif // MODINFODIALOG_H