Skip to content

Commit

Permalink
next version is 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Jun 28, 2015
1 parent ff260fc commit 2c7bed5
Show file tree
Hide file tree
Showing 23 changed files with 164 additions and 175 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

* [2.0 (28/06/2015)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=2.0)
* change: delete all dependencies to UltraMon
* new: allows to edit keyboard hotkeys of multiple sets in one time
* new: adds a "Open directory" button in the context menu
* new: allows to hide the closing warning
* new: change tray icon when paused

* [1.9 (25/02/2015)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php?ver=1.9)
* fixed: 90% JPEG quality for generated wallpapers
* fixed: timer not reseted on manual refresh
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# UltraMon Wallpaper Autochanger
# Ultimate Monitor Wallpaper Autochanger

[![stable version](http://www.strangeplanet.fr/work/umwp-autochanger/badge.php?what=version)](http://www.strangeplanet.fr/work/umwp-autochanger/download.php)
[![downloads](http://www.strangeplanet.fr/work/umwp-autochanger/badge.php?what=downloads)](http://www.strangeplanet.fr/work/umwp-autochanger)
[![Documentation](https://img.shields.io/badge/documentation-online-blue.svg)](http://www.strangeplanet.fr/work/umwp-autochanger#install)
[![Gratipay](https://img.shields.io/gratipay/mistic100.svg)](https://gratipay.com/mistic100)

UMWP Autochanger is a little tool for [UltraMon](http://www.realtimesoft.com/ultramon/) users. I has two main features :
UMWP Autochanger is a little tool for multi-monitors windows 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.9
Release date : 25/02/2015
Version : 2.0
Release date : 28/06/2015
Author : Damien "Mistic" Sorel
Website : http://www.strangeplanet.fr/work/umwp-autochanger
License : GNU General Public License Version 3

![screenshot](http://www.strangeplanet.fr/work/umwp-autochanger/src/screenshot-main.png)

## Requirement
* UltraMon 3.2.1 or higher
* Windows 7/8 32/64 bits


Expand All @@ -26,5 +26,5 @@ The application is currently available in English and French. [A translation pag


## Compiling
You can compile the application yourself with Qt Designer.
You can compile the application yourself with Qt Creator.
You will need Qt 4.8.4.
2 changes: 2 additions & 0 deletions installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ Put these DLLs in `data` directory before running `setup.iss` or `package.bat`:
* QtGui4.dll
* QtNetwork4.dll
* QtXml4.dll
* imageformats/qgif4.dll
* imageformats/qjpeg4.dll
105 changes: 0 additions & 105 deletions installer/data/readme.txt

This file was deleted.

2 changes: 1 addition & 1 deletion installer/package.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_1.9.zip ./data/* -x!*.ico
"C:\Program Files\7-Zip\7z.exe" a UMWP_Autochanger_2.0.zip ./data/* -x!*.ico
4 changes: 2 additions & 2 deletions installer/setup.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define AppId "{401CCECB-FFCC-4AF3-846D-A535F59D0834}"
#define AppName "UMWP Autochanger"
#define AppVersion "1.9"
#define AppVersion "2.0"
#define AppPublisher "StrangePlanet"
#define PublisherURL "http://www.strangeplanet.fr"
#define ProjectURL "http://www.strangeplanet.fr/work/umwp-autochanger"
Expand Down Expand Up @@ -30,7 +30,6 @@ DisableProgramGroupPage=auto

; readme
LicenseFile={#DataRoot}\gpl-3.0.txt
InfoAfterFile={#DataRoot}\readme.txt

; output
OutputDir=./
Expand Down Expand Up @@ -65,6 +64,7 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(
[InstallDelete]
Type: filesandordirs; Name: "{app}\cache";
Type: files; Name: "{app}\debug.log";
Type: files; Name: "{app}\readme.txt";
Type: files; Name: "{app}\QxtCore.dll";
Type: files; Name: "{app}\QxtGui.dll";

Expand Down
2 changes: 1 addition & 1 deletion src/UMWP_Autochanger.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<qresource prefix="/">
<file>images/icon.png</file>
<file>images/icon_pause.png</file>
<file>images/error.png</file>
<file>images/icons/about.png</file>
<file>images/icons/add.png</file>
<file>images/icons/add_color.png</file>
Expand Down Expand Up @@ -47,5 +46,6 @@
<file>lang/fr_FR/main.qm</file>
<file>lang/fr_FR/changelog.htm</file>
<file>lang/en_GB/changelog.htm</file>
<file>images/icons/todo.png</file>
</qresource>
</RCC>
1 change: 1 addition & 0 deletions src/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ void Controller::update()
m_settings->updateSets();
m_enviro->refreshMonitors();
emit listChanged(false);
m_files.clear();

// get random files
m_set = m_generator->getRandomSet();
Expand Down
7 changes: 7 additions & 0 deletions src/gui/changelogdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <QDialog>
#include <QFile>
#include <QTextStream>
#include <QDesktopServices>

#include "ui_changelogdialog.h"

Expand Down Expand Up @@ -63,6 +64,12 @@ class ChangelogDialog : public QDialog
{
delete ui;
}

private slots:
void on_content_anchorClicked(const QUrl &_url)
{
QDesktopServices::openUrl(_url);
}
};

#endif // CHANGELOGDIALOG_H
32 changes: 25 additions & 7 deletions src/gui/changelogdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,21 @@
<property name="windowTitle">
<string>Changelog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTextEdit" name="content">
<property name="readOnly">
<bool>true</bool>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../UMWP_Autochanger.qrc">:/images/icons/todo.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
Expand All @@ -34,9 +40,21 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QTextBrowser" name="content">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="openLinks">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<resources>
<include location="../UMWP_Autochanger.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
Expand Down
28 changes: 22 additions & 6 deletions src/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ void MainWindow::init()

if (QString::fromAscii(APP_VERSION).compare(m_settings->get("changelog_shown").toString()) > 0)
{
openChangelogDialog();
m_settings->setOpt("changelog_shown", QString::fromAscii(APP_VERSION));

if (m_settings->nbSets()>0) // do not show changelog at first startup
{
openChangelogDialog();
}
}
}

Expand Down Expand Up @@ -196,6 +201,12 @@ void MainWindow::toggleWindow(bool _forceHide)
activateWindow();

m_trayIcon->setHidden(false);

if (QString::fromAscii(APP_VERSION).compare(m_settings->get("changelog_shown").toString()) > 0)
{
m_settings->setOpt("changelog_shown", QString::fromAscii(APP_VERSION));
openChangelogDialog();
}
}
}

Expand Down Expand Up @@ -349,16 +360,14 @@ void MainWindow::openChangelogDialog()
{
ChangelogDialog dialog(this);
dialog.exec();

m_settings->setOpt("changelog_shown", QString::fromAscii(APP_VERSION));
}

/**
* @brief Open about dialog
*/
void MainWindow::openAboutDialog()
{
QString text = "<h3>" + QString::fromAscii(APP_NAME) + " " + QString::fromAscii(APP_VERSION) + "</h3>";
QString text = "<h3>" + QString::fromAscii(APP_FILEDESCRIPTION) + " " + QString::fromAscii(APP_VERSION) + "</h3>";
text+= "Created by Damien \"Mistic\" Sorel.<br>";
text+= "&copy; 2013-2015 <a href=\"http://strangeplanet.fr\">StrangePlanet.fr</a><br>";
text+= "Licenced under <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GNU General Public License Version 3</a>";
Expand All @@ -384,8 +393,15 @@ void MainWindow::openAboutDialog()
*/
void MainWindow::openPreviewDialog()
{
PreviewDialog dialog(this, m_ctrl);
dialog.exec();
if (m_ctrl->files().isEmpty())
{
QMessageBox::warning(this, tr("Error"), tr("No active files"), QMessageBox::Ok);
}
else
{
PreviewDialog dialog(this, m_ctrl);
dialog.exec();
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/gui/menubar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MenuBar::MenuBar(MainWindow* _parent, Controller *_ctrl) :

QMenu* menuHelp = new QMenu();
QAction* actionHelp = menuHelp->addAction(QIcon(":/images/icons/help_color.png"), tr("User guide"));
m_actionFiles = menuHelp->addAction(QIcon(":/images/icons/images.png"), tr("Active files"));
QAction* actionFiles = menuHelp->addAction(QIcon(":/images/icons/images.png"), tr("Active files"));
menuHelp->addSeparator();
QAction* actionIssues = menuHelp->addAction(QIcon(":/images/icons/bug.png"), tr("Report a bug"));
QAction* actionHome = menuHelp->addAction(QIcon(":/images/icons/house.png"), tr("Homepage"));
Expand Down Expand Up @@ -51,7 +51,7 @@ MenuBar::MenuBar(MainWindow* _parent, Controller *_ctrl) :

connect(actionHelp, SIGNAL(triggered()), _parent, SLOT(openHelpDialog()));
connect(actionAbout, SIGNAL(triggered()), _parent, SLOT(openAboutDialog()));
connect(m_actionFiles, SIGNAL(triggered()), _parent, SLOT(openPreviewDialog()));
connect(actionFiles, SIGNAL(triggered()), _parent, SLOT(openPreviewDialog()));

// use signal mapper for all buttons oppening a web page
QSignalMapper* mapper = new QSignalMapper(this);
Expand Down
2 changes: 0 additions & 2 deletions src/gui/menubar.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class MenuBar : public QToolBarExt
Controller* m_ctrl;

QToolButton* m_actionPause;
QAction* m_actionFiles;

QWidgetBlinker* m_pauseBlinker;

public:
Expand Down
Binary file removed src/images/error.png
Binary file not shown.
Binary file added src/images/icons/todo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/src/button.psd
Binary file not shown.
Binary file removed src/images/src/keys.psd
Binary file not shown.
14 changes: 14 additions & 0 deletions src/lang/en_GB/changelog.htm
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,18 @@
<li>Allows to hide the closing warning.</li>
</ul>
</dd>

<dt>Version 1.9.0 <small>February 25th 2015</small></dt>
<dd>
<ul>
<li>New context menu on sets list.</li>
<li>Choosable application language.</li>
<li>"Mode" option: random or sequential.</li>
<li>Batch edition of sets.</li>
</ul>
</dd>

<dd>
<a href="https://github.com/mistic100/UMWP-Autochanger/releases">See older versions</a>
</dd>
</dl>
Loading

0 comments on commit 2c7bed5

Please sign in to comment.