0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc tweaks

Browse Source 
* Do not nuke forge META-INF
* Disable inner DnD in mod lists on linux.
This commit is contained in:
Petr Mrázek
2013-08-28 21:52:19 +02:00
parent 93bb7c87e3
commit 78e278c1e3
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/LegacyModEditDialog.cpp
View File

@@ -35,12 +35,12 @@ LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent
ensureFolderPathExists(m_inst->jarModsDir());
m_jarmods = m_inst->jarModList();
ui->jarModsTreeView->setModel(m_jarmods.data());
#ifndef Q_OS_LINUX
// FIXME: internal DnD causes segfaults later
ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop);
// FIXME: DnD is glitched with contiguous (we move only first item in selection)
ui->jarModsTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
#endif
ui->jarModsTreeView->installEventFilter( this );
m_jarmods->startWatching();
}

6
gui/mainwindow.cpp
View File

@@ -410,9 +410,11 @@ void MainWindow::on_actionRenameInstance_triggered()
if (name.length() > 0)
{
if(ok && name.length() && name.length() <= 25)
if(ok && name.length())
{
m_selectedInstance->setName(name);
renameButton->setText(name);
renameButton->setText(name);
}
}
}

17
logic/LegacyUpdate.cpp
View File

@@ -250,7 +250,7 @@ void LegacyUpdate::jarFailed()
emitFailed("Failed to download the minecraft jar. Try again later.");
}
bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >& contained )
bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >& contained, MetainfAction metainf )
{
setStatus("Installing mods - Adding " + from.fileName());
@@ -262,15 +262,22 @@ bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >&
for(bool more=modZip.goToFirstFile(); more; more=modZip.goToNextFile())
{
QString filename = modZip.getCurrentFileName();
if(filename.contains("META-INF"))
if(filename.contains("META-INF") && metainf == LegacyUpdate::IgnoreMetainf)
{
qDebug() << "Skipping META-INF " << filename << " from " << from.fileName();
continue;
}
if(contained.contains(filename))
{
qDebug() << "Skipping already contained file " << filename << " from " << from.fileName();
continue;
}
contained.insert(filename);
qDebug() << "Adding file " << filename << " from " << from.fileName();
if(!fileInsideMod.open(QIODevice::ReadOnly))
{
qDebug() << "Failed to open " << filename << " from " << from.fileName();
return false;
}
/*
@@ -283,6 +290,7 @@ bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >&
*/
if(!zipOutFile.open(QIODevice::WriteOnly, info_out))
{
qDebug() << "Failed to open " << filename << " in the jar";
fileInsideMod.close();
return false;
}
@@ -290,6 +298,7 @@ bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >&
{
zipOutFile.close();
fileInsideMod.close();
qDebug() << "Failed to copy data of " << filename << " into the jar";
return false;
}
zipOutFile.close();
@@ -369,7 +378,7 @@ void LegacyUpdate::ModTheJar()
auto &mod = modList->operator[](i);
if (mod.type() == Mod::MOD_ZIPFILE)
{
if(!MergeZipFiles(&zipOut, mod.filename(), addedFiles))
if(!MergeZipFiles(&zipOut, mod.filename(), addedFiles, LegacyUpdate::KeepMetainf))
{
zipOut.close();
QFile::remove(runnableJar.filePath());
@@ -408,7 +417,7 @@ void LegacyUpdate::ModTheJar()
}
}
if(!MergeZipFiles(&zipOut, baseJar, addedFiles))
if(!MergeZipFiles(&zipOut, baseJar, addedFiles, LegacyUpdate::IgnoreMetainf))
{
zipOut.close();
QFile::remove(runnableJar.filePath());

7
logic/LegacyUpdate.h
View File

@@ -48,7 +48,12 @@ private slots:
void ModTheJar();
private:
bool MergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString>& contained);
enum MetainfAction
{
KeepMetainf, // the META-INF folder will be added from the merged jar
IgnoreMetainf // the META-INF from the merged jar will be ignored
};
bool MergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString>& contained, MetainfAction metainf);
private:
QSharedPointer<QNetworkReply> m_reply;