From 7347c9bf42d6ded9633e38d11915310b6c9720b5 Mon Sep 17 00:00:00 2001
From: Gurkengewuerz <niklas@schuetrumpf.net>
Date: Wed, 15 May 2019 23:34:45 +0200
Subject: [PATCH] add subdirectory

TODO: save filename with subdir in history
---
 src/settingsdialog.cpp |  6 +++++
 src/settingsdialog.hpp |  1 +
 src/settingsdialog.ui  | 56 ++++++++++++++++++++++++++----------------
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 46bb8a9..41a9a42 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -45,6 +45,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se
     // Set filename scheme
     setScheme(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString());
 
+    ui->folderFormat->setText(settings::settings().value("folderFormat", "%(yyyy-MM)date").toString());
+
     // Set delay
     if ((settings::settings().contains("delay")))
         ui->delay->setValue(settings::settings().value("delay").toDouble());
@@ -122,6 +124,10 @@ void SettingsDialog::on_nameScheme_textChanged(const QString &arg1) {
     settings::settings().setValue("fileFormat", arg1);
 }
 
+void SettingsDialog::on_folderFormat_textChanged(const QString &arg1) {
+    settings::settings().setValue("folderFormat", arg1);
+}
+
 void SettingsDialog::on_delay_valueChanged(double arg1) {
     settings::settings().setValue("delay", arg1);
 }
diff --git a/src/settingsdialog.hpp b/src/settingsdialog.hpp
index e90cd62..b4d83cf 100644
--- a/src/settingsdialog.hpp
+++ b/src/settingsdialog.hpp
@@ -30,6 +30,7 @@ private slots:
     void on_imageFormatBox_currentIndexChanged(int index);
     void on_pushButton_clicked();
     void on_nameScheme_textChanged(const QString &arg1);
+    void on_folderFormat_textChanged(const QString &arg1);
     void newUploader(Uploader *u);
     void uploaderChanged(QString newName);
     void on_saveLocation_currentIndexChanged(int index);
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 4a09932..4c514bb 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -17,10 +17,10 @@
    <item row="1" column="1">
     <widget class="QListWidget" name="uploaderList"/>
    </item>
-   <item row="12" column="2">
+   <item row="14" column="2">
     <widget class="QComboBox" name="imageFormatBox"/>
    </item>
-   <item row="7" column="1">
+   <item row="9" column="1">
     <widget class="QDoubleSpinBox" name="delay">
      <property name="toolTip">
       <string>In seconds</string>
@@ -33,14 +33,14 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="10" column="1">
     <widget class="QCheckBox" name="quickMode">
      <property name="text">
       <string>Quick mode (mouse release screenshots)</string>
      </property>
     </widget>
    </item>
-   <item row="15" column="1">
+   <item row="17" column="1">
     <widget class="QLabel" name="label_10">
      <property name="text">
       <string>Fullscreen capture command (save to %FILE_PATH or print to stdout)</string>
@@ -54,31 +54,31 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="1">
+   <item row="14" column="1">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>Still image format</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" rowspan="7">
+   <item row="1" column="2" rowspan="9">
     <widget class="QListWidget" name="hotkeys"/>
    </item>
-   <item row="6" column="1">
+   <item row="8" column="1">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Delay before taking a screenshot</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="1">
+   <item row="13" column="1">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Recording format</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="1" colspan="2">
+   <item row="11" column="1" colspan="2">
     <widget class="QCheckBox" name="captureCursor">
      <property name="text">
       <string>Capture cursor</string>
@@ -95,7 +95,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="2">
+   <item row="13" column="2">
     <widget class="QComboBox" name="formatBox">
      <property name="currentIndex">
       <number>-1</number>
@@ -109,14 +109,14 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="1" colspan="2">
+   <item row="12" column="1" colspan="2">
     <widget class="QCheckBox" name="hideToTray">
      <property name="text">
       <string>Pressing &lt;X&gt; hides to tray</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="7" column="1">
     <widget class="QComboBox" name="saveLocation">
      <item>
       <property name="text">
@@ -135,7 +135,7 @@
      </item>
     </widget>
    </item>
-   <item row="8" column="2">
+   <item row="10" column="2">
     <widget class="QPushButton" name="settingsButton">
      <property name="text">
       <string>Open settings directory</string>
@@ -149,7 +149,7 @@
      </property>
     </widget>
    </item>
-   <item row="18" column="1" colspan="2">
+   <item row="20" column="1" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -159,14 +159,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="6" column="1">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>File save location</string>
      </property>
     </widget>
    </item>
-   <item row="17" column="1" colspan="2">
+   <item row="19" column="1" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Advanced</string>
@@ -218,7 +218,7 @@
      </layout>
     </widget>
    </item>
-   <item row="13" column="2">
+   <item row="15" column="2">
     <widget class="QSpinBox" name="fpsMax">
      <property name="suffix">
       <string>FPS</string>
@@ -228,26 +228,40 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="1">
+   <item row="15" column="1">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>Frames Per Second For Recording</string>
      </property>
     </widget>
    </item>
-   <item row="15" column="2">
+   <item row="17" column="2">
     <widget class="QLineEdit" name="fullscreenCapture"/>
    </item>
-   <item row="16" column="1">
+   <item row="18" column="1">
     <widget class="QLabel" name="label_11">
      <property name="text">
       <string>Focused capture command (save to %FILE_PATH or print to stdout)</string>
      </property>
     </widget>
    </item>
-   <item row="16" column="2">
+   <item row="18" column="2">
     <widget class="QLineEdit" name="focusedCapture"/>
    </item>
+   <item row="5" column="1">
+    <widget class="QLineEdit" name="folderFormat">
+     <property name="text">
+      <string>%(yyyy-MM)date</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLabel" name="label_12">
+     <property name="text">
+      <string>Screenshot Subfolder</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>