Skip to content

Commit 28593a8

Browse files
committed
doxygen image updates (and readme)
1 parent 0e18923 commit 28593a8

File tree

4 files changed

+68
-46
lines changed

4 files changed

+68
-46
lines changed

AutoUpdaterGui/updatecontroller.dox

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@ Back to UpdaterController.
77

88
## Windows - Windows 10
99
#### The Updater Elements
10-
@image html ./doc/images/win/dialog_ask.png "Ask Dialog"<br>
11-
@image html ./doc/images/win/dialog_progress.png "Progress Dialog"<br>
12-
@image html ./doc/images/win/dialog_no_updates.png "No Updates Dialog"<br>
13-
@image html ./doc/images/win/dialog_info.png "Detailed Update Information Dialog"<br>
14-
@image html ./doc/images/win/dialog_info_simple.png "Simple Update Information Dialog"<br>
15-
@image html ./doc/images/win/dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
10+
@image html ./doc/images/win_dialog_ask.png "Ask Dialog"<br>
11+
@image html ./doc/images/win_dialog_progress.png "Progress Dialog"<br>
12+
@image html ./doc/images/win_dialog_no_updates.png "No Updates Dialog"<br>
13+
@image html ./doc/images/win_dialog_info.png "Detailed Update Information Dialog"<br>
14+
@image html ./doc/images/win_dialog_info_simple.png "Simple Update Information Dialog"<br>
15+
@image html ./doc/images/win_dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
1616

1717
#### The Update Panel
18-
@image html ./doc/images/win/panel_idle.png "Panel before clicking"<br>
19-
@image html ./doc/images/win/panel_checking.png "Panel while checking"<br>
20-
@image html ./doc/images/win/panel_updates.png "Panel with updates"<br>
21-
@image html ./doc/images/win/panel_no_updates.png "Panel without updates"<br>
18+
@image html ./doc/images/win_panel_idle.png "Panel before clicking"<br>
19+
@image html ./doc/images/win_panel_checking.png "Panel while checking"<br>
20+
@image html ./doc/images/win_panel_updates.png "Panel with updates"<br>
21+
@image html ./doc/images/win_panel_no_updates.png "Panel without updates"<br>
2222

2323
#### The Action
24-
@image html ./doc/images/win/action.png "Update action inside a menu and a toolbar"<br>
24+
@image html ./doc/images/win_action.png "Update action inside a menu and a toolbar"<br>
2525

2626
## Mac - OsX 10.11
2727
The following pictures show the controller with a parent windows. Thus, all dialogs
2828
are shown as "sheets" to that window. If you create the UpdateController without a widget,
2929
they will show as normal toplevel windows instead.
3030

3131
#### The Updater Elements
32-
@image html ./doc/images/mac/dialog_ask.png "Ask Dialog"<br>
33-
@image html ./doc/images/mac/dialog_progress.png "Progress Dialog"<br>
34-
@image html ./doc/images/mac/dialog_no_updates.png "No Updates Dialog"<br>
35-
@image html ./doc/images/mac/dialog_info.png "Detailed Update Information Dialog"<br>
36-
@image html ./doc/images/mac/dialog_info_simple.png "Simple Update Information Dialog"<br>
37-
@image html ./doc/images/mac/dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
32+
@image html ./doc/images/mac_dialog_ask.png "Ask Dialog"<br>
33+
@image html ./doc/images/mac_dialog_progress.png "Progress Dialog"<br>
34+
@image html ./doc/images/mac_dialog_no_updates.png "No Updates Dialog"<br>
35+
@image html ./doc/images/mac_dialog_info.png "Detailed Update Information Dialog"<br>
36+
@image html ./doc/images/mac_dialog_info_simple.png "Simple Update Information Dialog"<br>
37+
@image html ./doc/images/mac_dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
3838

3939
#### The Update Panel
40-
@image html ./doc/images/mac/panel_idle.png "Panel before clicking"<br>
41-
@image html ./doc/images/mac/panel_checking.png "Panel while checking"<br>
42-
@image html ./doc/images/mac/panel_updates.png "Panel with updates"<br>
43-
@image html ./doc/images/mac/panel_no_updates.png "Panel without updates"<br>
40+
@image html ./doc/images/mac_panel_idle.png "Panel before clicking"<br>
41+
@image html ./doc/images/mac_panel_checking.png "Panel while checking"<br>
42+
@image html ./doc/images/mac_panel_updates.png "Panel with updates"<br>
43+
@image html ./doc/images/mac_panel_no_updates.png "Panel without updates"<br>
4444

