add option to disable wallpaper support on certain monitor

+ buttons to delete files from preview dialog

Author: mistic100

README.md

@@ -60,6 +60,13 @@ You will need Qt 4.8.4 and libqxt 0.6.2
 
 
 ## Changelog
+* 1.8
+    * new: disable wallpaper support on specific monitors
+    * new: choose background of each monitor
+    * new: "Delete" button on "Active files" dialog
+    * new: auto-update process
+    * fixed: crash after changing delay
+    
 * [1.7 (01/08/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.7)
     * new: add "Fill" mode
     * new: create default.wallpaper file if not present

installer/setup.iss

@@ -62,6 +62,10 @@ Name: "{userstartup}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: autost
 [Run]
 Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
+[InstallDelete]
+Type: filesandordirs; Name: "{app}\cache";
+Type: files; Name: "{app}\debug.log";
+
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\cache";
 Type: files; Name: "{app}\debug.log";

src/UMWP_Autochanger.pro

@@ -24,7 +24,9 @@ SOURCES += \
     gui/previewdialog.cpp \
     gui/newversiondialog.cpp \
     gui/menubar.cpp \
-    gui/trayicon.cpp
+    gui/trayicon.cpp \
+    gui/screensdialog.cpp \
+    wallpapergenerator.cpp
 
 HEADERS += \
     ext/qlineedithotkey.h \
@@ -51,14 +53,17 @@ HEADERS += \
     gui/previewdialog.h \
     gui/newversiondialog.h \
     gui/menubar.h \
-    gui/trayicon.h
+    gui/trayicon.h \
+    gui/screensdialog.h \
+    wallpapergenerator.h
 
 FORMS += \
     ext/qhotkeywidget.ui \
     gui/mainwidget.ui \
     gui/seteditdialog.ui \
     gui/configdialog.ui \
-    gui/newversiondialog.ui
+    gui/newversiondialog.ui \
+    gui/screensdialog.ui
 
 RESOURCES += \
     UMWP_Autochanger.qrc

src/UMWP_Autochanger.qrc

@@ -27,6 +27,7 @@
         <file alias="images">images/icons/images.png</file>
         <file alias="help-color">images/icons/help_color.png</file>
         <file alias="bullet_cross">images/icons/bullet_cross.png</file>
+        <file alias="color">images/icons/color.png</file>
     </qresource>
     <qresource prefix="/button">
         <file alias="activate">images/buttons/button_activate.png</file>

src/controller.cpp

@@ -1,4 +1,3 @@
-#include <ctime>
 #include <iostream>
 #include <fstream>
 
@@ -18,7 +17,7 @@ Controller::Controller(Settings* _settings, Environment* _enviro) :
     m_enviro(_enviro),
     m_set(NULL)
 {
-    m_randomEngine.seed((unsigned int)time(NULL));
+    m_generator = new WallpaperGenerator(this);
 
     m_mainTimer = new QTimer(this);
     connect(m_mainTimer, SIGNAL(timeout()), this, SLOT(onUpdate()));
@@ -107,58 +106,53 @@ bool Controller::startPause()
 /**
  * @brief Update the wallpaper
  */
-void Controller::onUpdate()
+void Controller::onUpdate(bool _forceRefresh)
 {
     qxtLog->info("Update !");
 
     // update delay if needed
     int delay = m_settings->get("delay").toInt()*1000;
     if (delay != m_mainTimer->interval())
     {
-        qxtLog->debug("Timer delay changed to: "+delay);
+        qxtLog->debug("Timer delay changed to: "+QString::number(delay));
         m_mainTimer->setInterval(delay);
     }
 
     // update config
-    if (m_settings->get("check").toBool())
+    if (_forceRefresh || m_settings->get("check").toBool())
     {
         m_settings->updateSets();
         m_enviro->refreshMonitors();
         emit listChanged(false);
     }
 
-    int totalSets = m_settings->nbActiveSets(true);
+    // get random files
+    m_set = m_generator->getRandomSet();
 
-    if (totalSets == 0)
+    if (m_set == NULL)
     {
         qxtLog->warning("No active set");
         return;
     }
 
-    // get random files
-    m_set = getRandomSet(totalSets);
     qxtLog->debug("Current set: "+m_set->name());
 
-    m_files.clear();
+    m_files = m_generator->getFiles(m_set);
 
-    if (m_set->type() == UM::W_MONITOR)
+    if (qxtLog->isLogLevelEnabled("debug", QxtLogger::DebugLevel))
     {
-        for (int i=0, l=m_enviro->get("nb_monitors").toInt(); i<l; i++)
+        foreach (QString file, m_files)
         {
-            m_files.append(getRandomFile(m_set));
+            qxtLog->debug("Current file: "+file);
         }
     }
-    else
-    {
-        m_files.append(getRandomFile(m_set));
-    }
 
-    QVector<QString> files = adaptFilesToFillMode(m_files, m_set);
+    QVector<QString> tempFiles = m_generator->adaptFiles(m_set, m_files);
 
     QString filename = m_enviro->get("wallpath").toString() + QString::fromAscii(APP_WALLPAPER_FILE);
 
     // generate .wallpaper file
-    generateFile(filename, files, m_set);
+    generateFile(filename, tempFiles, m_set);
 
     // remove old BMP file
     QFile::remove(m_enviro->get("bmppath").toString());
@@ -172,70 +166,6 @@ void Controller::onUpdate()
     emit wallpaperChanged();
 }
 
-/**
- * @brief Get a random Set among all active sets
- * @param int _total - total number of Sets
- * @return Set*
- */
-Set* Controller::getRandomSet(int _total)
-{
-    if (_total == 1)
-    {
-        return m_settings->activeSet(0);
-    }
-
-    uniform_int<int> unif(0, _total-1);
-    int counter = unif(m_randomEngine);
-
-    return m_settings->activeSet(counter);
-}
-
-/**
- * @brief Get a random file within a Set
- * @param Set* _set
- * @return string
- */
-QString Controller::getRandomFile(Set* _set)
-{
-    int total = _set->count();
-
-    // only one file in the set ?!
-    if (total == 1)
-    {
-        return _set->file(0);
-    }
-
-    // rare case for very small sets
-    if (total <= m_files.size())
-    {
-        uniform_int<int> unif(0, m_files.size()-1);
-        int counter = unif(m_randomEngine);
-        return m_files.at(counter);
-    }
-
-    // search a random unused file
-    short loop = 10;
-    QString file;
-    uniform_int<int> unif(0, total-1);
-
-    while (loop > 0)
-    {
-        int counter = unif(m_randomEngine);
-        file = _set->file(counter);
-
-        if (!m_files.contains(file))
-        {
-            loop = 0;
-        }
-
-        loop--;
-    }
-
-    qxtLog->debug("Current file: "+file);
-
-    return file;
-}
-
 /**
  * @brief Generate AutoChanger.wallpaper file
  * @param string _filename
@@ -266,12 +196,16 @@ void Controller::generateFile(const QString &_filename, const QVector<QString> &
     {
         UM::WP_MONITOR_FILE wall;
         wall.bgType = UM::BG_SOLID;
-        wall.color1 = 0x00000000;
+        wall.color1 = m_settings->monitor(i).color;
         wall.color2 = 0x00000000;
         wall.imgStyle = wp_style;
 
         memset(wall.imgFile, 0, 260*sizeof(wchar_t));
-        _files.at(i).toWCharArray((wchar_t*)wall.imgFile);
+
+        if (!_files.at(i).isEmpty())
+        {
+            _files.at(i).toWCharArray((wchar_t*)wall.imgFile);
+        }
 
         buffer.append((char*)&wall, sizeof(UM::WP_MONITOR_FILE));
     }
@@ -284,73 +218,23 @@ void Controller::generateFile(const QString &_filename, const QVector<QString> &
 }
 
 /**
- * @brief Resize image files and return an array of new paths in cache folder
- * @param string[] _files
- * @param Set* _set
- * @return string[] _files
+ * @brief Move a file to trash bin
+ * @param string _filename
+ * @return bool
  */
-QVector<QString> Controller::adaptFilesToFillMode(const QVector<QString> &_files, const Set* _set)
+bool Controller::moveFileToTrash(const QString &_filename)
 {
-    if (_set->style() != UM::IM_FILL)
-    {
-        return _files;
-    }
+    wchar_t path[MAX_PATH];
+    memset(path, 0, sizeof(path));
+    int l = _filename.toWCharArray(path);
+    path[l] = '\0';
 
-    QVector<QString> newFiles;
-    int nb_walls = _files.size();
+    SHFILEOPSTRUCT shfos = {0};
+    shfos.wFunc  = FO_DELETE;
+    shfos.pFrom  = path;
+    shfos.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
 
-    QString tmpRoot = QDir::toNativeSeparators(QFileInfo(QString::fromAscii(APP_CACHE_DIR)).absoluteFilePath()+"/");
-
-    for (int i=0; i<nb_walls; i++)
-    {
-        // target size
-        QSize size;
-        if (_set->type() == UM::W_DESKTOP)
-        {
-            size = m_enviro->wpSize(-1);
-        }
-        else
-        {
-            size = m_enviro->wpSize(i);
-        }
-
-        if (!size.isEmpty())
-        {
-            QFileInfo file(_files.at(i));
-            QString tmpPath = tmpRoot+file.completeBaseName()+"-"+QString::number(size.width())+"x"+QString::number(size.height())+"."+file.suffix();
-
-            if (!QFile::exists(tmpPath))
-            {
-                QImage image(file.absoluteFilePath());
-
-                // if image ratio is almost the same, do not waste time in image croppping
-                double curRatio = (double)image.size().width()/image.size().height();
-                double targetRatio = (double)size.width()/size.height();
-
-                if (qAbs(curRatio - targetRatio) < 0.02)
-                {
-                    newFiles.append(_files.at(i));
-                    continue;
-                }
-
-                // scale
-                image = image.scaled(size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-                // crop
-                int diffW = image.width()-size.width();
-                int diffH = image.height()-size.height();
-                image = image.copy(diffW/2, diffH/2, size.width(), size.height());
-
-                image.save(tmpPath);
-            }
-
-            newFiles.append(tmpPath);
-        }
-        else
-        {
-            newFiles.append(_files.at(i));
-        }
-    }
+    int ret = SHFileOperation(&shfos);
 
-    return newFiles;
+    return ret == 0;
 }

src/controller.h

@@ -1,16 +1,14 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#include <random>
 #include <QTimer>
 
-using namespace std::tr1;
-
 #include "main.h"
 #include "set.h"
 #include "settings.h"
 #include "environment.h"
 #include "versionchecker.h"
+#include "wallpapergenerator.h"
 
 
 /**
@@ -23,9 +21,9 @@ class Controller : public QObject
 private:
     Settings*        m_settings;
     Environment*     m_enviro;
+    WallpaperGenerator* m_generator;
 
     QTimer*          m_mainTimer;
-    mt19937          m_randomEngine; // mersenne_twister
 
     QVector<QString> m_files;
     Set*             m_set;
@@ -49,14 +47,13 @@ class Controller : public QObject
 
     void emitListChanged(bool _resetSel=false) { emit listChanged(_resetSel); }
 
+    bool moveFileToTrash(const QString &_filename);
+
 private:
-    Set*    getRandomSet(int _total);
-    QString getRandomFile(Set* _set);
-    void    generateFile(const QString &_filename, const QVector<QString> &_files, const Set* _set);
-    QVector<QString> adaptFilesToFillMode(const QVector<QString> &_files, const Set* _set);
+    void generateFile(const QString &_filename, const QVector<QString> &_files, const Set* _set);
 
 public slots:
-    void onUpdate();
+    void onUpdate(bool _forceRefresh=false);
 
 private slots:
     void onNewVersion(const QString &_ver, const QString &_link);