diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 5ee5af1..c43d14c 100644 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se if ((settings::settings().contains("fileFormat"))) setScheme(settings::settings().value("fileFormat").toString()); else - setScheme("Screenshot %(yyyy-MM-dd HH:mm:ss)date"); + setScheme("Screenshot %(yyyy-MM-dd HH:mm:ss)date.ext"); // Set delay if ((settings::settings().contains("delay"))) @@ -143,3 +143,7 @@ void SettingsDialog::on_pushButton_clicked() { a->setAttribute(Qt::WA_DeleteOnClose); a->show(); } + +void SettingsDialog::on_nameScheme_textChanged(QString txt) { + settings::settings().setValue("fileFormat", txt); +} diff --git a/settingsdialog.hpp b/settingsdialog.hpp index ad0a0fc..b6f1f15 100644 --- a/settingsdialog.hpp +++ b/settingsdialog.hpp @@ -30,6 +30,7 @@ public: void on_formatBox_currentIndexChanged(int index); void on_imageFormatBox_currentIndexChanged(int index); void on_pushButton_clicked(); + void on_nameScheme_textChanged(QString txt); private: Ui::SettingsDialog *ui; diff --git a/settingsdialog.ui b/settingsdialog.ui index 96ab539..c5cef5e 100644 --- a/settingsdialog.ui +++ b/settingsdialog.ui @@ -91,7 +91,7 @@ http://doc.qt.io/qt-5/qdatetime.html#toString - Screenshot %(yyyy-MM-dd HH:mm:ss)date + Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext diff --git a/uploaders/uploadersingleton.cpp b/uploaders/uploadersingleton.cpp index 453cb5a..2ed24a9 100644 --- a/uploaders/uploadersingleton.cpp +++ b/uploaders/uploadersingleton.cpp @@ -61,7 +61,9 @@ void UploaderSingleton::registerUploader(Uploader *uploader) { void UploaderSingleton::upload(QPixmap *pixmap) { auto u = uploaders.value(uploader); QString format = settings::settings().value("captureformat", "PNG").toString(); - QFile file(saveDir.absoluteFilePath(formatter::format(settings::settings().value("fileFormat").toString(), format.toLower()))); + QFile file(saveDir.absoluteFilePath( + formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext").toString(), + format.toLower()))); if (file.open(QFile::ReadWrite)) { pixmap->save(&file, format.toLocal8Bit().constData(), settings::settings().value("imageQuality", -1).toInt());