Merge pull request #3 from namecheap/feature/RND-675-flameshot-make-p…

…reviews-in-the-latest-uploads-smaller Make preview files on the local disk for the 'Latest uploads' smaller
namecheap · Oct 28, 2020 · ca7834e · ca7834e
2 parents 2f03c51 + 7e49d4e
commit ca7834e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 27 deletions.
diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp
@@ -61,13 +61,6 @@ void GeneneralConf::updateComponents()
     m_copyAndCloseAfterUpload->setChecked(
       config.copyAndCloseAfterUploadEnabled());
     m_saveAfterCopy->setChecked(config.saveAfterCopyValue());
-
-    if (!config.saveAfterCopyPathValue().isEmpty()) {
-        m_savePath->setText(config.saveAfterCopyPathValue());
-    } else {
-        ConfigHandler().setSaveAfterCopyPath(
-          QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
-    }
     m_copyPathAfterSave->setChecked(config.copyPathAfterSaveEnabled());
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
@@ -376,7 +369,7 @@ void GeneneralConf::changeSavePath()
       QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
     if (!path.isEmpty()) {
         m_savePath->setText(path);
-        ConfigHandler().setSaveAfterCopyPath(path);
+        ConfigHandler().setSavePath(path);
     }
 }
 

diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
@@ -485,16 +485,6 @@ const QString& ConfigHandler::uploadStorage()
     return m_strRes;
 }
 
-QString ConfigHandler::saveAfterCopyPathValue()
-{
-    return m_settings.value(QStringLiteral("saveAfterCopyPath")).toString();
-}
-
-void ConfigHandler::setSaveAfterCopyPath(const QString& path)
-{
-    m_settings.setValue(QStringLiteral("saveAfterCopyPath"), path);
-}
-
 void ConfigHandler::setDefaults()
 {
     m_settings.clear();

diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
@@ -87,9 +87,6 @@ class ConfigHandler
     bool saveAfterCopyValue();
     void setSaveAfterCopy(const bool);
 
-    QString saveAfterCopyPathValue();
-    void setSaveAfterCopyPath(const QString&);
-
     bool copyPathAfterSaveEnabled();
     void setCopyPathAfterSaveEnabled(const bool);
 

diff --git a/src/utils/history.cpp b/src/utils/history.cpp
@@ -30,9 +30,20 @@ const QString& History::path()
 
 void History::save(const QPixmap& pixmap, const QString& fileName)
 {
+    // scale preview only in local disk
+    QPixmap pixmapScaled = QPixmap(pixmap);
+    if (pixmap.height() / HISTORYPIXMAP_MAX_PREVIEW_HEIGHT >=
+        pixmap.width() / HISTORYPIXMAP_MAX_PREVIEW_WIDTH) {
+        pixmapScaled = pixmap.scaledToHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT);
+    } else {
+        pixmapScaled = pixmap.scaledToWidth(HISTORYPIXMAP_MAX_PREVIEW_WIDTH);
+    }
+
+    // save preview
     QFile file(path() + fileName);
     file.open(QIODevice::WriteOnly);
-    pixmap.save(&file, "PNG");
+    pixmapScaled.save(&file, "PNG");
+
     history();
 }
 

diff --git a/src/utils/history.h b/src/utils/history.h
@@ -3,6 +3,9 @@
 
 #define HISTORY_MAX_SIZE 25
 
+#define HISTORYPIXMAP_MAX_PREVIEW_WIDTH 160
+#define HISTORYPIXMAP_MAX_PREVIEW_HEIGHT 90
+
 #include <QList>
 #include <QPixmap>
 #include <QString>

diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp
@@ -35,9 +35,9 @@ void ScreenshotSaver::saveToClipboard(const QPixmap& capture)
     // If we are able to properly save the file, save the file and copy to
     // clipboard.
     if ((ConfigHandler().saveAfterCopyValue()) &&
-        (!ConfigHandler().saveAfterCopyPathValue().isEmpty())) {
+        (!ConfigHandler().savePath().isEmpty())) {
         saveToFilesystem(capture,
-                         ConfigHandler().saveAfterCopyPathValue(),
+                         ConfigHandler().savePath(),
                          QObject::tr("Capture saved to clipboard."));
         QApplication::clipboard()->setPixmap(capture);
     }

diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp
@@ -106,6 +106,8 @@ void HistoryWidget::addLine(const QString& path, const QString& fileName)
     QPixmap pixmap;
     pixmap.load(fullFileName, "png");
 
+    // TODO - remove much later, it is still required to keep old previews works
+    // fine
     if (pixmap.height() / HISTORYPIXMAP_MAX_PREVIEW_HEIGHT >=
         pixmap.width() / HISTORYPIXMAP_MAX_PREVIEW_WIDTH) {
         pixmap = pixmap.scaledToHeight(HISTORYPIXMAP_MAX_PREVIEW_HEIGHT);

diff --git a/src/widgets/historywidget.h b/src/widgets/historywidget.h
@@ -1,9 +1,6 @@
 #ifndef HISTORYWIDGET_H
 #define HISTORYWIDGET_H
 
-#define HISTORYPIXMAP_MAX_PREVIEW_WIDTH 160
-#define HISTORYPIXMAP_MAX_PREVIEW_HEIGHT 90
-
 #include <QDialog>
 #include <QObject>
 #include <QString>