next version is 1.7

add "reset" button next to hotkey input
mistic100 · Aug 1, 2014 · a407e43 · a407e43
1 parent 73b48bf
commit a407e43
Show file tree

Hide file tree

Showing 18 changed files with 237 additions and 128 deletions.
diff --git a/README.md b/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.6  
-Release date  : 08/03/2014  
+Version       : 1.7  
+Release date  : 01/08/2014  
 Author        : Damien "Mistic" Sorel  
 Website       : http://www.strangeplanet.fr/work/umwp-autochanger  
 License       : GNU General Public License Version 3  
@@ -48,7 +48,7 @@ A: Yes. Double-click on it's name, you can set the name, the type and the style
 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, ...). Press Esc or Backspace to clear the hotkey.
+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.
@@ -60,7 +60,7 @@ You will need Qt 4.8.4 and libqxt 0.6.2
 
 
 ## Changelog
-* 1.7
+* [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

diff --git a/installer/data/readme.txt b/installer/data/readme.txt
@@ -1,7 +1,7 @@
 UltraMon Wallpaper Autochanger
 
-Version       : 1.6
-Release date  : 08/03/2014
+Version       : 1.7  
+Release date  : 01/08/2014  
 Author        : Damien "Mistic" Sorel
 Website       : http://www.strangeplanet.fr
 License       : GNU General Public License Version 3
@@ -24,18 +24,15 @@ Installation
 ============
  1. Install and configure UltraMon on your computer.
 
- 2. Go to the wallpaper configuration of UltraMon and ensure that the profile "default" exists, 
-    if not, create it. You don't need to configure anything else on this screen.
-
- 3. Launch "UMWP Autochanger.exe".
+ 2. Launch "UMWP Autochanger.exe".
 
- 3.1. Depending on your configuration, you might be asked to locate "UltraMonDesktop.exe".
+ 2.1. Depending on your configuration, you might be asked to locate "UltraMonDesktop.exe".
 
- 4. Click on the plus button to add a new set. A set is basically a directory 
+ 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.
 
- 5. Once you have added your sets, the wallpaper will randomly change
+ 4. Once you have added your sets, the wallpaper will randomly change
     every 60 seconds (default delay).
 
 
@@ -68,7 +65,7 @@ Troubleshouting
      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, ...). Press Esc or Backspace to clear the hotkey.
+     not available (Esc, Tab, Backspace, ...).
 
   Q: Can I reorder sets ?
   A: Yes. Simply drag & drop them.
@@ -77,6 +74,11 @@ Troubleshouting
 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

diff --git a/installer/package.bat b/installer/package.bat
@@ -0,0 +1 @@
+"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_1.7.zip ./data/* -x!*.ico
diff --git a/installer/setup.iss b/installer/setup.iss
@@ -1,6 +1,6 @@
 #define AppId "{401CCECB-FFCC-4AF3-846D-A535F59D0834}"
 #define AppName "UMWP Autochanger"
-#define AppVersion "1.6"
+#define AppVersion "1.7"
 #define AppPublisher "StrangePlanet"
 #define PublisherURL "http://www.strangeplanet.fr"
 #define ProjectURL "http://www.strangeplanet.fr/work/umwp-autochanger"
@@ -116,22 +116,3 @@ begin
       Result := True;
     end
 end;
-
-// handle options
-{*
-function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-  Result := True;
-  if CurPageID = wpSelectTasks then
-    begin
-      if IsTaskSelected('autostart') then
-        begin
-          MsgBox('Task has been checked.', mbInformation, MB_OK);
-        end
-      else
-        begin
-          MsgBox('Ttask has NOT been checked.', mbInformation, MB_OK);
-        end
-    end;
-end;
-*}
diff --git a/src/UMWP_Autochanger.pro b/src/UMWP_Autochanger.pro
@@ -28,8 +28,7 @@ SOURCES += \
     qlineedithotkey.cpp \
     qtoolbarext.cpp \
     previewdialog.cpp \
-    sysreader.cpp \
-    reader.cpp
+    sysreader.cpp
 
 HEADERS += \
     lib/createshortcut.h \
@@ -53,7 +52,8 @@ HEADERS += \
     constants.h \
     widgetblinker.h \
     sysreader.h \
-    qscreen.h
+    qscreen.h \
+    qhotkeywidget.h
 
 RESOURCES += \
     UMWP_Autochanger.qrc
@@ -69,4 +69,5 @@ FORMS += \
     mainwidget.ui \
     seteditdialog.ui \
     configdialog.ui \
-    previewdialog.ui
+    previewdialog.ui \
+    qhotkeywidget.ui
diff --git a/src/UMWP_Autochanger.qrc b/src/UMWP_Autochanger.qrc
@@ -26,6 +26,7 @@
         <file alias="about">images/icons/about.png</file>
         <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>
     </qresource>
     <qresource prefix="/button">
         <file alias="activate">images/buttons/button_activate.png</file>

