Added preview to date naming window, removed WEBP option (terribly slow)

ckaiser · May 1, 2021 · 090f54a · 090f54a
1 parent 6858918
commit 090f54a
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-##Lightscreen
+## Lightscreen
 [![Build status](https://ci.appveyor.com/api/projects/status/26q7pg1q5u4ukxbg?svg=true)](https://ci.appveyor.com/project/ckaiser/lightscreen) [![Coverity status](https://scan.coverity.com/projects/6066/badge.svg)](https://scan.coverity.com/projects/ckaiser-lightscreen)
 
 A screenshot tool.

diff --git a/dialogs/namingdialog.cpp b/dialogs/namingdialog.cpp
@@ -21,6 +21,7 @@
 #include <tools/os.h>
 #include <tools/screenshotmanager.h>
 
+#include <QDateTime>
 #include <QDesktopServices>
 #include <QKeyEvent>
 #include <QSettings>
@@ -48,13 +49,16 @@ NamingDialog::NamingDialog(Screenshot::Naming naming, QWidget *parent) :
         ui.dateFormatComboBox->setCurrentIndex(ui.dateFormatComboBox->count() - 1);
     }
 
+    updateDatePreview();
+
     ui.leadingZerosSpinBox->setValue(settings->value("options/naming/leadingZeros", 0).toInt());
 
     // Signals/Slots
     connect(ui.buttonBox    , &QDialogButtonBox::accepted, this, &NamingDialog::saveSettings);
     connect(ui.dateHelpLabel, &QLabel::linkActivated, this, [](const QUrl &url) {
         QDesktopServices::openUrl(QUrl(url));
     });
+    connect(ui.dateFormatComboBox, &QComboBox::currentTextChanged, this, &NamingDialog::updateDatePreview);
 
     // Stack & window size adjustments
     ui.stack->setCurrentIndex((int)naming);
@@ -68,15 +72,35 @@ bool NamingDialog::eventFilter(QObject *object, QEvent *event)
     if (event->type() == QEvent::KeyPress
             && object == ui.dateFormatComboBox) {
         QKeyEvent *keyEvent = (QKeyEvent *)(event);
+#ifdef Q_OS_WIN
         if (QRegExp("[?:\\\\/*\"<>|]").exactMatch(keyEvent->text())) {
             event->ignore();
             return true;
         }
+#endif
+
+#ifdef Q_OS_MACOS
+        if (keyEvent->text().contains(":")) {
+            event->ignore();
+            return true;
+        }
+#endif
+
+#ifdef Q_OS_UNIX
+        if (keyEvent->text().contains("/")) {
+            event->ignore();
+            return true;
+        }
+#endif
     }
 
     return QDialog::eventFilter(object, event);
 }
 
+void NamingDialog::updateDatePreview() {
+    ui.datePreviewLabel->setText(tr("<u>Preview</u>: ") + QDateTime::currentDateTime().toString(ui.dateFormatComboBox->currentText()));
+}
+
 void NamingDialog::saveSettings() {
     auto settings = ScreenshotManager::instance()->settings();
     settings->setValue("options/flip"               , ui.flipNamingCheckBox->isChecked());

diff --git a/dialogs/namingdialog.h b/dialogs/namingdialog.h
@@ -36,6 +36,7 @@ class NamingDialog : public QDialog
 
 public slots:
     void saveSettings();
+    void updateDatePreview();
 
 private:
     Ui::NamingDialog ui;

diff --git a/dialogs/namingdialog.ui b/dialogs/namingdialog.ui
@@ -130,10 +130,21 @@
           <property name="horizontalSpacing">
            <number>0</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="dateFormatLabel">
+          <item row="1" column="2">
+           <widget class="QLabel" name="dateHelpLabel">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+             </font>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">margin-left: 4px</string>
+            </property>
             <property name="text">
-             <string>Date Format:</string>
+             <string notr="true"> &lt;a href=&quot;https://lightscreen.com.ar/help#date&quot;&gt;[?]&lt;/a&gt;</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
             </property>
            </widget>
           </item>
@@ -150,21 +161,10 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="dateHelpLabel">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-             </font>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">margin-left: 4px</string>
-            </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="dateFormatLabel">
             <property name="text">
-             <string notr="true"> &lt;a href=&quot;https://lightscreen.com.ar/help#date&quot;&gt;[?]&lt;/a&gt;</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
+             <string>Date Format:</string>
             </property>
            </widget>
           </item>
@@ -183,6 +183,23 @@
               <string notr="true">yyyy-MM-dd HH.mm.ss</string>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>ddd MMMM d yy</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>dddd d of MMMM</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="datePreviewLabel">
+            <property name="text">
+             <string notr="true"/>
+            </property>
            </widget>
           </item>
          </layout>

diff --git a/dialogs/optionsdialog.ui b/dialogs/optionsdialog.ui
@@ -198,11 +198,6 @@
               <string notr="true">BMP</string>
              </property>
             </item>
-            <item>
-             <property name="text">
-              <string>WEBP</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item row="4" column="0">