4545
#### The Action
46-
@image html ./doc/images/mac/action.png "Update action inside a menu and a toolbar"<br>
46+
@image html ./doc/images/mac_action.png "Update action inside a menu and a toolbar"<br>
4747

4848
## X11 - Ubuntu 14.04
4949
#### The Updater Elements
50-
@image html ./doc/images/x11/dialog_ask.png "Ask Dialog"<br>
51-
@image html ./doc/images/x11/dialog_progress.png "Progress Dialog"<br>
52-
@image html ./doc/images/x11/dialog_no_updates.png "No Updates Dialog"<br>
53-
@image html ./doc/images/x11/dialog_info.png "Detailed Update Information Dialog"<br>
54-
@image html ./doc/images/x11/dialog_info_simple.png "Simple Update Information Dialog"<br>
55-
@image html ./doc/images/x11/dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
50+
@image html ./doc/images/x11_dialog_ask.png "Ask Dialog"<br>
51+
@image html ./doc/images/x11_dialog_progress.png "Progress Dialog"<br>
52+
@image html ./doc/images/x11_dialog_no_updates.png "No Updates Dialog"<br>
53+
@image html ./doc/images/x11_dialog_info.png "Detailed Update Information Dialog"<br>
54+
@image html ./doc/images/x11_dialog_info_simple.png "Simple Update Information Dialog"<br>
55+
@image html ./doc/images/x11_dialog_exit.png "Automatic Run - Exit Notification Dialog"<br>
5656

5757
#### The Update Panel
58-
@image html ./doc/images/x11/panel_idle.png "Panel before clicking"<br>
59-
@image html ./doc/images/x11/panel_checking.png "Panel while checking"<br>
60-
@image html ./doc/images/x11/panel_updates.png "Panel with updates"<br>
61-
@image html ./doc/images/x11/panel_no_updates.png "Panel without updates"<br>
58+
@image html ./doc/images/x11_panel_idle.png "Panel before clicking"<br>
59+
@image html ./doc/images/x11_panel_checking.png "Panel while checking"<br>
60+
@image html ./doc/images/x11_panel_updates.png "Panel with updates"<br>
61+
@image html ./doc/images/x11_panel_no_updates.png "Panel without updates"<br>
6262

6363
#### The Action
64-
@image html ./doc/images/x11/action.png "Update action inside a menu and a toolbar"<br>
64+
@image html ./doc/images/x11_action.png "Update action inside a menu and a toolbar"<br>
6565
*/
6666

