Some cleaning of the launcher source dir

apps/launcher/CMakeLists.txt

@@ -1,54 +1,51 @@
 set(LAUNCHER
     datafilespage.cpp
-    filedialog.cpp
     graphicspage.cpp
-    lineedit.cpp
     main.cpp
     maindialog.cpp
-    naturalsort.cpp
     playpage.cpp
-    pluginsmodel.cpp
-    pluginsview.cpp
-
-    launcher.rc
 
     model/datafilesmodel.cpp
     model/modelitem.cpp
     model/esm/esmfile.cpp
+
+    utils/filedialog.cpp
+    utils/naturalsort.cpp
+    utils/lineedit.cpp
+
+    launcher.rc
 )
 
 set(LAUNCHER_HEADER
-    combobox.hpp
     datafilespage.hpp
-    filedialog.hpp
     graphicspage.hpp
-    lineedit.hpp
     maindialog.hpp
-    naturalsort.hpp
     playpage.hpp
-    pluginsmodel.hpp
-    pluginsview.hpp
 
     model/datafilesmodel.hpp
     model/modelitem.hpp
     model/esm/esmfile.hpp
+
+    utils/combobox.hpp
+    utils/lineedit.hpp
+    utils/filedialog.hpp
+    utils/naturalsort.hpp
 )
 
 # Headers that must be pre-processed
 set(LAUNCHER_HEADER_MOC
-    combobox.hpp
     datafilespage.hpp
-    filedialog.hpp
     graphicspage.hpp
-    lineedit.hpp
     maindialog.hpp
     playpage.hpp
-    pluginsmodel.hpp
-    pluginsview.hpp
 
     model/datafilesmodel.hpp
     model/modelitem.hpp
     model/esm/esmfile.hpp
+
+    utils/combobox.hpp
+    utils/lineedit.hpp
+    utils/filedialog.hpp
 )
 
 source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER} ${LAUNCHER_HEADER_MOC})
