importUrls added
This commit is contained in:
parent
0127bc61e6
commit
a8db3985a2
2 changed files with 31 additions and 22 deletions
|
@ -528,7 +528,7 @@ fileDialogPreOpen: //Work?
|
|||
settings.endGroup();
|
||||
}
|
||||
|
||||
void ProfileInterface::importFilesProgress(QStringList selectedFiles)
|
||||
bool ProfileInterface::importFilesProgress(QStringList selectedFiles)
|
||||
{
|
||||
int maximumId = selectedFiles.length();
|
||||
int overallId = 0;
|
||||
|
@ -573,7 +573,9 @@ void ProfileInterface::importFilesProgress(QStringList selectedFiles)
|
|||
{
|
||||
errorStr.remove(0, 2);
|
||||
QMessageBox::warning(this, tr("Import"), tr("Import failed with...\n\n%1").arg(errorStr));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime, bool notMultiple)
|
||||
|
@ -811,6 +813,30 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime
|
|||
return false;
|
||||
}
|
||||
|
||||
bool ProfileInterface::importUrls(const QMimeData *mimeData)
|
||||
{
|
||||
QStringList pathList;
|
||||
|
||||
for (QUrl currentUrl : mimeData->urls())
|
||||
{
|
||||
if (currentUrl.isLocalFile())
|
||||
{
|
||||
pathList += currentUrl.toLocalFile();
|
||||
}
|
||||
}
|
||||
|
||||
if (pathList.length() == 1)
|
||||
{
|
||||
QString selectedFile = pathList.at(0);
|
||||
return importFile(selectedFile, QDateTime::currentDateTime(), true);
|
||||
}
|
||||
else if (pathList.length() > 1)
|
||||
{
|
||||
return importFilesProgress(pathList);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ProfileInterface::importImage(QImage *snapmaticImage, QDateTime importDateTime)
|
||||
{
|
||||
SnapmaticPicture *picture = new SnapmaticPicture(":/template/template.g5e");
|
||||
|
@ -1385,25 +1411,7 @@ void ProfileInterface::contextMenuTriggeredSGD(QContextMenuEvent *ev)
|
|||
void ProfileInterface::on_saProfileContent_dropped(const QMimeData *mimeData)
|
||||
{
|
||||
if (!mimeData) return;
|
||||
QStringList pathList;
|
||||
|
||||
for (QUrl currentUrl : mimeData->urls())
|
||||
{
|
||||
if (currentUrl.isLocalFile())
|
||||
{
|
||||
pathList += currentUrl.toLocalFile();
|
||||
}
|
||||
}
|
||||
|
||||
if (pathList.length() == 1)
|
||||
{
|
||||
QString selectedFile = pathList.at(0);
|
||||
importFile(selectedFile, QDateTime::currentDateTime(), true);
|
||||
}
|
||||
else if (pathList.length() > 1)
|
||||
{
|
||||
importFilesProgress(pathList);
|
||||
}
|
||||
importUrls(mimeData);
|
||||
}
|
||||
|
||||
void ProfileInterface::retranslateUi()
|
||||
|
@ -1434,7 +1442,7 @@ bool ProfileInterface::eventFilter(QObject *watched, QEvent *event)
|
|||
{
|
||||
if (clipboardData->urls().length() >= 2)
|
||||
{
|
||||
on_saProfileContent_dropped(clipboardData); // replace later with own function importUrls()
|
||||
importUrls(clipboardData);
|
||||
}
|
||||
else if (clipboardData->urls().length() == 1)
|
||||
{
|
||||
|
|
|
@ -116,8 +116,9 @@ private:
|
|||
|
||||
bool isSupportedImageFile(QString selectedFileName);
|
||||
bool importFile(QString selectedFile, QDateTime importDateTime, bool notMultiple);
|
||||
bool importUrls(const QMimeData *mimeData);
|
||||
bool importImage(QImage *snapmaticImage, QDateTime importDateTime);
|
||||
void importFilesProgress(QStringList selectedFiles);
|
||||
bool importFilesProgress(QStringList selectedFiles);
|
||||
bool importSnapmaticPicture(SnapmaticPicture *picture, bool warn = true);
|
||||
bool importSavegameData(SavegameData *savegame, QString sgdPath, bool warn = true);
|
||||
void pictureLoaded(SnapmaticPicture *picture, bool inserted);
|
||||
|
|
Loading…
Reference in a new issue