games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Merge pull request #3393 from Laserlicht/mod_drag

Browse Source 
[Launcher] mod manager drag'n'drop
This commit is contained in:
Ivan Savenko 2023-12-26 15:33:50 +02:00 committed by GitHub
commit 361b584186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/launcherdirs.cpp
View File

@ -34,3 +34,8 @@ QString CLauncherDirs::modsPath()
{
return pathToQString(VCMIDirs::get().userDataPath() / "Mods");
}
QString CLauncherDirs::mapsPath()
{
return pathToQString(VCMIDirs::get().userDataPath() / "Maps");
}

1
launcher/launcherdirs.h
View File

@ -19,4 +19,5 @@ public:
QString downloadsPath();
QString modsPath();
QString mapsPath();
};

62
launcher/modManager/cmodlistview_moc.cpp
View File

@ -48,6 +48,43 @@ void CModListView::changeEvent(QEvent *event)
QWidget::changeEvent(event);
}
void CModListView::dragEnterEvent(QDragEnterEvent* event)
{
if(event->mimeData()->hasUrls())
for(const auto & url : event->mimeData()->urls())
for(const auto & ending : QStringList({".zip", ".h3m", ".h3c", ".vmap", ".vcmp"}))
if(url.fileName().endsWith(ending, Qt::CaseInsensitive))
{
event->acceptProposedAction();
return;
}
}
void CModListView::dropEvent(QDropEvent* event)
{
const QMimeData* mimeData = event->mimeData();
if(mimeData->hasUrls())
{
const QList<QUrl> urlList = mimeData->urls();
for (const auto & url : urlList)
{
QString urlStr = url.toString();
QString fileName = url.fileName();
if(urlStr.endsWith(".zip", Qt::CaseInsensitive))
downloadFile(fileName.toLower()
// mod name currently comes from zip file -> remove suffixes from github zip download
.replace(QRegularExpression("-[0-9a-f]{40}"), "")
.replace(QRegularExpression("-vcmi-.+\\.zip"), ".zip")
.replace("-main.zip", ".zip")
, urlStr, "mods", 0);
else
downloadFile(fileName, urlStr, "mods", 0);
}
}
}
void CModListView::setupFilterModel()
{
filterModel = new CModFilterModel(modModel, this);
@ -100,6 +137,8 @@ CModListView::CModListView(QWidget * parent)
{
ui->setupUi(this);
setAcceptDrops(true);
setupModModel();
setupFilterModel();
setupModsView();
@ -677,15 +716,18 @@ void CModListView::hideProgressBar()
void CModListView::installFiles(QStringList files)
{
QStringList mods;
QStringList maps;
QStringList images;
QVector<QVariantMap> repositories;
// TODO: some better way to separate zip's with mods and downloaded repository files
for(QString filename : files)
{
if(filename.endsWith(".zip"))
if(filename.endsWith(".zip", Qt::CaseInsensitive))
mods.push_back(filename);
if(filename.endsWith(".json"))
else if(filename.endsWith(".h3m", Qt::CaseInsensitive) || filename.endsWith(".h3c", Qt::CaseInsensitive) || filename.endsWith(".vmap", Qt::CaseInsensitive) || filename.endsWith(".vcmp", Qt::CaseInsensitive))
maps.push_back(filename);
else if(filename.endsWith(".json", Qt::CaseInsensitive))
{
//download and merge additional files
auto repoData = JsonUtils::JsonFromFile(filename).toMap();
@ -709,7 +751,7 @@ void CModListView::installFiles(QStringList files)
}
repositories.push_back(repoData);
}
if(filename.endsWith(".png"))
else if(filename.endsWith(".png", Qt::CaseInsensitive))
images.push_back(filename);
}
@ -718,6 +760,9 @@ void CModListView::installFiles(QStringList files)
if(!mods.empty())
installMods(mods);
if(!maps.empty())
installMaps(maps);
if(!images.empty())
loadScreenshots();
}
@ -794,6 +839,16 @@ void CModListView::installMods(QStringList archives)
QFile::remove(archive);
}
void CModListView::installMaps(QStringList maps)
{
QString destDir = CLauncherDirs::get().mapsPath() + "/";
for(QString map : maps)
{
QFile(map).rename(destDir + map.section('/', -1, -1));
}
}
void CModListView::on_refreshButton_clicked()
{
loadRepositories();
@ -963,4 +1018,3 @@ void CModListView::on_allModsView_doubleClicked(const QModelIndex &index)
return;
}
}

3
launcher/modManager/cmodlistview_moc.h
View File

@ -54,12 +54,15 @@ class CModListView : public QWidget
void downloadFile(QString file, QString url, QString description, qint64 size = 0);
void installMods(QStringList archives);
void installMaps(QStringList maps);
void installFiles(QStringList mods);
QString genChangelogText(CModEntry & mod);
QString genModInfoText(CModEntry & mod);
void changeEvent(QEvent *event) override;
void dragEnterEvent(QDragEnterEvent* event) override;
void dropEvent(QDropEvent *event) override;
signals:
void modsChanged();

3
launcher/modManager/cmodmanager.cpp
View File

@ -161,9 +161,6 @@ bool CModManager::canInstallMod(QString modname)
if(mod.isInstalled())
return addError(modname, "Mod is already installed");
if(!mod.isAvailable())
return addError(modname, "Mod is not available");
return true;
}