use a struct to store new version data

prepare 1.8

Author: mistic100

README.md

@@ -5,8 +5,8 @@ UMWP Autochanger is a little tool for [UltraMon](http://www.realtimesoft.com/ult
 * randomly and periodically change the wallpaper of all your monitors,
 * manage sets of wallpapers, allowing you to quickly change which images are used.
 
-Version       : 1.7  
-Release date  : 01/08/2014  
+Version       : 1.8  
+Release date  : 10/11/2014  
 Author        : Damien "Mistic" Sorel  
 Website       : http://www.strangeplanet.fr/work/umwp-autochanger  
 License       : GNU General Public License Version 3  
@@ -32,19 +32,18 @@ The application is currently available in English and French. [A translation pag
 
 
 ## Configuration
-* Double-click on a set to edit it. You can change its name, its style (one image for each monitor or one image for the whole desktop) and the transformation style for images (center, tile or stretch).
+* Double-click on a set to edit it. You can change its name, its style (one image for each monitor or one image for the whole desktop), the transformation style for images (center, tile or stretch) and the hotkey.
 
 * On the "Options" dialog you can choose the delay, change the behavior of the tool and configure the hotkeys.  
 Hotkeys are a way to interact with the application while it is hidden in the system bar. Hotkeys can also be defined for each individual sets.
 
+* On the "Manage monitors" dialog you can disable the wallpaper on specific monitor, as well as choosing their background color.
+
 
 ## Troubleshouting
 Q: When I launch UMWP Autochanger, the window doesn't appear.  
 A: When you have already registered sets, the window automatically minimize to the system bar, double-click on the icon (or right-click => "Show") to open it. This behavior can be changed on the "Options" menu.
 
-Q: Can I edit a set ?  
-A: Yes. Double-click on it's name, you can set the name, the type and the style of wallpaper and the hotkey of the set.
-
 Q: How hotkeys work ?  
 A: There are two kind of hotkeys: the ones defined in the "Options" dialog allow to show/hide the application window, refresh the wallpaper and start/pause the timer.  
 The ones defined in the set edit dialog allow to change the current set. You can assign the same hotkey to multiple sets.  
@@ -60,9 +59,9 @@ 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
+* [1.8 (10/11/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.7)
+    * new: can disable wallpaper support on specific monitors
+    * new: choose background color of each monitor
     * new: "Delete" button on "Active files" dialog
     * new: auto-update process
     * fixed: crash after changing delay

installer/data/readme.txt

@@ -1,131 +1,122 @@
 UltraMon Wallpaper Autochanger
+================
 
-Version       : 1.7  
-Release date  : 01/08/2014  
-Author        : Damien "Mistic" Sorel
-Website       : http://www.strangeplanet.fr
-License       : GNU General Public License Version 3
-
-
-Description 
-===========
-UMWP Autochanger is a little tool for UltraMon users. I has two main features :
- - randomly and periodically change the wallpaper of all your monitors,
- - manage sets of wallpapers, allowing you to quickly change which images are used.
-
-
-Requirement
-===========
-UltraMon 3.2.1 or higher
-Windows 7/8 32/64 bits
-
-
-Installation
-============
- 1. Install and configure UltraMon on your computer.
-
- 2. Launch "UMWP Autochanger.exe".
- 
- 2.1. Depending on your configuration, you might be asked to locate "UltraMonDesktop.exe".
-
- 3. Click on the plus button to add a new set. A set is basically a directory 
-    containing JPEG/PNG/BMP files. UMWP Autochanger will browse this directory 
-    recursively up to 3 levels searching for image files.
-
- 4. Once you have added your sets, the wallpaper will randomly change
-    every 60 seconds (default delay).
-
-
-Configuration
-=============
- * Double-click on a set to edit it. You can change its name, its style 
-    (one image for each monitor or one image for the whole desktop) and the 
-    transformation style for images (center, tile or stretch).
-
- * On the "Options" dialog you can choose the delay, change the behavior of 
-    the tool and configure the hotkeys.  
-    Hotkeys are a way to interact with the application while it is hidden
-    in the system bar. Hotkeys can also be defined for each individual sets.
-
-
-Troubleshouting
-=============== 
-  Q: When I launch UMWP Autochanger, the window doesn't appear.
-  A: When you have already registered sets, the window automatically minimize 
-     to the system bar, double-click on the icon (or right-click => "Show") 
-     to open it. This behavior can be changed on the "Options" menu.
-
-  Q: Can I edit a set ?
-  A: Yes. Double-click on it's name, you can set the name, the type and the style of wallpaper.
-
-  Q: How hotkeys work ?
-  A: There are two kind of hotkeys: the ones defined in the "Options" dialog allow 
-     to show/hide the application window, refresh the wallpaper and start/pause the timer.  
-     The ones defined in the set edit dialog allow to change the current set.
-     You can assign the same hotkey to multiple sets.  
-     In both cases, click on the input box and press the desired keys combinination.
-     You must at least use one modifier (Ctrl, Shift, Alt, Win) and some keys are
-     not available (Esc, Tab, Backspace, ...).
-
-  Q: Can I reorder sets ?
-  A: Yes. Simply drag & drop them.
-
-
-Changelog
-=========
-
---- 1.7 (01/08/2014)
-  - new: add "Fill" mode
-  - new: create default.wallpaper file if not present
-  - change: don't delete missing sets but highlight them
-
---- 1.6 (08/03/2014)
-  - change: Alt-F4 effectively closes application without prompt
-  - fixed: application closes when closing dialog window while main window is hidden
-  - fixed: delay input with wrong display format
-  - fixed: set parameters randomly resetted
-
---- 1.5 (12/02/2014)
-  - new: export and import XML configuration file
-  - new: check UltraMon version
-  - new: add logger for debuging purposes
-  - new: "Active files" dialog with cliquable thumbnails for direct access to files
-  - fixed: better detection of UltraMon executable
-  - fixed: no more freeze when updating wallpaper
-
---- 1.4 (06/01/2014)
-  - new: more flexibility for hot keys + new hotkeys for refresh, start/pause, show/hide
-  - new: permanently save last used directory
-
---- 1.3 (03/12/2013)
-  - new: can choose the type of wallpaper ('monitor' or 'desktop') and the style 
-    ('center', 'tile', 'stretch', 'stretch proportional')
-  - new: icons for main buttons (add, [de]activate, delete)
-  - change: dedicated configuration dialog
-  - change: use a cache to speed up startup
-  - change: random images are taken from the same (random too) set if more than one is active
-  - fixed: refresh issue of the list when deleting sets
+UMWP Autochanger is a little tool for [UltraMon](http://www.realtimesoft.com/ultramon/) users. I has two main features :
+* randomly and periodically change the wallpaper of all your monitors,
+* manage sets of wallpapers, allowing you to quickly change which images are used.
+
+Version       : 1.8  
+Release date  : 10/11/2014  
+Author        : Damien "Mistic" Sorel  
+Website       : http://www.strangeplanet.fr/work/umwp-autochanger  
+License       : GNU General Public License Version 3  
+
+
+## Requirement
+* UltraMon 3.2.1 or higher
+* Windows 7/8 32/64 bits
+
+## Translation
+The application is currently available in English and French. [A translation page](https://www.transifex.com/projects/p/umwp-autochanger) has been created on Transifex, feel free to register and contribute.
+
+
+## Installation
+1. Install and configure UltraMon on your computer.
+
+2. Launch "UMWP Autochanger.exe".
+    * Depending on your configuration, you might be asked to locate "UltraMonDesktop.exe".
+
+3. Click on the plus button to add a new set. A set is basically a directory containing JPEG/PNG/BMP files. UMWP Autochanger will browse this directory recursively up to 3 levels searching for image files.
+
+4. Once you have added your sets, the wallpaper will randomly change every 60 seconds (default delay).
+
+
+## Configuration
+* Double-click on a set to edit it. You can change its name, its style (one image for each monitor or one image for the whole desktop), the transformation style for images (center, tile or stretch) and the hotkey.
+
+* On the "Options" dialog you can choose the delay, change the behavior of the tool and configure the hotkeys.  
+Hotkeys are a way to interact with the application while it is hidden in the system bar. Hotkeys can also be defined for each individual sets.
+
+* On the "Manage monitors" dialog you can disable the wallpaper on specific monitor, as well as choosing their background color.
+
+
+## Troubleshouting
+Q: When I launch UMWP Autochanger, the window doesn't appear.  
+A: When you have already registered sets, the window automatically minimize to the system bar, double-click on the icon (or right-click => "Show") to open it. This behavior can be changed on the "Options" menu.
+
+Q: How hotkeys work ?  
+A: There are two kind of hotkeys: the ones defined in the "Options" dialog allow to show/hide the application window, refresh the wallpaper and start/pause the timer.  
+The ones defined in the set edit dialog allow to change the current set. You can assign the same hotkey to multiple sets.  
+In both cases, click on the input box and press the desired keys combinination. You must at least use one modifier (Ctrl, Shift, Alt, Win) and some keys are not available (Esc, Tab, Backspace, ...).
+
+Q: Can I reorder sets ?  
+A: Yes. Simply drag & drop them.
+
+
+## Compiling
+You can compile the application yourself with Qt Designer.  
+You will need Qt 4.8.4 and libqxt 0.6.2
+
+
+## Changelog
+* [1.8 (10/11/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.7)
+    * new: can disable wallpaper support on specific monitors
+    * new: choose background color of each monitor
+    * new: "Delete" button on "Active files" dialog
+    * new: auto-update process
+    * fixed: crash after changing delay
 
---- 1.2 (09/09/2013)
-  - new: system-wide hotkeys for quick change
-  - new: reorder sets with drag'n'drop
-  - new: integrated help
-
---- 1.1 (13/05/2013)
-  - fixed: use better shuffle
-  - fixed: remember last used directory
-  - fixed: accept files with .jpeg extension
-  - new: add version checker
-  - new: add quick switch menu in tray con
-  - code optimizations
-
---- 1.0 (02/03/2013)
-  - fixed: multi delete doesn't work correclty
-
---- 1.0 alpha2 (28/02/2013)
-  - fixed: autorun shortcut not starting in the good working directory
-  - fixed: delay spinbox no initialized correctly
-  - new: multiple selection
-
---- 1.0 alpha1 (27/02/2013)
-  - first version
+* [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
+    * change: don't delete missing sets but highlight them
+
+* [1.6 (08/03/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.6)
+    * change: Alt-F4 effectively closes application without prompt
+    * fixed: application closes when closing dialog window while main window is hidden
+    * fixed: delay input with wrong display format
+    * fixed: set parameters randomly resetted
+
+* [1.5 (12/02/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.5)
+    * new: export and import XML configuration file
+    * new: check UltraMon version
+    * new: add logger for debuging purposes
+    * new: "Active files" dialog with cliquable thumbnails for direct access to files
+    * fixed: better detection of UltraMon executable
+    * fixed: no more freeze when updating wallpaper
+
+* [1.4 (06/01/2014)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.4)
+    * new: more flexibility for hot keys + new hotkeys for refresh, start/pause, show/hide
+    * new: permanently save last used directory
+
+* [1.3 (03/12/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.3)
+    * new: can choose the type of wallpaper ('monitor' or 'desktop') and the style ('center', 'tile', 'stretch', 'stretch proportional')
+    * new: icons for main buttons (add, [de]activate, delete)
+    * change: dedicated configuration dialog
+    * change: use a cache to speed up startup
+    * change: random images are taken from the same (random too) set if more than one is active
+    * fixed: refresh issue of the list when deleting sets
+
+* [1.2 (09/09/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.2)
+    * new: system-wide hotkeys for quick change
+    * new: reorder sets with drag'n'drop
+    * new: integrated help
+
+* [1.1 (13/05/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.1)
+    * fixed: use better shuffle
+    * fixed: remember last used directory
+    * fixed: accept files with .jpeg extension
+    * new: add version checker
+    * new: add quick switch menu in tray con
+    * code optimizations
+
+* [1.0 (02/03/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.0)
+    * fixed: multi delete doesn't work correclty
+
+* [1.0 alpha2 (28/02/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.0a2)
+    * fixed: autorun shortcut not starting in the good working directory
+    * fixed: delay spinbox no initialized correctly
+    * new: multiple selection
+
+* [1.0 alpha1 (27/02/2013)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.0a1)
+    * first version

installer/package.bat

@@ -1 +1 @@
-"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_1.7.zip ./data/* -x!*.ico
+"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_1.8.zip ./data/* -x!*.ico

src/constants.h

@@ -16,8 +16,8 @@
 #define APP_MAX_TRAVERSAL 3
 
 #define APP_HOMEPAGE "http://www.strangeplanet.fr/work/umwp-autochanger"
-#define APP_VERSION_URL "http://www.strangeplanet.fr/work/umwp-autochanger/last-version-2.txt"
-#define APP_INSTALLER_SIZE 5203022
+#define APP_VERSION_URL "http://www.strangeplanet.fr/work/umwp-autochanger/last-version.txt"
+#define APP_INSTALLER_SIZE 5228000
 #define APP_INSTALLER_FILENAME "installer.exe"
 
 #define APP_MIN_WIDTH 440

src/controller.cpp

@@ -31,8 +31,7 @@ void Controller::checkVersion()
     if (m_settings->get("check_updates").toBool())
     {
         VersionChecker* checker = new VersionChecker();
-        connect(checker, SIGNAL(newVersionAvailable(const QString, const QString)),
-                this, SLOT(onNewVersion(const QString, const QString)));
+        connect(checker, SIGNAL(newVersionAvailable(const NewVersion)), this, SLOT(onNewVersion(const NewVersion)));
 
         QThread* thread = new QThread(this);
         checker->moveToThread(thread);
@@ -51,9 +50,9 @@ void Controller::checkVersion()
  * @param string _version
  * @param string _link
  */
-void Controller::onNewVersion(const QString &_version, const QString &_link)
+void Controller::onNewVersion(const NewVersion _version)
 {
-    m_enviro->setNewVersion(_version, _link);
+    m_enviro->setNewVersion(_version);
     emit newVersionAvailable();
 }
 

src/controller.h

@@ -56,7 +56,7 @@ public slots:
     void onUpdate(bool _forceRefresh=false);
 
 private slots:
-    void onNewVersion(const QString &_ver, const QString &_link);
+    void onNewVersion(const NewVersion _version);
 
 signals:
     void listChanged(bool); // true to reset QListWidget selection

src/environment.cpp

@@ -20,6 +20,8 @@ Environment::Environment(Settings* _settings) :
     m_env["umversion"] = "";
     m_env["startlinkpath"] = QVariant();
     m_env["nb_monitors"] = 0;
+
+    qRegisterMetaType<NewVersion>("NewVersion");
 }
 
 /**
@@ -38,17 +40,6 @@ const bool Environment::isAutostart() const
     return QFile::exists(m_env["startlinkpath"].toString());
 }
 
-/**
- * @brief Save data of the new version available
- * @param string _ver
- * @param string _link
- */
-void Environment::setNewVersion(const QString &_ver, const QString &_link)
-{
-    m_newVersion.first = _ver;
-    m_newVersion.second = _link;
-}
-
 /**
  * @brief Dump whole env in the log
  */