From 8b24471e62940d8a9335151809d6bc5913f94fdd Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 19 Dec 2014 16:27:57 -0800 Subject: Qt: Revert back to an all-in-one main window. Switch back to having everything on the main window similar to GTK+. It's more cluttered but this way but you don't have to navigate the task selector to get to the recent files and help links. Retain the "Capture", "Open", and "Learn" imperative text. Move "Open" to the top as suggested by Michal. Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d Reviewed-on: https://code.wireshark.org/review/5896 Reviewed-by: Gerald Combs --- ui/qt/main_welcome.ui | 366 +++++++++++++++++++++++++------------------------- 1 file changed, 183 insertions(+), 183 deletions(-) (limited to 'ui/qt/main_welcome.ui') diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index 113c77333b..5d5a63a60b 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -7,7 +7,7 @@ 0 0 811 - 533 + 663 @@ -19,209 +19,208 @@ Form - + + + + + Qt::Horizontal + + + + 44 + 20 + + + + - - - - - - 0 - 1 - - - - 2 - - - - - 0 - - - - - - 0 - - - 0 - - - 0 - - - - - Capture filter: - - - - - - - - 0 - 0 - - - - true - - - - - - - - - - - 0 - 0 - - - - Qt::ScrollBarAlwaysOff - - - true - - - 2 - - - false - - - - 1 - - - - - 2 - - - - - + + + + 0 + 0 + + + + + 650 + 0 + + + + Welcome to Wireshark. + + + + + + + <h2>Open</h2> + + + + + + + + 1 + 2 + + + + Qt::ScrollBarAlwaysOff + + + + + + + <html><head/><body><p>Capture live packets from your network.</p></body></html> + + + <h2>Capture</h2> + + + + + + + + 0 + + + 0 + + + 0 + + + + + …using this filter: + - + + + - - 1 - 1 + + 0 + 0 - - Qt::ScrollBarAlwaysOff + + true - - - <html><head/> + + + + + + + + + 0 + 1 + + + + Qt::ScrollBarAlwaysOff + + + true + + + 2 + + + false + + + + 1 + + + + + 2 + + + + + + + + <h2>Learn</h2> + + + + + + + <html><head> +<style> +a:link { + color: inherit; + text-decoration: none; +} +a:hover { + color: inherit; + text-decoration: underline; +} +</style> +</head> <body> -<h2><a href="http://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></h2> -<p> -How to install Wireshark and how to use each of its features.<br/> -Other formats and command-line man pages can be found on<br/> -the <a href="http://www.wireshark.org/docs/">documentation page</a>. -</p> +<table><tr> +<th><a href="http://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></th> + +<td style="padding-left: 8px; padding-right: 8px;">·</td> + +<th><a href="http://wiki.wireshark.org/">Wiki</a></th> -<h2><a href="http://wiki.wireshark.org/">The Wireshark Wiki</a></h2> -<p> -User-contributed pages on different aspects of using Wireshark.<br/> -Capturing in different environments, filtering, specific protocols,<br/> -and a variety of other information. -</p> +<td style="padding-left: 8px; padding-right: 8px;">·</td> -<h2><a href="http://ask.wireshark.org/">Wireshark Q&amp;A</a></h2> -<p> -Question and answer site for Wireshark and protocol analysis. -</p> +<th><a href="http://ask.wireshark.org/">Questions and Answers</a></th> -<h2><a href="http://www.wireshark.org/lists/">Mailing Lists</a></h2> -<p> -In-depth discussions about Wireshark and protocol analysis. -</p> +<td style="padding-left: 8px; padding-right: 8px;">·</td> +<th><a href="http://www.wireshark.org/lists/">Mailing Lists</a></th> + +</tr></table> </body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 0 - 5 - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - false - - - Qt::ElideNone - - - - Capture -live packets from your network - - - - - Open -a recent capture file - - - - - Learn -more about Wireshark - - - - - - - - - 0 - 0 - - - - - - - - + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + Qt::Horizontal + + + + 43 + 20 + + + + @@ -236,5 +235,6 @@ more about Wireshark
capture_filter_combo.h
 + -- cgit v1.2.1