Do a better job of getting the user's attention for temporary messages.

Rename some variables.

svn path=/trunk/; revision=46310

ui/qt/label_stack.cpp

@@ -23,12 +23,13 @@
 
 #include "label_stack.h"
 
-#include <QTimer>
+#include "tango_colors.h"
 
 /* Temporary message timeouts */
-#define TEMPORARY_MSG_TIMEOUT (7 * 1000)
-//#define TEMPORARY_FLASH_TIMEOUT (1 * 1000)
-//#define TEMPORARY_FLASH_INTERVAL (TEMPORARY_FLASH_TIMEOUT / 4)
+const int temporary_interval_ = 1000;
+const int temporary_msg_timeout_ = temporary_interval_ * 9;
+const int temporary_flash_timeout_ = temporary_interval_ / 5;
+const int num_flashes_ = 3;
 
 LabelStack::LabelStack(QWidget *parent) :
     QLabel(parent)
@@ -36,42 +37,42 @@ LabelStack::LabelStack(QWidget *parent) :
 #ifdef Q_WS_MAC
     setAttribute(Qt::WA_MacSmallSize, true);
 #endif
-    m_temporaryCtx = -1;
+    temporary_ctx_ = -1;
     fillLabel();
+
+    connect(&temporary_timer_, SIGNAL(timeout()), this, SLOT(updateTemporaryStatus()));
 }
 
 void LabelStack::setTemporaryContext(int ctx) {
-    m_temporaryCtx = ctx;
+    temporary_ctx_ = ctx;
 }
 
 void LabelStack::fillLabel() {
     StackItem *si;
+    QString style_sheet;
 
-    setStyleSheet(
+    style_sheet =
             "QLabel {"
-            "  margin-left: 0.5em;"
-            "}"
-            );
+            "  margin-left: 0.5em;";
 
-    if (m_labels.isEmpty()) {
+    if (labels_.isEmpty()) {
         clear();
         return;
     }
 
-    si = m_labels.first();
+    si = labels_.first();
 
-    if (si->ctx == m_temporaryCtx) {
-        setStyleSheet(
-                // Tango "Scarlet Red"
-                "QLabel {"
-                "  margin-left: 0.5em;"
-                "  border-radius: 3px;"
-                "  color: white;"
-                "  background-color: rgba(239, 41, 41, 128);"
-                "}"
-                );
+    if (si->ctx == temporary_ctx_) {
+        style_sheet += QString(
+                "  border-radius: 0.25em;"
+                "  color: black;"
+                "  background-color: #%1;"
+                )
+                .arg(tango_butter_4, 6, 16, QChar('0'));
     }
 
+    style_sheet += "}";
+    setStyleSheet(style_sheet);
     setText(si->text);
 }
 
@@ -79,17 +80,19 @@ void LabelStack::pushText(QString &text, int ctx) {
     StackItem *si = new StackItem;
     si->text = text;
     si->ctx = ctx;
-    m_labels.prepend(si);
+    labels_.prepend(si);
 
-    if (ctx == m_temporaryCtx) {
-        QTimer::singleShot(TEMPORARY_MSG_TIMEOUT, this, SLOT(popTemporaryText()));
+    if (ctx == temporary_ctx_) {
+        temporary_epoch_.start();
+        temporary_timer_.start(temporary_flash_timeout_);
+        emit toggleTemporaryFlash(true);
     }
 
     fillLabel();
 }
 
 void LabelStack::popText(int ctx) {
-    QMutableListIterator<StackItem *> iter(m_labels);
+    QMutableListIterator<StackItem *> iter(labels_);
 
     while (iter.hasNext()) {
         if (iter.next()->ctx == ctx) {
@@ -101,8 +104,19 @@ void LabelStack::popText(int ctx) {
     fillLabel();
 }
 
-void LabelStack::popTemporaryText() {
-    popText(m_temporaryCtx);
+void LabelStack::updateTemporaryStatus() {
+    if (temporary_epoch_.elapsed() >= temporary_msg_timeout_) {
+        popText(temporary_ctx_);
+        emit toggleTemporaryFlash(false);
+        temporary_timer_.stop();
+    } else {
+        for (int i = (num_flashes_ * 2); i > 0; i--) {
+            if (temporary_epoch_.elapsed() >= temporary_flash_timeout_ * i) {
+                emit toggleTemporaryFlash(i % 2);
+                break;
+            }
+        }
+    }
 }
 
 /*

ui/qt/label_stack.h

@@ -26,6 +26,8 @@
 
 #include <QLabel>
 #include <QStack>
+#include <QTime>
+#include <QTimer>
 
 class LabelStack : public QLabel
 {
@@ -41,18 +43,21 @@ private:
         int ctx;
     } StackItem;
 
-    int m_temporaryCtx;
-    QList<StackItem *> m_labels;
+    int temporary_ctx_;
+    QList<StackItem *> labels_;
+    QTime  temporary_epoch_;
+    QTimer temporary_timer_;
 
     void fillLabel();
 
 signals:
+    void toggleTemporaryFlash(bool enable);
 
 public slots:
     void popText(int ctx);
 
 private slots:
-    void popTemporaryText();
+    void updateTemporaryStatus();
 };
 
 #endif // LABEL_STACK_H

ui/qt/main_status_bar.cpp

@@ -39,6 +39,8 @@
 #include <QSplitter>
 #include <QHBoxLayout>
 
+#include "tango_colors.h"
+
 #ifdef HAVE_LIBPCAP
 #define DEF_READY_MESSAGE QObject::tr("Ready to load or capture")
 #else
@@ -143,7 +145,6 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
     expert_status_.setAttribute(Qt::WA_MacSmallSize, true);
 #endif
 
-//    infoProgress->setStyleSheet("QWidget { border: 0.5px dotted red; }"); // Debug layout
     expert_status_.setTextFormat(Qt::RichText);
     expert_status_.hide();
 
@@ -175,6 +176,8 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
     packets_bar_update();
 
     connect(wsApp, SIGNAL(appInitialized()), splitter, SLOT(show()));
+    connect(&info_status_, SIGNAL(toggleTemporaryFlash(bool)),
+            this, SLOT(toggleBackground(bool)));
 }
 
 void MainStatusBar::showExpert() {
@@ -275,6 +278,20 @@ void MainStatusBar::popProfileStatus() {
     profile_status_.popText(STATUS_CTX_MAIN);
 }
 
+void MainStatusBar::toggleBackground(bool enabled)
+{
+    if (enabled) {
+        setStyleSheet(QString(
+                          "QStatusBar {"
+                          "  background-color: #%1;"
+                          "}"
+                          )
+                      .arg(tango_butter_4, 6, 16, QChar('0')));
+    } else {
+        setStyleSheet("");
+    }
+}
+
 /*
  * Editor modelines
  *

ui/qt/main_status_bar.h

@@ -62,6 +62,9 @@ public slots:
     void popPacketStatus();
     void pushProfileStatus(QString &message);
     void popProfileStatus();
+
+private slots:
+    void toggleBackground(bool enabled);
 };
 
 #endif // MAIN_STATUS_BAR_H