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 /ui/qt/main_welcome.ui | |
parent | c200f1e90bf75d5f15046d97657dafd4127ad278 (diff) | |
download | wireshark-999bbc9b700543d92d6db7301b4893ebbcd883cc.tar.gz |
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 'ui/qt/main_welcome.ui')
-rw-r--r-- | ui/qt/main_welcome.ui | 49 |
1 files changed, 39 insertions, 10 deletions
diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index 2547d909ec..c59c32e96c 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -37,22 +37,44 @@ <widget class="QWidget" name="childContainer" native="true"> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QLabel" name="mainWelcomeBanner"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <widget class="QWidget" name="bannerLayout" native="true"> <property name="minimumSize"> <size> <width>650</width> <height>0</height> </size> </property> - <property name="text"> - <string>Welcome to Wireshark.</string> - </property> + <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="mainWelcomeBanner"> + <property name="text"> + <string>Welcome to Wireshark.</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="flavorBanner"> + <property name="text"> + <string>s</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + </layout> </widget> </item> <item> @@ -238,6 +260,13 @@ a:hover { </property> </widget> </item> + <item> + <widget class="QLabel" name="fullReleaseLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> </layout> </widget> </item> |