benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify canonical path generation slightly

Browse Source
This commit is contained in:
brimston3
2021-01-14 22:22:21 -05:00
committed by borgmanJeremy
parent e2bd91a1de
commit 7f55d0c672
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/screenshotsaver.cpp
View File

@@ -70,12 +70,8 @@ bool ScreenshotSaver::saveToFilesystem(const QPixmap& capture,
ConfigHandler().setSavePath(path);
saveMessage =
messagePrefix + QObject::tr("Capture saved as ") + completePath;
QString fileNoPath =
completePath.right(completePath.lastIndexOf(QLatin1String("/")));
Controller::getInstance()->sendCaptureSaved(
m_id,
QFileInfo(completePath).canonicalPath() + QLatin1String("/") +
fileNoPath);
m_id, QFileInfo(completePath).canonicalFilePath());
} else {
saveMessage = messagePrefix + QObject::tr("Error trying to save as ") +
completePath;
@@ -116,8 +112,6 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
if (ok) {
QString pathNoFile =
savePath.left(savePath.lastIndexOf(QLatin1String("/")));
QString fileNoPath =
savePath.right(savePath.lastIndexOf(QLatin1String("/")));
ConfigHandler().setSavePath(pathNoFile);
QString msg = QObject::tr("Capture saved as ") + savePath;
if (config.copyPathAfterSaveEnabled()) {
@@ -128,9 +122,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
}
SystemNotification().sendMessage(msg, savePath);
Controller::getInstance()->sendCaptureSaved(
m_id,
QFileInfo(savePath).canonicalPath() + QLatin1String("/") +
fileNoPath);
m_id, QFileInfo(savePath).canonicalFilePath());
} else {
QString msg = QObject::tr("Error trying to save as ") + savePath;
QMessageBox saveErrBox(