fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-24 02:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed loop that occured when screenshot failed to save.

Browse Source
This commit is contained in:
Jeremy Borgman
2021-02-25 10:32:15 -06:00
parent d9b9049736
commit acb9a08e2c
2 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,7 +1,7 @@
# common # common
.idea .idea
.cache
# C++ objects and libs # C++ objects and libs
*.slo *.slo

101
src/utils/screenshotsaver.cpp
View File

@@ -104,62 +104,57 @@ bool ScreenshotSaver::saveToFilesystem(const QPixmap& capture,
bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture) bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
{ {
bool ok = false; bool ok = false;
while (!ok) { ConfigHandler config;
ConfigHandler config; QString savePath = FileNameHandler().absoluteSavePath();
QString savePath = FileNameHandler().absoluteSavePath();
#if defined(Q_OS_MACOS) #if defined(Q_OS_MACOS)
for (QWidget* widget : qApp->topLevelWidgets()) { for (QWidget* widget : qApp->topLevelWidgets()) {
QString className(widget->metaObject()->className()); QString className(widget->metaObject()->className());
if (0 == className.compare( if (0 ==
CaptureWidget::staticMetaObject.className())) { className.compare(CaptureWidget::staticMetaObject.className())) {
widget->showNormal(); widget->showNormal();
widget->hide(); widget->hide();
break;
}
}
#endif
if (!config.savePathFixed()) {
savePath = QFileDialog::getSaveFileName(
nullptr,
QObject::tr("Save screenshot"),
FileNameHandler().absoluteSavePath(),
QLatin1String("Portable Network Graphic file (PNG) (*.png);;BMP "
"file (*.bmp);;JPEG file (*.jpg)"));
}
if (savePath.isNull()) {
break; break;
} }
if (!savePath.endsWith(QLatin1String(".png"), Qt::CaseInsensitive) &&
!savePath.endsWith(QLatin1String(".bmp"), Qt::CaseInsensitive) &&
!savePath.endsWith(QLatin1String(".jpg"), Qt::CaseInsensitive)) {
savePath += QLatin1String(".png");
}
ok = capture.save(savePath);
if (ok) {
QString pathNoFile =
savePath.left(savePath.lastIndexOf(QLatin1String("/")));
ConfigHandler().setSavePath(pathNoFile);
QString msg = QObject::tr("Capture saved as ") + savePath;
if (config.copyPathAfterSaveEnabled()) {
QApplication::clipboard()->setText(savePath);
msg = QObject::tr(
"Capture is saved and copied to the clipboard as ") +
savePath;
}
SystemNotification().sendMessage(msg, savePath);
Controller::getInstance()->sendCaptureSaved(
m_id, QFileInfo(savePath).canonicalFilePath());
} else {
QString msg = QObject::tr("Error trying to save as ") + savePath;
QMessageBox saveErrBox(
QMessageBox::Warning, QObject::tr("Save Error"), msg);
saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
saveErrBox.exec();
}
} }
#endif
if (!config.savePathFixed()) {
savePath = QFileDialog::getSaveFileName(
nullptr,
QObject::tr("Save screenshot"),
FileNameHandler().absoluteSavePath(),
QLatin1String("Portable Network Graphic file (PNG) (*.png);;BMP "
"file (*.bmp);;JPEG file (*.jpg)"));
}
if (!savePath.endsWith(QLatin1String(".png"), Qt::CaseInsensitive) &&
!savePath.endsWith(QLatin1String(".bmp"), Qt::CaseInsensitive) &&
!savePath.endsWith(QLatin1String(".jpg"), Qt::CaseInsensitive)) {
savePath += QLatin1String(".png");
}
ok = capture.save(savePath);
if (ok) {
QString pathNoFile =
savePath.left(savePath.lastIndexOf(QLatin1String("/")));
ConfigHandler().setSavePath(pathNoFile);
QString msg = QObject::tr("Capture saved as ") + savePath;
if (config.copyPathAfterSaveEnabled()) {
QApplication::clipboard()->setText(savePath);
msg =
QObject::tr("Capture is saved and copied to the clipboard as ") +
savePath;
}
SystemNotification().sendMessage(msg, savePath);
Controller::getInstance()->sendCaptureSaved(
m_id, QFileInfo(savePath).canonicalFilePath());
} else {
QString msg = QObject::tr("Error trying to save as ") + savePath;
QMessageBox saveErrBox(
QMessageBox::Warning, QObject::tr("Save Error"), msg);
saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
saveErrBox.exec();
}
return ok; return ok;
} }