Qt: Main welcome show/hide interface updates.
authorGerald Combs <gerald@wireshark.org>
Tue, 18 Oct 2016 11:35:48 +0000 (13:35 +0200)
committerGerald Combs <gerald@wireshark.org>
Tue, 18 Oct 2016 14:04:05 +0000 (14:04 +0000)
Pluralize the text in the main welcome show/hide interfaces button.
Remove the styling, which matches other places we use a pushbutton +
menu.

Change-Id: I7559f98d0c1afbfb2920b09c3885d9b1fbdf76f1
Reviewed-on: https://code.wireshark.org/review/18260
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
ui/qt/main_welcome.cpp
ui/qt/wireshark_en.ts

index 58d6a095b6db6afeba0b222a9357a82e44d38a1f..2dc5afa59c831747cf63981ca4e76fec1db031a0 100644 (file)
@@ -187,36 +187,6 @@ MainWelcome::MainWelcome(QWidget *parent) :
     welcome_ui_->childContainer->setGraphicsEffect(blur);
 #endif
 
-    welcome_ui_->btnInterfaceType->setStyleSheet(
-            "QPushButton {"
-#ifdef Q_OS_MAC
-            "  border: 1px solid gray;"
-#else
-            "  border: 1px solid palette(shadow);"
-#endif
-            "  border-radius: 3px;"
-            "  padding: 0px 0px 0px 0px;"
-            "  margin-left: 0px;"
-            "  min-width: 20em;"
-            " }"
-
-            "QPushButton::drop-down {"
-            "  subcontrol-origin: padding;"
-            "  subcontrol-position: top right;"
-            "  width: 16px;"
-            "  border-left-width: 0px;"
-            " }"
-
-            "QPushButton::down-arrow {"
-            "  image: url(:/icons/toolbar/14x14/x-filter-dropdown.png);"
-            " }"
-
-            "QPushButton::down-arrow:on { /* shift the arrow when popup is open */"
-            "  top: 1px;"
-            "  left: 1px;"
-            "}"
-            );
-
     splash_overlay_ = new SplashOverlay(this);
 }
 
@@ -245,9 +215,12 @@ void MainWelcome::setCaptureFilter(const QString capture_filter)
 
 void MainWelcome::interfaceListChanged()
 {
-    QString btnText = QString(tr("%1 Interfaces shown, %2 hidden"))
-            .arg(welcome_ui_->interfaceFrame->interfacesPresent())
-            .arg(welcome_ui_->interfaceFrame->interfacesHidden());
+    QString btnText = tr("All interfaces shown");
+    if (welcome_ui_->interfaceFrame->interfacesHidden() > 0) {
+        btnText = tr("%n interface(s) shown, %1 hidden", "",
+                     welcome_ui_->interfaceFrame->interfacesPresent())
+                .arg(welcome_ui_->interfaceFrame->interfacesHidden());
+    }
     welcome_ui_->btnInterfaceType->setText(btnText);
     welcome_ui_->btnInterfaceType->setMenu(welcome_ui_->interfaceFrame->getSelectionMenu());
 }
index 077ffbdec1b9bd66e527482edb335405f0041ba4..55d72557597269755f65e23e37fe28368f728842 100644 (file)
@@ -4542,14 +4542,9 @@ for filter files: %2.</source>
         <source>No interfaces found</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="interface_frame.ui" line="88"/>
-        <source>Show Interfaces</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="interface_frame.cpp" line="71"/>
-        <source>Physical</source>
+        <source>Wired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4601,7 +4596,7 @@ for filter files: %2.</source>
 <context>
     <name>InterfaceSortFilterModel</name>
     <message>
-        <location filename="interface_sort_filter_model.cpp" line="251"/>
+        <location filename="interface_sort_filter_model.cpp" line="258"/>
         <source>No interfaces to be displayed. %1 interfaces filtered.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4614,32 +4609,32 @@ for filter files: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="233"/>
+        <location filename="interface_tree_model.cpp" line="230"/>
         <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="233"/>
+        <location filename="interface_tree_model.cpp" line="230"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="240"/>
+        <location filename="interface_tree_model.cpp" line="237"/>
         <source>Extcap interface: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="245"/>
+        <location filename="interface_tree_model.cpp" line="242"/>
         <source>No addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="252"/>
+        <location filename="interface_tree_model.cpp" line="249"/>
         <source>No capture filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="interface_tree_model.cpp" line="257"/>
+        <location filename="interface_tree_model.cpp" line="254"/>
         <source>Capture filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6685,22 +6680,22 @@ for filter files: %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.ui" line="203"/>
+        <location filename="main_welcome.ui" line="210"/>
         <source>Interface list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.ui" line="206"/>
+        <location filename="main_welcome.ui" line="213"/>
         <source>List of available capture interfaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.ui" line="219"/>
+        <location filename="main_welcome.ui" line="226"/>
         <source>&lt;h2&gt;Learn&lt;/h2&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.ui" line="226"/>
+        <location filename="main_welcome.ui" line="233"/>
         <source>&lt;html&gt;&lt;head&gt;
 &lt;style&gt;
 a:link {
@@ -6766,37 +6761,51 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="216"/>
+        <location filename="main_welcome.cpp" line="250"/>
+        <source>All interfaces shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="main_welcome.cpp" line="252"/>
+        <source>%n interface(s) shown, %1 hidden</source>
+        <oldsource>%Ln interface(s) shown</oldsource>
+        <translation type="unfinished">
+            <numerusform>%n interface shown, %1 hidden</numerusform>
+            <numerusform>%n interfaces shown, %1 hidden</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="main_welcome.cpp" line="263"/>
         <source>You are running Wireshark </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="218"/>
+        <location filename="main_welcome.cpp" line="265"/>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="221"/>
+        <location filename="main_welcome.cpp" line="268"/>
         <source> You receive automatic updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="223"/>
+        <location filename="main_welcome.cpp" line="270"/>
         <source> You have disabled automatic updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="353"/>
+        <location filename="main_welcome.cpp" line="402"/>
         <source>not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="435"/>
+        <location filename="main_welcome.cpp" line="484"/>
         <source>Copy file path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="441"/>
+        <location filename="main_welcome.cpp" line="490"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11032,12 +11041,12 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="418"/>
+        <location filename="main_welcome.cpp" line="467"/>
         <source>Show in Finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="420"/>
+        <location filename="main_welcome.cpp" line="469"/>
         <source>Show in Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11057,12 +11066,12 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../wireshark-qt.cpp" line="803"/>
+        <location filename="../../wireshark-qt.cpp" line="804"/>
         <source>Invalid Display Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../wireshark-qt.cpp" line="804"/>
+        <location filename="../../wireshark-qt.cpp" line="805"/>
         <source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
         <translation type="unfinished"></translation>
     </message>