Merge with branch1.1

1 files changed, 8 insertions, 0 deletions

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index b33b743e..edfe59cf 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -100,6 +100,10 @@ public:
    **/
   void openTab(int tab);
 
+  void restoreTabState(const QByteArray &state);
+
+  QByteArray saveTabState() const;
+
 signals:
 
   void thumbnailClickedSignal(const QString &filename);
@@ -142,6 +146,8 @@ private:
   void addCheckedCategories(QTreeWidgetItem *tree);
   void refreshPrimaryCategoriesBox();
 
+  int tabIndex(const QString &tabId);
+
 private slots:
 
   void hideConflictFile();
@@ -221,6 +227,8 @@ private:
   MOShared::FilesOrigin *m_Origin;
   QTextCodec *m_UTF8Codec;
 
+  std::map<int, int> m_RealTabPos;
+
 };
 
 #endif // MODINFODIALOG_H