Update the Qt welcome banner.

Empty the "flavor" banner text by default to allow room for custom
builds. Make the main welcome message more prominent.

Change-Id: I92d2ed88abbe504af8a0818f9902e39a9fc3d6d5
Reviewed-on: https://code.wireshark.org/review/10969
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

5 files changed, 34 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1207af6ff..bb1ec5224c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT
 if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
 	set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
 else()
-	set(VERSION_FLAVOR "Development Build")
+	# set(VERSION_FLAVOR "Development Build")
 endif()
 
 # These are required in .rc files and manifests
diff --git a/config.nmake b/config.nmake
index b8c6c017eb..4f6e75b19a 100644
--- a/config.nmake
+++ b/config.nmake
@@ -48,7 +48,7 @@ VERSION_EXTRA=$(WIRESHARK_VERSION_EXTRA)
 !IFDEF WIRESHARK_VERSION_FLAVOR
 VERSION_FLAVOR=$(WIRESHARK_VERSION_FLAVOR)
 !ELSE
-VERSION_FLAVOR=Development Build
+#VERSION_FLAVOR=Development Build
 !ENDIF
 
 # The version of the wiretap library. Recommended: Leave unchanged.
diff --git a/configure.ac b/configure.ac
index 66e288b49e..6b18d24622 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_DEFINE(VERSION_MAJOR, version_major, [Wireshark's major version])
 AC_DEFINE(VERSION_MINOR, version_minor, [Wireshark's minor version])
 AC_DEFINE(VERSION_MICRO, version_micro, [Wireshark's micro version])
 
-AC_DEFINE(VERSION_FLAVOR, "Development Build", [Wireshark's package flavor])
+dnl AC_DEFINE(VERSION_FLAVOR, "Development Build", [Wireshark's package flavor])
 
 AM_DISABLE_STATIC
 
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 621003dcc4..f0d25548ff 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -49,6 +49,10 @@
 #include <QGraphicsBlurEffect>
 #endif
 
+#ifndef VERSION_FLAVOR
+#define VERSION_FLAVOR ""
+#endif
+
 MainWelcome::MainWelcome(QWidget *parent) :
     QFrame(parent),
     welcome_ui_(new Ui::MainWelcome),
@@ -59,7 +63,6 @@ MainWelcome::MainWelcome(QWidget *parent) :
 
     welcome_ui_->interfaceTree->resetColumnCount();
 
-    welcome_ui_->mainWelcomeBanner->setText(tr("Welcome to Wireshark."));
     recent_files_ = welcome_ui_->recentList;
 
     setStyleSheet(QString(
@@ -79,6 +82,18 @@ MainWelcome::MainWelcome(QWidget *parent) :
                       )
                 );
 
+    QString welcome_ss = QString(
+                "QLabel {"
+                "  border-radius: 0.33em;"
+                "  color: #%1;"
+                "  background-color: #%2;"
+                "  padding: 0.33em;"
+                "}"
+                )
+            .arg(tango_aluminium_6, 6, 16, QChar('0'))   // Text color
+            .arg(tango_sky_blue_2, 6, 16, QChar('0'));   // Background color
+    welcome_ui_->mainWelcomeBanner->setStyleSheet(welcome_ss);
+
     QString title_ss = QString(
                 "QLabel {"
                 "  color: #%1;"
diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui
index 3037468771..a5ccd1f8e6 100644
--- a/ui/qt/main_welcome.ui
+++ b/ui/qt/main_welcome.ui
@@ -10,12 +10,6 @@
     <height>663</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -44,7 +38,7 @@
           <height>0</height>
          </size>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0">
+        <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1,0">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -60,11 +54,24 @@
          <item>
           <widget class="QLabel" name="mainWelcomeBanner">
            <property name="text">
-            <string>Welcome to Wireshark.</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:large;&quot;&gt;Welcome to Wireshark&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>
          <item>
+          <spacer name="bannerSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
           <widget class="QLabel" name="flavorBanner">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>