From 52b6872f8561be83f7c245b560748a37c8c60360 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Tue, 4 Jul 2017 22:35:34 +0200 Subject: [PATCH] Make the default name scheme Windows compatable --- settingsdialog.cpp | 2 +- settingsdialog.ui | 2 +- uploaders/uploadersingleton.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 7c2ed0c..eb67258 100644 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -41,7 +41,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se for (Uploader *u : UploaderSingleton::inst().uploaderList()) newUploader(u); // Set filename scheme - setScheme(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext").toString()); + setScheme(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString()); // Set delay if ((settings::settings().contains("delay"))) diff --git a/settingsdialog.ui b/settingsdialog.ui index ba64411..0acfd66 100644 --- a/settingsdialog.ui +++ b/settingsdialog.ui @@ -84,7 +84,7 @@ %(date format)date and %ext are supported - Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext + Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext diff --git a/uploaders/uploadersingleton.cpp b/uploaders/uploadersingleton.cpp index f40f0dc..8198b06 100644 --- a/uploaders/uploadersingleton.cpp +++ b/uploaders/uploadersingleton.cpp @@ -82,7 +82,7 @@ void UploaderSingleton::upload(QPixmap pixmap) { } QString format = settings::settings().value("captureformat", "PNG").toString(); QFile file(saveDir.absoluteFilePath( - formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext").toString(), + formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString(), format.toLower()))); if (file.open(QFile::ReadWrite)) {