Drag and Drop, mod management.
This commit is contained in:
parent
253067c782
commit
c92ad7dcf8
@ -173,6 +173,7 @@ gui/lwjglselectdialog.h
|
|||||||
gui/instancesettings.h
|
gui/instancesettings.h
|
||||||
gui/IconPickerDialog.h
|
gui/IconPickerDialog.h
|
||||||
gui/LegacyModEditDialog.h
|
gui/LegacyModEditDialog.h
|
||||||
|
gui/ModListView.h
|
||||||
|
|
||||||
# Base classes and infrastructure
|
# Base classes and infrastructure
|
||||||
logic/InstanceVersion.h
|
logic/InstanceVersion.h
|
||||||
@ -242,6 +243,7 @@ gui/lwjglselectdialog.cpp
|
|||||||
gui/instancesettings.cpp
|
gui/instancesettings.cpp
|
||||||
gui/IconPickerDialog.cpp
|
gui/IconPickerDialog.cpp
|
||||||
gui/LegacyModEditDialog.cpp
|
gui/LegacyModEditDialog.cpp
|
||||||
|
gui/ModListView.cpp
|
||||||
|
|
||||||
# Base classes and infrastructure
|
# Base classes and infrastructure
|
||||||
logic/InstanceFactory.cpp
|
logic/InstanceFactory.cpp
|
||||||
|
@ -33,5 +33,10 @@ LIBUTIL_EXPORT bool ensurePathExists(QString filenamepath);
|
|||||||
|
|
||||||
LIBUTIL_EXPORT bool copyPath(QString src, QString dst);
|
LIBUTIL_EXPORT bool copyPath(QString src, QString dst);
|
||||||
|
|
||||||
|
/// Opens the given file in the default application.
|
||||||
|
LIBUTIL_EXPORT void openFileInDefaultProgram ( QString filename );
|
||||||
|
|
||||||
|
/// Opens the given directory in the default application.
|
||||||
|
LIBUTIL_EXPORT void openDirInDefaultProgram ( QString dirpath, bool ensureExists = false );
|
||||||
|
|
||||||
#endif // PATHUTILS_H
|
#endif // PATHUTILS_H
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QDesktopServices>
|
||||||
|
#include <QUrl>
|
||||||
|
|
||||||
QString PathCombine(QString path1, QString path2)
|
QString PathCombine(QString path1, QString path2)
|
||||||
{
|
{
|
||||||
@ -70,7 +72,7 @@ bool ensurePathExists(QString filenamepath)
|
|||||||
{
|
{
|
||||||
QFileInfo a ( filenamepath );
|
QFileInfo a ( filenamepath );
|
||||||
QDir dir;
|
QDir dir;
|
||||||
return (dir.mkpath ( a.path() ));
|
return (dir.mkpath ( a.filePath() ));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool copyPath(QString src, QString dst)
|
bool copyPath(QString src, QString dst)
|
||||||
@ -78,12 +80,14 @@ bool copyPath(QString src, QString dst)
|
|||||||
QDir dir(src);
|
QDir dir(src);
|
||||||
if (!dir.exists())
|
if (!dir.exists())
|
||||||
return false;
|
return false;
|
||||||
|
if(!ensurePathExists(dst))
|
||||||
|
return false;
|
||||||
|
|
||||||
foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
|
foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
|
||||||
{
|
{
|
||||||
QString dst_path = dst + QDir::separator() + d;
|
QString inner_src = src+ QDir::separator() + d;
|
||||||
dir.mkpath(dst_path);
|
QString inner_dst = dst + QDir::separator() + d;
|
||||||
copyPath(src+ QDir::separator() + d, dst_path);
|
copyPath(inner_src, inner_dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (QString f, dir.entryList(QDir::Files))
|
foreach (QString f, dir.entryList(QDir::Files))
|
||||||
@ -92,3 +96,19 @@ bool copyPath(QString src, QString dst)
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void openDirInDefaultProgram ( QString path, bool ensureExists )
|
||||||
|
{
|
||||||
|
QDir parentPath;
|
||||||
|
QDir dir( path );
|
||||||
|
if(!dir.exists())
|
||||||
|
{
|
||||||
|
parentPath.mkpath(dir.absolutePath());
|
||||||
|
}
|
||||||
|
QDesktopServices::openUrl ( "file:///" + dir.absolutePath() );
|
||||||
|
}
|
||||||
|
|
||||||
|
void openFileInDefaultProgram ( QString filename )
|
||||||
|
{
|
||||||
|
QDesktopServices::openUrl ( "file:///" + QFileInfo ( filename ).absolutePath() );
|
||||||
|
}
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
|
|
||||||
#include "LegacyModEditDialog.h"
|
#include "LegacyModEditDialog.h"
|
||||||
#include "ui_LegacyModEditDialog.h"
|
#include "ui_LegacyModEditDialog.h"
|
||||||
|
#include <logic/ModList.h>
|
||||||
|
#include <pathutils.h>
|
||||||
|
#include <QFileDialog>
|
||||||
|
|
||||||
LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent ) :
|
LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent ) :
|
||||||
m_inst(inst),
|
m_inst(inst),
|
||||||
@ -22,7 +25,22 @@ LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent
|
|||||||
ui(new Ui::LegacyModEditDialog)
|
ui(new Ui::LegacyModEditDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ensurePathExists(m_inst->coreModsDir());
|
||||||
|
ensurePathExists(m_inst->mlModsDir());
|
||||||
|
ensurePathExists(m_inst->jarModsDir());
|
||||||
|
|
||||||
|
m_mods = m_inst->loaderModList();
|
||||||
|
m_coremods = m_inst->coreModList();
|
||||||
|
m_jarmods = m_inst->jarModList();
|
||||||
|
/*
|
||||||
|
m_mods->startWatching();
|
||||||
|
m_coremods->startWatching();
|
||||||
|
m_jarmods->startWatching();
|
||||||
|
*/
|
||||||
|
|
||||||
|
ui->jarModsTreeView->setModel(m_jarmods.data());
|
||||||
|
ui->coreModsTreeView->setModel(m_coremods.data());
|
||||||
|
ui->mlModTreeView->setModel(m_mods.data());
|
||||||
}
|
}
|
||||||
|
|
||||||
LegacyModEditDialog::~LegacyModEditDialog()
|
LegacyModEditDialog::~LegacyModEditDialog()
|
||||||
@ -30,6 +48,80 @@ LegacyModEditDialog::~LegacyModEditDialog()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LegacyModEditDialog::on_addCoreBtn_clicked()
|
||||||
|
{
|
||||||
|
QStringList fileNames = QFileDialog::getOpenFileNames(this, "Select Core Mods");
|
||||||
|
for(auto filename:fileNames)
|
||||||
|
{
|
||||||
|
m_coremods->installMod(QFileInfo(filename));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_addForgeBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_addJarBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_addModBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_addTexPackBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_moveJarDownBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_moveJarUpBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_rmCoreBtn_clicked()
|
||||||
|
{
|
||||||
|
auto sm = ui->coreModsTreeView->selectionModel();
|
||||||
|
auto selection = sm->selectedRows();
|
||||||
|
if(!selection.size())
|
||||||
|
return;
|
||||||
|
m_coremods->deleteMod(selection[0].row());
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_rmJarBtn_clicked()
|
||||||
|
{
|
||||||
|
auto sm = ui->jarModsTreeView->selectionModel();
|
||||||
|
auto selection = sm->selectedRows();
|
||||||
|
if(!selection.size())
|
||||||
|
return;
|
||||||
|
m_jarmods->deleteMod(selection[0].row());
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_rmModBtn_clicked()
|
||||||
|
{
|
||||||
|
auto sm = ui->mlModTreeView->selectionModel();
|
||||||
|
auto selection = sm->selectedRows();
|
||||||
|
if(!selection.size())
|
||||||
|
return;
|
||||||
|
m_mods->deleteMod(selection[0].row());
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_rmTexPackBtn_clicked()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_viewCoreBtn_clicked()
|
||||||
|
{
|
||||||
|
openDirInDefaultProgram(m_inst->coreModsDir(), true);
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_viewModBtn_clicked()
|
||||||
|
{
|
||||||
|
openDirInDefaultProgram(m_inst->mlModsDir(), true);
|
||||||
|
}
|
||||||
|
void LegacyModEditDialog::on_viewTexPackBtn_clicked()
|
||||||
|
{
|
||||||
|
//openDirInDefaultProgram(m_inst->mlModsDir(), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void LegacyModEditDialog::on_buttonBox_rejected()
|
void LegacyModEditDialog::on_buttonBox_rejected()
|
||||||
{
|
{
|
||||||
close();
|
close();
|
||||||
|
@ -31,9 +31,9 @@ public:
|
|||||||
~LegacyModEditDialog();
|
~LegacyModEditDialog();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
/* Mapped for implementation
|
|
||||||
void on_addJarBtn_clicked();
|
void on_addJarBtn_clicked();
|
||||||
void on_rmJarBtn_clicked();
|
void on_rmJarBtn_clicked();
|
||||||
void on_addForgeBtn_clicked();
|
void on_addForgeBtn_clicked();
|
||||||
void on_moveJarUpBtn_clicked();
|
void on_moveJarUpBtn_clicked();
|
||||||
void on_moveJarDownBtn_clicked();
|
void on_moveJarDownBtn_clicked();
|
||||||
@ -49,11 +49,14 @@ private slots:
|
|||||||
void on_addTexPackBtn_clicked();
|
void on_addTexPackBtn_clicked();
|
||||||
void on_rmTexPackBtn_clicked();
|
void on_rmTexPackBtn_clicked();
|
||||||
void on_viewTexPackBtn_clicked();
|
void on_viewTexPackBtn_clicked();
|
||||||
*/
|
|
||||||
// Questionable: SettingsDialog doesn't need this for some reason?
|
// Questionable: SettingsDialog doesn't need this for some reason?
|
||||||
void on_buttonBox_rejected();
|
void on_buttonBox_rejected();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::LegacyModEditDialog *ui;
|
Ui::LegacyModEditDialog *ui;
|
||||||
|
QSharedPointer<ModList> m_mods;
|
||||||
|
QSharedPointer<ModList> m_coremods;
|
||||||
|
QSharedPointer<ModList> m_jarmods;
|
||||||
|
QSharedPointer<ModList> m_texturepacks;
|
||||||
LegacyInstance * m_inst;
|
LegacyInstance * m_inst;
|
||||||
};
|
};
|
||||||
|
@ -16,9 +16,6 @@
|
|||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
@ -28,12 +25,12 @@
|
|||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="jarModsListView">
|
<widget class="ModListView" name="jarModsTreeView">
|
||||||
<property name="acceptDrops">
|
<property name="verticalScrollBarPolicy">
|
||||||
<bool>true</bool>
|
<enum>Qt::ScrollBarAlwaysOn</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="dragDropMode">
|
<property name="horizontalScrollBarPolicy">
|
||||||
<enum>QAbstractItemView::DropOnly</enum>
|
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -55,6 +52,9 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="addForgeBtn">
|
<widget class="QPushButton" name="addForgeBtn">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>MCForge</string>
|
<string>MCForge</string>
|
||||||
</property>
|
</property>
|
||||||
@ -97,10 +97,7 @@
|
|||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="coreModsListView">
|
<widget class="ModListView" name="coreModsTreeView">
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="dragDropMode">
|
<property name="dragDropMode">
|
||||||
<enum>QAbstractItemView::DropOnly</enum>
|
<enum>QAbstractItemView::DropOnly</enum>
|
||||||
</property>
|
</property>
|
||||||
@ -152,7 +149,7 @@
|
|||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="mlModListView">
|
<widget class="ModListView" name="mlModTreeView">
|
||||||
<property name="acceptDrops">
|
<property name="acceptDrops">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -210,19 +207,13 @@
|
|||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="texPackListView">
|
<widget class="ModListView" name="texPackTreeView">
|
||||||
<property name="acceptDrops">
|
<property name="acceptDrops">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="dragEnabled">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="dragDropMode">
|
<property name="dragDropMode">
|
||||||
<enum>QAbstractItemView::DropOnly</enum>
|
<enum>QAbstractItemView::DropOnly</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="defaultDropAction">
|
|
||||||
<enum>Qt::IgnoreAction</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -270,12 +261,19 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QDialogButtonBox" name="buttonBox">
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
<property name="standardButtons">
|
<property name="standardButtons">
|
||||||
<set>QDialogButtonBox::Close</set>
|
<set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>ModListView</class>
|
||||||
|
<extends>QTreeView</extends>
|
||||||
|
<header>gui/ModListView.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
32
gui/ModListView.cpp
Normal file
32
gui/ModListView.cpp
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#include "ModListView.h"
|
||||||
|
#include <QHeaderView>
|
||||||
|
#include <QMouseEvent>
|
||||||
|
|
||||||
|
ModListView::ModListView ( QWidget* parent )
|
||||||
|
:QTreeView ( parent )
|
||||||
|
{
|
||||||
|
setAllColumnsShowFocus ( true );
|
||||||
|
setExpandsOnDoubleClick ( false );
|
||||||
|
setRootIsDecorated ( false );
|
||||||
|
setSortingEnabled ( false );
|
||||||
|
setAlternatingRowColors ( true );
|
||||||
|
setSelectionMode ( QAbstractItemView::SingleSelection );
|
||||||
|
setHeaderHidden ( false );
|
||||||
|
setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||||
|
setVerticalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
|
||||||
|
setHorizontalScrollBarPolicy ( Qt::ScrollBarAsNeeded );
|
||||||
|
setDropIndicatorShown(true);
|
||||||
|
setDragEnabled(true);
|
||||||
|
setDragDropMode(QAbstractItemView::DragDrop);
|
||||||
|
viewport()->setAcceptDrops(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModListView::setModel ( QAbstractItemModel* model )
|
||||||
|
{
|
||||||
|
QTreeView::setModel ( model );
|
||||||
|
auto head = header();
|
||||||
|
head->setStretchLastSection(false);
|
||||||
|
head->setSectionResizeMode(0, QHeaderView::Stretch);
|
||||||
|
head->setSectionResizeMode(1, QHeaderView::ResizeToContents);
|
||||||
|
dropIndicatorPosition();
|
||||||
|
}
|
10
gui/ModListView.h
Normal file
10
gui/ModListView.h
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <QTreeView>
|
||||||
|
|
||||||
|
class ModListView: public QTreeView
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit ModListView ( QWidget* parent = 0 );
|
||||||
|
virtual void setModel ( QAbstractItemModel* model );
|
||||||
|
};
|
@ -64,11 +64,6 @@
|
|||||||
#include "instancedelegate.h"
|
#include "instancedelegate.h"
|
||||||
#include "IconPickerDialog.h"
|
#include "IconPickerDialog.h"
|
||||||
|
|
||||||
// Opens the given file in the default application.
|
|
||||||
// TODO: Move this somewhere.
|
|
||||||
void openFileInDefaultProgram ( QString filename );
|
|
||||||
void openDirInDefaultProgram ( QString dirpath, bool ensureExists = false );
|
|
||||||
|
|
||||||
MainWindow::MainWindow ( QWidget *parent ) :
|
MainWindow::MainWindow ( QWidget *parent ) :
|
||||||
QMainWindow ( parent ),
|
QMainWindow ( parent ),
|
||||||
ui ( new Ui::MainWindow ),
|
ui ( new Ui::MainWindow ),
|
||||||
@ -376,7 +371,8 @@ void MainWindow::on_actionEditInstMods_triggered()
|
|||||||
if (inst)
|
if (inst)
|
||||||
{
|
{
|
||||||
auto dialog = inst->createModEditDialog(this);
|
auto dialog = inst->createModEditDialog(this);
|
||||||
dialog->exec();
|
if(dialog)
|
||||||
|
dialog->exec();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -537,22 +533,6 @@ void MainWindow::openWebPage ( QUrl url )
|
|||||||
browser->exec();
|
browser->exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
void openDirInDefaultProgram ( QString path, bool ensureExists )
|
|
||||||
{
|
|
||||||
QDir parentPath;
|
|
||||||
QDir dir( path );
|
|
||||||
if(!dir.exists())
|
|
||||||
{
|
|
||||||
parentPath.mkpath(dir.absolutePath());
|
|
||||||
}
|
|
||||||
QDesktopServices::openUrl ( "file:///" + dir.absolutePath() );
|
|
||||||
}
|
|
||||||
|
|
||||||
void openFileInDefaultProgram ( QString filename )
|
|
||||||
{
|
|
||||||
QDesktopServices::openUrl ( "file:///" + QFileInfo ( filename ).absolutePath() );
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::on_actionChangeInstMCVersion_triggered()
|
void MainWindow::on_actionChangeInstMCVersion_triggered()
|
||||||
{
|
{
|
||||||
if (view->selectionModel()->selectedIndexes().count() < 1)
|
if (view->selectionModel()->selectedIndexes().count() < 1)
|
||||||
|
@ -347,9 +347,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionEditInstMods">
|
<action name="actionEditInstMods">
|
||||||
<property name="enabled">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Edit Mods</string>
|
<string>Edit Mods</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -88,8 +88,10 @@ QSharedPointer< ModList > LegacyInstance::coreModList()
|
|||||||
I_D(LegacyInstance);
|
I_D(LegacyInstance);
|
||||||
if(!d->core_mod_list)
|
if(!d->core_mod_list)
|
||||||
{
|
{
|
||||||
d->core_mod_list.reset(new ModList(coreModsDir(), QString()));
|
d->core_mod_list.reset(new ModList(coreModsDir()));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
d->core_mod_list->update();
|
||||||
return d->core_mod_list;
|
return d->core_mod_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,10 +100,12 @@ QSharedPointer< ModList > LegacyInstance::jarModList()
|
|||||||
I_D(LegacyInstance);
|
I_D(LegacyInstance);
|
||||||
if(!d->jar_mod_list)
|
if(!d->jar_mod_list)
|
||||||
{
|
{
|
||||||
auto list = new ModList(instModsDir(), modListFile());
|
auto list = new ModList(jarModsDir(), modListFile());
|
||||||
connect(list, SIGNAL(changed()), SLOT(jarModsChanged()));
|
connect(list, SIGNAL(changed()), SLOT(jarModsChanged()));
|
||||||
d->jar_mod_list.reset(list);
|
d->jar_mod_list.reset(list);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
d->jar_mod_list->update();
|
||||||
return d->jar_mod_list;
|
return d->jar_mod_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,8 +120,10 @@ QSharedPointer< ModList > LegacyInstance::loaderModList()
|
|||||||
I_D(LegacyInstance);
|
I_D(LegacyInstance);
|
||||||
if(!d->loader_mod_list)
|
if(!d->loader_mod_list)
|
||||||
{
|
{
|
||||||
d->loader_mod_list.reset(new ModList(mlModsDir(), QString()));
|
d->loader_mod_list.reset(new ModList(mlModsDir()));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
d->loader_mod_list->update();
|
||||||
return d->loader_mod_list;
|
return d->loader_mod_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,7 +139,7 @@ void LegacyInstance::cleanupAfterRun()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QString LegacyInstance::instModsDir() const
|
QString LegacyInstance::jarModsDir() const
|
||||||
{
|
{
|
||||||
return PathCombine(instanceRoot(), "instMods");
|
return PathCombine(instanceRoot(), "instMods");
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@ public:
|
|||||||
|
|
||||||
////// Directories //////
|
////// Directories //////
|
||||||
QString savesDir() const;
|
QString savesDir() const;
|
||||||
QString instModsDir() const;
|
QString jarModsDir() const;
|
||||||
QString binDir() const;
|
QString binDir() const;
|
||||||
QString mlModsDir() const;
|
QString mlModsDir() const;
|
||||||
QString coreModsDir() const;
|
QString coreModsDir() const;
|
||||||
|
@ -26,7 +26,7 @@ Mod::Mod( const QFileInfo& file )
|
|||||||
void Mod::repath ( const QFileInfo& file )
|
void Mod::repath ( const QFileInfo& file )
|
||||||
{
|
{
|
||||||
m_file = file;
|
m_file = file;
|
||||||
m_name = file.baseName();
|
m_name = file.completeBaseName();
|
||||||
m_id = file.fileName();
|
m_id = file.fileName();
|
||||||
|
|
||||||
m_type = Mod::MOD_UNKNOWN;
|
m_type = Mod::MOD_UNKNOWN;
|
||||||
|
@ -47,12 +47,15 @@ public:
|
|||||||
// change the mod's filesystem path (used by mod lists for *MAGIC* purposes)
|
// change the mod's filesystem path (used by mod lists for *MAGIC* purposes)
|
||||||
void repath(const QFileInfo &file);
|
void repath(const QFileInfo &file);
|
||||||
|
|
||||||
|
// WEAK compare operator - used for replacing mods
|
||||||
bool operator ==(const Mod &other) const
|
bool operator ==(const Mod &other) const
|
||||||
{
|
{
|
||||||
return filename() == other.filename();
|
return filename() == other.filename();
|
||||||
}
|
}
|
||||||
|
bool strongCompare(const Mod &other) const
|
||||||
|
{
|
||||||
|
return filename() == other.filename() && id() == other.id() && version() == other.version() && type() == other.type();
|
||||||
|
}
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
//FIXME: what do do with those? HMM...
|
//FIXME: what do do with those? HMM...
|
||||||
|
@ -17,12 +17,17 @@
|
|||||||
#include "ModList.h"
|
#include "ModList.h"
|
||||||
#include "LegacyInstance.h"
|
#include "LegacyInstance.h"
|
||||||
#include <pathutils.h>
|
#include <pathutils.h>
|
||||||
|
#include <QMimeData>
|
||||||
|
#include <QUrl>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QUuid>
|
||||||
|
|
||||||
ModList::ModList ( const QString& dir, const QString& list_file )
|
ModList::ModList ( const QString& dir, const QString& list_file )
|
||||||
: QAbstractListModel(), m_dir(dir), m_list_file(list_file)
|
: QAbstractListModel(), m_dir(dir), m_list_file(list_file)
|
||||||
{
|
{
|
||||||
m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs | QDir::NoSymLinks);
|
m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs | QDir::NoSymLinks);
|
||||||
m_dir.setSorting(QDir::Name);
|
m_dir.setSorting(QDir::Name);
|
||||||
|
m_list_id = QUuid::createUuid().toString();
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,24 +35,103 @@ bool ModList::update()
|
|||||||
{
|
{
|
||||||
if (!isValid())
|
if (!isValid())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
bool initial = mods.empty();
|
QList<Mod> newMods;
|
||||||
|
|
||||||
bool listChanged = false;
|
auto folderContents = m_dir.entryInfoList();
|
||||||
|
bool orderWasInvalid = false;
|
||||||
auto list = m_dir.entryInfoList();
|
|
||||||
for(auto entry: list)
|
// first, process the ordered items (if any)
|
||||||
|
int currentOrderIndex = 0;
|
||||||
|
QStringList listOrder = readListFile();
|
||||||
|
for(auto item: listOrder)
|
||||||
{
|
{
|
||||||
Mod mod(entry);
|
QFileInfo info (m_dir.filePath(item));
|
||||||
if (initial || !mods.contains(mod))
|
int idx = folderContents.indexOf(info);
|
||||||
|
// if the file from the index file exists
|
||||||
|
if(idx != -1)
|
||||||
{
|
{
|
||||||
mods.push_back(mod);
|
// remove from the actual folder contents list
|
||||||
listChanged = true;
|
folderContents.takeAt(idx);
|
||||||
|
// append the new mod
|
||||||
|
newMods.append(Mod(info));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
orderWasInvalid = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return listChanged;
|
for(auto entry: folderContents)
|
||||||
|
{
|
||||||
|
newMods.append(Mod(entry));
|
||||||
|
}
|
||||||
|
if(mods.size() != newMods.size())
|
||||||
|
{
|
||||||
|
orderWasInvalid = true;
|
||||||
|
}
|
||||||
|
else for(int i = 0; i < mods.size(); i++)
|
||||||
|
{
|
||||||
|
if(!mods[i].strongCompare(newMods[i]))
|
||||||
|
{
|
||||||
|
orderWasInvalid = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
beginResetModel();
|
||||||
|
mods.swap(newMods);
|
||||||
|
endResetModel();
|
||||||
|
if(orderWasInvalid)
|
||||||
|
{
|
||||||
|
saveListFile();
|
||||||
|
emit changed();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QStringList ModList::readListFile()
|
||||||
|
{
|
||||||
|
QStringList stringList;
|
||||||
|
if(m_list_file.isNull() || m_list_file.isEmpty())
|
||||||
|
return stringList;
|
||||||
|
|
||||||
|
QFile textFile(m_list_file);
|
||||||
|
if(!textFile.open(QIODevice::ReadOnly | QIODevice::Text))
|
||||||
|
return QStringList();
|
||||||
|
|
||||||
|
QTextStream textStream(&textFile);
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
QString line = textStream.readLine();
|
||||||
|
if (line.isNull() || line.isEmpty())
|
||||||
|
break;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
stringList.append(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
textFile.close();
|
||||||
|
return stringList;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ModList::saveListFile()
|
||||||
|
{
|
||||||
|
if(m_list_file.isNull() || m_list_file.isEmpty())
|
||||||
|
return false;
|
||||||
|
QFile textFile(m_list_file);
|
||||||
|
if(!textFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
|
||||||
|
return false;
|
||||||
|
QTextStream textStream(&textFile);
|
||||||
|
for(auto mod:mods)
|
||||||
|
{
|
||||||
|
auto pathname = mod.filename();
|
||||||
|
QString filename = pathname.fileName();
|
||||||
|
textStream << filename << endl;
|
||||||
|
}
|
||||||
|
textFile.close();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool ModList::isValid()
|
bool ModList::isValid()
|
||||||
{
|
{
|
||||||
return m_dir.exists() && m_dir.isReadable();
|
return m_dir.exists() && m_dir.isReadable();
|
||||||
@ -69,6 +153,11 @@ bool ModList::installMod ( const QFileInfo& filename, size_t index )
|
|||||||
{
|
{
|
||||||
if(mods[idx].replace(m))
|
if(mods[idx].replace(m))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
auto left = this->index(index);
|
||||||
|
auto right = this->index(index, columnCount(QModelIndex()) - 1);
|
||||||
|
emit dataChanged(left, right);
|
||||||
|
saveListFile();
|
||||||
emit changed();
|
emit changed();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -84,17 +173,25 @@ bool ModList::installMod ( const QFileInfo& filename, size_t index )
|
|||||||
if(!QFile::copy(filename.filePath(), newpath))
|
if(!QFile::copy(filename.filePath(), newpath))
|
||||||
return false;
|
return false;
|
||||||
m.repath(newpath);
|
m.repath(newpath);
|
||||||
mods.append(m);
|
beginInsertRows(QModelIndex(), index, index);
|
||||||
|
mods.insert(index,m);
|
||||||
|
endInsertRows();
|
||||||
|
saveListFile();
|
||||||
emit changed();
|
emit changed();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if(type == Mod::MOD_FOLDER)
|
else if(type == Mod::MOD_FOLDER)
|
||||||
{
|
{
|
||||||
QString newpath = PathCombine(m_dir.path(), filename.fileName());
|
|
||||||
if(!copyPath(filename.filePath(), newpath))
|
QString from = filename.filePath();
|
||||||
|
QString to = PathCombine(m_dir.path(), filename.fileName());
|
||||||
|
if(!copyPath(from, to))
|
||||||
return false;
|
return false;
|
||||||
m.repath(newpath);
|
m.repath(to);
|
||||||
mods.append(m);
|
beginInsertRows(QModelIndex(), index, index);
|
||||||
|
mods.insert(index,m);
|
||||||
|
endInsertRows();
|
||||||
|
saveListFile();
|
||||||
emit changed();
|
emit changed();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -108,7 +205,10 @@ bool ModList::deleteMod ( size_t index )
|
|||||||
Mod & m = mods[index];
|
Mod & m = mods[index];
|
||||||
if(m.destroy())
|
if(m.destroy())
|
||||||
{
|
{
|
||||||
|
beginRemoveRows(QModelIndex(), index, index);
|
||||||
mods.erase(mods.begin() + index);
|
mods.erase(mods.begin() + index);
|
||||||
|
endRemoveRows();
|
||||||
|
saveListFile();
|
||||||
emit changed();
|
emit changed();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -117,7 +217,22 @@ bool ModList::deleteMod ( size_t index )
|
|||||||
|
|
||||||
bool ModList::moveMod ( size_t from, size_t to )
|
bool ModList::moveMod ( size_t from, size_t to )
|
||||||
{
|
{
|
||||||
return false;
|
if(from < 0 || from >= mods.size())
|
||||||
|
return false;
|
||||||
|
if (to >= rowCount())
|
||||||
|
to = rowCount() - 1;
|
||||||
|
if (to == -1)
|
||||||
|
to = rowCount() - 1;
|
||||||
|
// FIXME: this should be better, but segfaults for some reason
|
||||||
|
//beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
|
||||||
|
|
||||||
|
beginResetModel();
|
||||||
|
mods.move(from, to);
|
||||||
|
endResetModel();
|
||||||
|
//endMoveRows();
|
||||||
|
saveListFile();
|
||||||
|
emit changed();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ModList::columnCount ( const QModelIndex& parent ) const
|
int ModList::columnCount ( const QModelIndex& parent ) const
|
||||||
@ -168,6 +283,111 @@ QVariant ModList::headerData ( int section, Qt::Orientation orientation, int rol
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Qt::ItemFlags ModList::flags ( const QModelIndex& index ) const
|
||||||
|
{
|
||||||
|
Qt::ItemFlags defaultFlags = QAbstractListModel::flags ( index );
|
||||||
|
if (index.isValid())
|
||||||
|
return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
|
||||||
|
else
|
||||||
|
return Qt::ItemIsDropEnabled | defaultFlags;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList ModList::mimeTypes() const
|
||||||
|
{
|
||||||
|
QStringList types;
|
||||||
|
types << "text/uri-list";
|
||||||
|
types << "application/x-mcmod";
|
||||||
|
return types;
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::DropActions ModList::supportedDropActions() const
|
||||||
|
{
|
||||||
|
// copy from outside, move from within and other mod lists
|
||||||
|
return Qt::CopyAction | Qt::MoveAction;
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::DropActions ModList::supportedDragActions() const
|
||||||
|
{
|
||||||
|
// move to other mod lists or VOID
|
||||||
|
return Qt::MoveAction;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMimeData* ModList::mimeData ( const QModelIndexList& indexes ) const
|
||||||
|
{
|
||||||
|
if(indexes.size() == 0)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
auto idx = indexes[0];
|
||||||
|
int row = idx.row();
|
||||||
|
if(row <0 || row >= mods.size())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
QMimeData * data = new QMimeData();
|
||||||
|
|
||||||
|
QStringList params;
|
||||||
|
params << m_list_id << QString::number(row);
|
||||||
|
data->setData("application/x-mcmod", params.join('|').toLatin1());
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ModList::dropMimeData ( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
|
||||||
|
{
|
||||||
|
if (action == Qt::IgnoreAction)
|
||||||
|
return true;
|
||||||
|
// check if the action is supported
|
||||||
|
if (!data || !(action & supportedDropActions()))
|
||||||
|
return false;
|
||||||
|
qDebug() << "row: " << row << " column: " << column;
|
||||||
|
if(parent.isValid())
|
||||||
|
{
|
||||||
|
row = parent.row();
|
||||||
|
column = parent.column();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (row > rowCount())
|
||||||
|
row = rowCount();
|
||||||
|
if (row == -1)
|
||||||
|
row = rowCount();
|
||||||
|
if (column == -1)
|
||||||
|
column = 0;
|
||||||
|
qDebug() << "row: " << row << " column: " << column;
|
||||||
|
|
||||||
|
// files dropped from outside?
|
||||||
|
if(data->hasFormat("text/uri-list") && data->hasUrls())
|
||||||
|
{
|
||||||
|
auto urls = data->urls();
|
||||||
|
for(auto url: urls)
|
||||||
|
{
|
||||||
|
// only local files may be dropped...
|
||||||
|
if(!url.isLocalFile())
|
||||||
|
continue;
|
||||||
|
QString filename = url.toLocalFile();
|
||||||
|
installMod(filename, row);
|
||||||
|
qDebug() << "installing: " << filename;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if(data->hasFormat("application/x-mcmod"))
|
||||||
|
{
|
||||||
|
QString sourcestr = QString::fromLatin1(data->data("application/x-mcmod"));
|
||||||
|
auto list = sourcestr.split('|');
|
||||||
|
if(list.size() != 2)
|
||||||
|
return false;
|
||||||
|
QString remoteId = list[0];
|
||||||
|
int remoteIndex = list[1].toInt();
|
||||||
|
// no moving of things between two lists
|
||||||
|
if(remoteId != m_list_id)
|
||||||
|
return false;
|
||||||
|
// no point moving to the same place...
|
||||||
|
if(row == remoteIndex)
|
||||||
|
return false;
|
||||||
|
// otherwise, move the mod :D
|
||||||
|
moveMod(remoteIndex, row);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ModList::ModList(const QString &dir)
|
ModList::ModList(const QString &dir)
|
||||||
|
@ -26,7 +26,7 @@ class ModList : public QAbstractListModel
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
ModList(const QString& dir, const QString& list_file);
|
ModList(const QString& dir, const QString& list_file = QString());
|
||||||
|
|
||||||
virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
|
virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
|
||||||
virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const
|
virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const
|
||||||
@ -56,12 +56,34 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual bool moveMod(size_t from, size_t to);
|
virtual bool moveMod(size_t from, size_t to);
|
||||||
|
|
||||||
|
/// flags, mostly to support drag&drop
|
||||||
|
virtual Qt::ItemFlags flags(const QModelIndex& index) const;
|
||||||
|
/// get data for drag action
|
||||||
|
virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
|
||||||
|
/// get the supported mime types
|
||||||
|
virtual QStringList mimeTypes() const;
|
||||||
|
/// process data from drop action
|
||||||
|
virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
|
||||||
|
/// what drag actions do we support?
|
||||||
|
virtual Qt::DropActions supportedDragActions() const;
|
||||||
|
/// what drop actions do we support?
|
||||||
|
virtual Qt::DropActions supportedDropActions() const;
|
||||||
|
|
||||||
virtual bool isValid();
|
virtual bool isValid();
|
||||||
|
|
||||||
|
QDir dir()
|
||||||
|
{
|
||||||
|
return m_dir;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
QStringList readListFile();
|
||||||
|
bool saveListFile();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void changed();
|
void changed();
|
||||||
protected:
|
protected:
|
||||||
QDir m_dir;
|
QDir m_dir;
|
||||||
QString m_list_file;
|
QString m_list_file;
|
||||||
|
QString m_list_id;
|
||||||
QList<Mod> mods;
|
QList<Mod> mods;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user