6767
/*!
@@ -334,7 +334,7 @@ UpdateController::maintenanceToolPath for more details.
334334

335335
@overload
336336
@param maintenanceToolPath The path to the maintenancetool
337-
@param parentWidget The parent widget. Will serve as parent for the controller and windows
337+
@param parentWindow The parent widget. Will serve as parent for the controller and windows
338338
@param parent The parent object. Will serve as parent for the controller
339339

340340
The maintenancetool path will be set to the given one (and cannot be changed). See

AutoUpdaterGui/updatecontroller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace QtAutoUpdater
5858
//! Create a QAction to start this controller from
5959
QAction *createUpdateAction(QObject *parent);
6060
//! Creates a new "UpdatePanel" widget to place in your GUI
61-
QWidget *createUpdatePanel(QWidget *parentWindow);
61+
QWidget *createUpdatePanel(QWidget *parentWidget);
6262

6363
//! READ-Accessor for UpdateController::maintenanceToolPath
6464
QString maintenanceToolPath() const;

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ Github repository: https://github.com/Skycoder42/QtAutoUpdater
3232
#### Screenshots
3333
Here some sample screenshots of the gui (The rocket of the information dialog is the "application icon" and depends on your application)
3434

35-
| Dialog Sample | Windows | Mac | X11 |
36-
|--------------------|-------------------------------------------|-------------------------------------------|-------------------------------------------|
37-
| Progress Dialog | ![](./doc/images/win_dialog_progress.png) | ![](./doc/images/mac_dialog_progress.png) | ![](./doc/images/x11_dialog_progress.png) |
38-
| Information Dialog | ![](./doc/images/win_dialog_info.png) | ![](./doc/images/mac_dialog_info.png) | ![](./doc/images/x11_dialog_info.png) |
39-
| Update Panel | ![](./doc/images/win_panel_checking.png) | ![](./doc/images/mac_panel_checking.png) | ![](./doc/images/x11_panel_checking.png) |
40-
| Update Action | ![](./doc/images/win_action.png) | ![](./doc/images/mac_action.png) | ![](./doc/images/x11_action.png) |
35+
| Windows | Mac | X11 |
36+
|----------------------------------------------------------|----------------------------------------------------------|----------------------------------------------------------|
37+
| ![Progress Dialog](./doc/images/win_dialog_progress.png) | ![Progress Dialog](./doc/images/mac_dialog_progress.png) | ![Progress Dialog](./doc/images/x11_dialog_progress.png) |
38+
| ![Information Dialog](./doc/images/win_dialog_info.png) | ![Information Dialog](./doc/images/mac_dialog_info.png) | ![Information Dialog](./doc/images/x11_dialog_info.png) |
39+
| ![Update Panel](./doc/images/win_panel_checking.png) | ![Update Panel](./doc/images/mac_panel_checking.png) | ![Update Panel](./doc/images/x11_panel_checking.png) |
40+
| ![Update Action](./doc/images/win_action.png) | ![Update Action](./doc/images/mac_action.png) | ![Update Action](./doc/images/x11_action.png) |
4141

4242
## Requirements
4343
- Qt Installer Framework: The updater requires the application to be installed using the framework and will use the frameworks update mechanism to check for updates (https://doc.qt.io/qtinstallerframework/, download at https://download.qt.io/official_releases/qt-installer-framework/)

doc/QtAutoUpdater.doxy

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.10
1+
# Doxyfile 1.8.11
22

33
# This file describes the settings to be used by the documentation system
44
# doxygen (www.doxygen.org) for a project.
@@ -766,6 +766,12 @@ WARN_IF_DOC_ERROR = YES
766766

767767
WARN_NO_PARAMDOC = YES
768768

769+
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
770+
# a warning is encountered.
771+
# The default value is: NO.
772+
773+
WARN_AS_ERROR = NO
774+
769775
# The WARN_FORMAT tag determines the format of the warning messages that doxygen
770776
# can produce. The string should contain the $file, $line, and $text tags, which
771777
# will be replaced by the file and line number from which the warning originated
@@ -824,8 +830,8 @@ INPUT_ENCODING = UTF-8
824830
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
825831
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
826832
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
827-
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
828-
# *.vhdl, *.ucf, *.qsf, *.as and *.js.
833+
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
834+
# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
829835

830836
FILE_PATTERNS = *.c \
831837
*.cc \
@@ -940,7 +946,7 @@ EXAMPLE_RECURSIVE = YES
940946
# that contain images that are to be included in the documentation (see the
941947
# \image command).
942948

943-
IMAGE_PATH =
949+
IMAGE_PATH = images
944950

945951
# The INPUT_FILTER tag can be used to specify a program that doxygen should
946952
# invoke to filter for each input file. Doxygen will invoke the filter program
@@ -956,6 +962,10 @@ IMAGE_PATH =
956962
# Note that the filter must not add or remove lines; it is applied before the
957963
# code is scanned, but not when the output code is generated. If lines are added
958964
# or removed, the anchors will not be placed correctly.
965+
#
966+
# Note that for custom extensions or not directly supported extensions you also
967+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
968+
# properly processed by doxygen.
959969

960970
INPUT_FILTER =
961971

@@ -965,6 +975,10 @@ INPUT_FILTER =
965975
# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
966976
# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
967977
# patterns match the file name, INPUT_FILTER is applied.
978+
#
979+
# Note that for custom extensions or not directly supported extensions you also
980+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
981+
# properly processed by doxygen.
968982

969983
FILTER_PATTERNS =
970984

@@ -1082,7 +1096,7 @@ VERBATIM_HEADERS = YES
10821096
# rich C++ code for which doxygen's built-in parser lacks the necessary type
10831097
# information.
10841098
# Note: The availability of this option depends on whether or not doxygen was
1085-
# compiled with the --with-libclang option.
1099+
# generated with the -Duse-libclang=ON option for CMake.
10861100
# The default value is: NO.
10871101

10881102
CLANG_ASSISTED_PARSING = NO
@@ -1826,6 +1840,14 @@ LATEX_SOURCE_CODE = NO
18261840

18271841
LATEX_BIB_STYLE = plain
18281842

1843+
# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
1844+
# page will contain the date and time when the page was generated. Setting this
1845+
# to NO can help when comparing the output of multiple runs.
1846+
# The default value is: NO.
1847+
# This tag requires that the tag GENERATE_LATEX is set to YES.
1848+
1849+
LATEX_TIMESTAMP = NO
1850+
18291851
#---------------------------------------------------------------------------
18301852
# Configuration options related to the RTF output
18311853
#---------------------------------------------------------------------------

0 commit comments

Comments
 (0)