@@ -87,7 +84,7 @@ add_executable(omwlauncher
 target_link_libraries(omwlauncher
     ${Boost_LIBRARIES}
     ${OGRE_LIBRARIES}
-	${OGRE_STATIC_PLUGINS}
+    ${OGRE_STATIC_PLUGINS}
     ${QT_LIBRARIES}
     components
 )

apps/launcher/datafilespage.cpp

@@ -6,11 +6,12 @@
 #include "model/datafilesmodel.hpp"
 #include "model/esm/esmfile.hpp"
 
-#include "combobox.hpp"
+#include "utils/combobox.hpp"
+#include "utils/filedialog.hpp"
+#include "utils/lineedit.hpp"
+#include "utils/naturalsort.hpp"
+
 #include "datafilespage.hpp"
-#include "filedialog.hpp"
-#include "lineedit.hpp"
-#include "naturalsort.hpp"
 
 #include <boost/version.hpp>
 /**
@@ -110,6 +111,7 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, QWidget *parent)
     mPluginsTable->setAlternatingRowColors(true);
     mPluginsTable->setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
     mPluginsTable->horizontalHeader()->setStretchLastSection(true);
+    mPluginsTable->horizontalHeader()->hide();
 
     mPluginsTable->verticalHeader()->setDefaultSectionSize(height);
     mPluginsTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);

apps/launcher/datafilespage.hpp

@@ -6,7 +6,6 @@
 
 #include <components/files/collections.hpp>
 
-#include "combobox.hpp"
 
 class QTableView;
 class QSortFilterProxyModel;

apps/launcher/graphicspage.cpp

@@ -9,8 +9,9 @@
 #include <components/files/ogreplugin.hpp>
 #include <components/settings/settings.hpp>
 
+#include "utils/naturalsort.hpp"
+
 #include "graphicspage.hpp"
-#include "naturalsort.hpp"
 
 QString getAspect(int x, int y)
 {

apps/launcher/maindialog.cpp

@@ -1,5 +1,7 @@
 #include <QtGui>
 
+#include "utils/combobox.hpp"
+
 #include "maindialog.hpp"
 #include "playpage.hpp"
 #include "graphicspage.hpp"

apps/launcher/model/datafilesmodel.cpp

@@ -6,8 +6,9 @@
 
 #include "esm/esmfile.hpp"
 
+#include "../utils/naturalsort.hpp"
+
 #include "datafilesmodel.hpp"
-#include "../naturalsort.hpp"
 
 DataFilesModel::DataFilesModel(QObject *parent) :
     QAbstractTableModel(parent)

apps/launcher/pluginsmodel.cpp

@@ -1,149 +0,0 @@
-#include <QMimeData>
-#include <QBitArray>
-
-#include <limits>
-
-#include "pluginsmodel.hpp"
-
-PluginsModel::PluginsModel(QObject *parent) : QStandardItemModel(parent)
-{
-
-}
-
-void decodeDataRecursive(QDataStream &stream, QStandardItem *item)
-{
-    int colCount, childCount;
-    stream >> *item;
-    stream >> colCount >> childCount;
-    item->setColumnCount(colCount);
-
-    int childPos = childCount;
-
-    while(childPos > 0) {
-        childPos--;
-        QStandardItem *child = new QStandardItem();
-        decodeDataRecursive(stream, child);
-        item->setChild( childPos / colCount, childPos % colCount, child);
-    }
-}
-
-bool PluginsModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
-                                      int row, int column, const QModelIndex &parent)
-{
-    // Code largely based on QStandardItemModel::dropMimeData
-
-    // check if the action is supported
-    if (!data || !(action == Qt::CopyAction || action == Qt::MoveAction))
-        return false;
-
-    // check if the format is supported
-    QString format = QLatin1String("application/x-qstandarditemmodeldatalist");
-    if (!data->hasFormat(format))
-        return QAbstractItemModel::dropMimeData(data, action, row, column, parent);
-
-    if (row > rowCount(parent))
-        row = rowCount(parent);
-    if (row == -1)
-        row = rowCount(parent);
-    if (column == -1)
-        column = 0;
-
-    // decode and insert
-    QByteArray encoded = data->data(format);
-    QDataStream stream(&encoded, QIODevice::ReadOnly);
-
-
-    //code based on QAbstractItemModel::decodeData
-    // adapted to work with QStandardItem
-    int top = std::numeric_limits<int>::max();
-    int left = std::numeric_limits<int>::max();
-    int bottom = 0;
-    int right = 0;
-    QVector<int> rows, columns;
-    QVector<QStandardItem *> items;
-
-    while (!stream.atEnd()) {
-        int r, c;
-        QStandardItem *item = new QStandardItem();
-        stream >> r >> c;
-        decodeDataRecursive(stream, item);
-
-        rows.append(r);
-        columns.append(c);
-        items.append(item);
-        top = qMin(r, top);
-        left = qMin(c, left);
-        bottom = qMax(r, bottom);
-        right = qMax(c, right);
-    }
-
-    // insert the dragged items into the table, use a bit array to avoid overwriting items,
-    // since items from different tables can have the same row and column
-    int dragRowCount = 0;
-    int dragColumnCount = right - left + 1;
-
-    // Compute the number of continuous rows upon insertion and modify the rows to match
-    QVector<int> rowsToInsert(bottom + 1);
-    for (int i = 0; i < rows.count(); ++i)
-        rowsToInsert[rows.at(i)] = 1;
-    for (int i = 0; i < rowsToInsert.count(); ++i) {
-        if (rowsToInsert[i] == 1){
-            rowsToInsert[i] = dragRowCount;
-            ++dragRowCount;
-        }
-    }
-    for (int i = 0; i < rows.count(); ++i)
-        rows[i] = top + rowsToInsert[rows[i]];
-
-    QBitArray isWrittenTo(dragRowCount * dragColumnCount);
-
-    // make space in the table for the dropped data
-    int colCount = columnCount(parent);
-    if (colCount < dragColumnCount + column) {
-        insertColumns(colCount, dragColumnCount + column - colCount, parent);
-        colCount = columnCount(parent);
-    }
-    insertRows(row, dragRowCount, parent);
-
-    row = qMax(0, row);
-    column = qMax(0, column);
-
-    QStandardItem *parentItem = itemFromIndex (parent);
-    if (!parentItem)
-        parentItem = invisibleRootItem();
-
-    QVector<QPersistentModelIndex> newIndexes(items.size());
-    // set the data in the table
-    for (int j = 0; j < items.size(); ++j) {
-        int relativeRow = rows.at(j) - top;
-        int relativeColumn = columns.at(j) - left;
-        int destinationRow = relativeRow + row;
-        int destinationColumn = relativeColumn + column;
-        int flat = (relativeRow * dragColumnCount) + relativeColumn;
-        // if the item was already written to, or we just can't fit it in the table, create a new row
-        if (destinationColumn >= colCount || isWrittenTo.testBit(flat)) {
-            destinationColumn = qBound(column, destinationColumn, colCount - 1);
-            destinationRow = row + dragRowCount;
-            insertRows(row + dragRowCount, 1, parent);
-            flat = (dragRowCount * dragColumnCount) + relativeColumn;
-            isWrittenTo.resize(++dragRowCount * dragColumnCount);
-        }
-        if (!isWrittenTo.testBit(flat)) {
-            newIndexes[j] = index(destinationRow, destinationColumn, parentItem->index());
-            isWrittenTo.setBit(flat);
-        }
-    }
-
-    for(int k = 0; k < newIndexes.size(); k++) {
-        if (newIndexes.at(k).isValid()) {
-            parentItem->setChild(newIndexes.at(k).row(), newIndexes.at(k).column(), items.at(k));
-        } else {
-            delete items.at(k);
-        }
-    }
-
-    // The important part, tell the view what is dropped
-    emit indexesDropped(newIndexes);
-
-    return true;
-}

apps/launcher/pluginsmodel.hpp

@@ -1,21 +0,0 @@
-#ifndef PLUGINSMODEL_H
-#define PLUGINSMODEL_H
-
-#include <QStandardItemModel>
-
-class PluginsModel : public QStandardItemModel
-{
-    Q_OBJECT
-
-public:
-    PluginsModel(QObject *parent = 0);
-    ~PluginsModel() {};
-
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-
-signals:
-    void indexesDropped(QVector<QPersistentModelIndex> indexes);
-
-};
-
-#endif

apps/launcher/pluginsview.cpp

@@ -1,41 +0,0 @@
-#include <QSortFilterProxyModel>
-
-#include "pluginsview.hpp"
-
-PluginsView::PluginsView(QWidget *parent) : QTableView(parent)
-{
-    setSelectionBehavior(QAbstractItemView::SelectRows);
-    setSelectionMode(QAbstractItemView::ExtendedSelection);
-    setEditTriggers(QAbstractItemView::NoEditTriggers);
-    setAlternatingRowColors(true);
-    setDragEnabled(true);
-    setDragDropMode(QAbstractItemView::InternalMove);
-    setDropIndicatorShown(true);
-    setDragDropOverwriteMode(false);
-    setContextMenuPolicy(Qt::CustomContextMenu);
-
-}
-
-void PluginsView::startDrag(Qt::DropActions supportedActions)
-{
-    selectionModel()->select( selectionModel()->selection(),
-                              QItemSelectionModel::Select | QItemSelectionModel::Rows );
-    QAbstractItemView::startDrag( supportedActions );
-}
-
-void PluginsView::setModel(QSortFilterProxyModel *model)
-{
-    QTableView::setModel(model);
-
-    qRegisterMetaType< QVector<QPersistentModelIndex> >();
-
-    connect(model->sourceModel(), SIGNAL(indexesDropped(QVector<QPersistentModelIndex>)),
-            this, SLOT(selectIndexes(QVector<QPersistentModelIndex>)), Qt::QueuedConnection);
-}
-
-void PluginsView::selectIndexes( QVector<QPersistentModelIndex> aIndexes )
-{
-    selectionModel()->clearSelection();
-    foreach( QPersistentModelIndex pIndex, aIndexes )
-        selectionModel()->select( pIndex, QItemSelectionModel::Select | QItemSelectionModel::Rows );
-}

apps/launcher/pluginsview.hpp

@@ -1,29 +0,0 @@
-#ifndef PLUGINSVIEW_H
-#define PLUGINSVIEW_H
-
-#include <QTableView>
-
-#include "pluginsmodel.hpp"
-
-class QSortFilterProxyModel;
-
-class PluginsView : public QTableView
-{
-    Q_OBJECT
-public:
-    PluginsView(QWidget *parent = 0);
-
-    PluginsModel* model() const
-        { return qobject_cast<PluginsModel*>(QAbstractItemView::model()); }
-
-    void startDrag(Qt::DropActions supportedActions);
-    void setModel(QSortFilterProxyModel *model);
-
-public slots:
-    void selectIndexes(QVector<QPersistentModelIndex> aIndexes);
-
-};
-
-Q_DECLARE_METATYPE(QVector<QPersistentModelIndex>)
-
-#endif