From 7389507eb52d2dadda0eba4f52624eb2d6f63360 Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Fri, 16 Aug 2013 21:12:30 -0500
Subject: [PATCH] Created masterproxylist class

---
 apps/launcher/datafilespage.cpp               |  7 ++++---
 apps/opencs/view/doc/filedialog.cpp           |  4 +++-
 components/CMakeLists.txt                     |  1 +
 components/fileorderlist/masterproxymodel.cpp | 11 +++++++++++
 components/fileorderlist/masterproxymodel.hpp | 19 +++++++++++++++++++
 .../fileorderlist/model/pluginsproxymodel.cpp |  6 ++----
 .../fileorderlist/model/pluginsproxymodel.hpp |  2 +-
 7 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 components/fileorderlist/masterproxymodel.cpp
 create mode 100644 components/fileorderlist/masterproxymodel.hpp

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index ddeb43ab7..f674e9dc7 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -48,9 +48,10 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
     mFilterProxyModel->setSourceModel(mPluginsProxyModel);
 
     masterView->setModel (mMastersProxyModel);
-
+/*
     QCheckBox checkBox;
     unsigned int height = checkBox.sizeHint().height() + 4;
+    */
 /*
     mastersTable->setModel(mMastersProxyModel);
     mastersTable->setObjectName("MastersTable");
@@ -80,8 +81,8 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
     pluginsTable->horizontalHeader()->setStretchLastSection(true);
     pluginsTable->horizontalHeader()->hide();
 
-    pluginsTable->verticalHeader()->setDefaultSectionSize(height);
-    pluginsTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+    //pluginsTable->verticalHeader()->setDefaultSectionSize(height);
+    //pluginsTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
 
     // Adjust the tableview widths inside the splitter
     QList<int> sizeList;
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index a07b854df..d49906949 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -16,6 +16,8 @@
 
 #include <components/fileorderlist/utils/lineedit.hpp>
 
+#include "components/fileorderlist/masterproxymodel.hpp"
+
 FileDialog::FileDialog(QWidget *parent) :
     QDialog(parent)
 {
@@ -24,7 +26,7 @@ FileDialog::FileDialog(QWidget *parent) :
     // Models
     mDataFilesModel = new DataFilesModel(this);
 
-    mMastersProxyModel = new QSortFilterProxyModel();
+    mMastersProxyModel = new MasterProxyModel();
     mMastersProxyModel->setFilterRegExp("game"); //QString("^.*\\.esm"));
     mMastersProxyModel->setFilterRole (Qt::UserRole);
     mMastersProxyModel->setSourceModel(mDataFilesModel);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 529891b4c..bbaca4805 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -70,6 +70,7 @@ find_package(Qt4 COMPONENTS QtCore QtGui)
 
 if(QT_QTGUI_LIBRARY AND QT_QTCORE_LIBRARY)
    add_component_qt_dir (fileorderlist
+        masterproxymodel
        model/modelitem model/datafilesmodel model/pluginsproxymodel model/esm/esmfile
        utils/profilescombobox utils/comboboxlineedit utils/lineedit utils/naturalsort
        )
diff --git a/components/fileorderlist/masterproxymodel.cpp b/components/fileorderlist/masterproxymodel.cpp
new file mode 100644
index 000000000..ce874318d
--- /dev/null
+++ b/components/fileorderlist/masterproxymodel.cpp
@@ -0,0 +1,11 @@
+#include "masterproxymodel.hpp"
+
+MasterProxyModel::MasterProxyModel(QObject *parent) :
+    QSortFilterProxyModel(parent)
+{
+}
+
+QVariant MasterProxyModel::data(const QModelIndex &index, int role) const
+{
+    return QSortFilterProxyModel::data (index, role);
+}
diff --git a/components/fileorderlist/masterproxymodel.hpp b/components/fileorderlist/masterproxymodel.hpp
new file mode 100644
index 000000000..d0d288873
--- /dev/null
+++ b/components/fileorderlist/masterproxymodel.hpp
@@ -0,0 +1,19 @@
+#ifndef MASTERPROXYMODEL_HPP
+#define MASTERPROXYMODEL_HPP
+
+#include <QSortFilterProxyModel>
+
+class MasterProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    explicit MasterProxyModel(QObject *parent = 0);
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+signals:
+    
+public slots:
+    
+};
+
+#endif // MASTERPROXYMODEL_HPP
diff --git a/components/fileorderlist/model/pluginsproxymodel.cpp b/components/fileorderlist/model/pluginsproxymodel.cpp
index 726a3f158..4648d2833 100644
--- a/components/fileorderlist/model/pluginsproxymodel.cpp
+++ b/components/fileorderlist/model/pluginsproxymodel.cpp
@@ -9,9 +9,7 @@ PluginsProxyModel::~PluginsProxyModel()
 {
 }
 
-QVariant PluginsProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant PluginsProxyModel::data(const QModelIndex &index, int role) const
 {
-    //if (orientation != Qt::Vertical || role != Qt::DisplayRole)
-        return QSortFilterProxyModel::headerData(section, orientation, role);
-   // return section + 1;
+    return QSortFilterProxyModel::data (index, role);
 }
diff --git a/components/fileorderlist/model/pluginsproxymodel.hpp b/components/fileorderlist/model/pluginsproxymodel.hpp
index 8fde73236..08baa2338 100644
--- a/components/fileorderlist/model/pluginsproxymodel.hpp
+++ b/components/fileorderlist/model/pluginsproxymodel.hpp
@@ -12,7 +12,7 @@ public:
     explicit PluginsProxyModel(QObject *parent = 0);
     ~PluginsProxyModel();
 
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 };
 
 #endif // PLUGINSPROXYMODEL_HPP