diff --git a/src/configdialog.cpp b/src/configdialog.cpp
@@ -60,20 +60,20 @@ void ConfigDialog::done(int result)
         QString error;
 
         // validate hotkeys
-        QHash<QString, QLineEditHotkey*> requestHotkeys;
+        QHash<QString, QHotKeyWidget*> requestHotkeys;
         requestHotkeys.insert(tr("Refresh"), ui->hotkeyRefresh);
         requestHotkeys.insert(tr("Show/Hide"), ui->hotkeyShowHide);
         requestHotkeys.insert(tr("Start/Pause"), ui->hotkeyStartPause);
 
-        for (QHash<QString, QLineEditHotkey*>::iterator it=requestHotkeys.begin(); it!=requestHotkeys.end(); ++it)
+        for (QHash<QString, QHotKeyWidget*>::iterator it=requestHotkeys.begin(); it!=requestHotkeys.end(); ++it)
         {
             if (!it.value()->hotkey())
             {
                 continue;
             }
 
             // check against other main hotkeys
-            for (QHash<QString, QLineEditHotkey*>::iterator it2=requestHotkeys.begin(); it2!=it; ++it2)
+            for (QHash<QString, QHotKeyWidget*>::iterator it2=requestHotkeys.begin(); it2!=it; ++it2)
             {
                 if (!it2.value()->hotkey())
                 {

diff --git a/src/configdialog.ui b/src/configdialog.ui
@@ -6,14 +6,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>420</width>
+    <width>430</width>
     <height>188</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Options</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_1">
+   <item row="2" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" rowspan="3">
     <widget class="QGroupBox" name="groupBox_1">
      <property name="title">
@@ -89,45 +99,42 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Hotkeys</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_3">
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Show/Hide :</string>
+         <string>Refresh :</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEditHotkey" name="hotkeyRefresh"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Refresh :</string>
+         <string>Show/Hide :</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
+      <item row="0" column="0" colspan="3">
+       <widget class="QCheckBox" name="optionUseHotkeys">
+        <property name="text">
+         <string>Use hotkeys</string>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
@@ -138,18 +145,14 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEditHotkey" name="hotkeyShowHide"/>
+      <item row="1" column="1" colspan="2">
+       <widget class="QHotKeyWidget" name="hotkeyRefresh" native="true"/>
       </item>
-      <item row="3" column="1">
-       <widget class="QLineEditHotkey" name="hotkeyStartPause"/>
+      <item row="2" column="1" colspan="2">
+       <widget class="QHotKeyWidget" name="hotkeyShowHide" native="true"/>
       </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QCheckBox" name="optionUseHotkeys">
-        <property name="text">
-         <string>Use hotkeys</string>
-        </property>
-       </widget>
+      <item row="3" column="1" colspan="2">
+       <widget class="QHotKeyWidget" name="hotkeyStartPause" native="true"/>
       </item>
      </layout>
     </widget>
@@ -158,9 +161,10 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QLineEditHotkey</class>
-   <extends>QLineEdit</extends>
-   <header>qlineedithotkey.h</header>
+   <class>QHotKeyWidget</class>
+   <extends>QWidget</extends>
+   <header>qhotkeywidget.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/src/images/icons/bullet_cross.png b/src/images/icons/bullet_cross.png
diff --git a/src/lang/en_GB/main.ts b/src/lang/en_GB/main.ts
@@ -9,37 +9,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="20"/>
+        <location filename="../../configdialog.ui" line="30"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="28"/>
+        <location filename="../../configdialog.ui" line="38"/>
         <source>Delay :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="57"/>
+        <location filename="../../configdialog.ui" line="67"/>
         <source>Minimize on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="64"/>
+        <location filename="../../configdialog.ui" line="74"/>
         <source>Check files periodically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="71"/>
+        <location filename="../../configdialog.ui" line="81"/>
         <source>Check updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="78"/>
+        <location filename="../../configdialog.ui" line="88"/>
         <source>Start with Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="85"/>
+        <location filename="../../configdialog.ui" line="95"/>
         <source>Show notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49,22 +49,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="111"/>
+        <location filename="../../configdialog.ui" line="124"/>
         <source>Show/Hide :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="124"/>
+        <location filename="../../configdialog.ui" line="114"/>
         <source>Refresh :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="134"/>
+        <location filename="../../configdialog.ui" line="141"/>
         <source>Start/Pause :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../configdialog.ui" line="150"/>
+        <location filename="../../configdialog.ui" line="134"/>
         <source>Use hotkeys</source>
         <translation type="unfinished"></translation>
     </message>
@@ -349,6 +349,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QHotKeyWidget</name>
+    <message>
+        <location filename="../../qhotkeywidget.ui" line="38"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SetEditDialog</name>
     <message>
@@ -372,7 +380,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../seteditdialog.ui" line="108"/>
+        <location filename="../../seteditdialog.ui" line="105"/>
         <source>Style :</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/lang/fr_FR/main.qm b/src/lang/fr_FR/main.qm