diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-10 13:48:48 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-19 22:09:34 +0000 |
| commit | 999bbc9b700543d92d6db7301b4893ebbcd883cc (patch) | |
| tree | 0559a5fde2c19ff99473e83bd2b03aa53972fbac /config.nmake | |
| parent | c200f1e90bf75d5f15046d97657dafd4127ad278 (diff) | |
Qt: Add more version and packaging information to the main window.
Add a "flavor" (for lack of a better word) banner, which can be set at
build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to
"Development Build" by default. This effectively migrates the
"DEVELOPMENT VERSION" logo image text from the GTK+ UI.
Add full release and automatic update information at the bottom.
Remove the short version from the welcome banner (top left).
To do:
- Add back support for gui_version_placement.
- Move the version and repository branch to the flavor label?
- Add update links as appropriate to the bottom.
- Clean up layout and spacing.
Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057
Reviewed-on: https://code.wireshark.org/review/7071
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 40a4a2ee4e..c2c72eb707 100644 --- a/config.nmake +++ b/config.nmake @@ -44,6 +44,13 @@ VERSION_BUILD=$(VCS_REVISION) VERSION_EXTRA=$(WIRESHARK_VERSION_EXTRA) +# Banner shown at top right of Qt welcome screen. +!IFDEF WIRESHARK_VERSION_FLAVOR +VERSION_FLAVOR=$(WIRESHARK_VERSION_FLAVOR) +!ELSE +VERSION_FLAVOR="Development Build" +!ENDIF + # The version of the wiretap library. Recommended: Leave unchanged. WTAP_VERSION_MAJOR=$(VERSION_MAJOR) WTAP_VERSION_MINOR=$(VERSION_MINOR) |