Add Logray capture icons.

resources/lricon.qrc

@@ -1,13 +1,13 @@
 <RCC>
     <qresource prefix="/lricon">
-        <file alias="wsiconcap16.png">icons/wsiconcap16.png</file>
-        <file alias="wsiconcap32.png">icons/wsiconcap32.png</file>
-        <file alias="wsiconcap48.png">icons/wsiconcap48.png</file>
-        <file alias="wsiconcap64.png">icons/wsiconcap64.png</file>
-        <file alias="wsiconcap128.png">icons/wsiconcap128.png</file>
-        <file alias="wsiconcap256.png">icons/wsiconcap256.png</file>
-        <file alias="wsiconcap512.png">icons/wsiconcap512.png</file>
-        <file alias="wsiconcap1024.png">icons/wsiconcap1024.png</file>
+        <file alias="lriconcap16.png">icons/lriconcap16.png</file>
+        <file alias="lriconcap32.png">icons/lriconcap32.png</file>
+        <file alias="lriconcap48.png">icons/lriconcap48.png</file>
+        <file alias="lriconcap64.png">icons/lriconcap64.png</file>
+        <file alias="lriconcap128.png">icons/lriconcap128.png</file>
+        <file alias="lriconcap256.png">icons/lriconcap256.png</file>
+        <file alias="lriconcap512.png">icons/lriconcap512.png</file>
+        <file alias="lriconcap1024.png">icons/lriconcap1024.png</file>
         <file alias="lricon16.png">icons/lricon16.png</file>
         <file alias="lricon32.png">icons/lricon32.png</file>
         <file alias="lricon48.png">icons/lricon48.png</file>

ui/logray/logray_application.cpp

@@ -44,3 +44,16 @@ void LograyApplication::refreshLocalInterfaces()
     emit localInterfaceListChanged();
 #endif
 }
+
+void LograyApplication::initializeIcons()
+{
+    // Do this as late as possible in order to allow time for
+    // MimeDatabaseInitThread to do its work.
+    QList<int> icon_sizes = QList<int>() << 16 << 24 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
+    foreach (int icon_size, icon_sizes) {
+        QString icon_path = QString(":/lricon/lricon%1.png").arg(icon_size);
+        normal_icon_.addFile(icon_path);
+        icon_path = QString(":/lricon/lriconcap%1.png").arg(icon_size);
+        capture_icon_.addFile(icon_path);
+    }
+}

ui/logray/logray_application.h

@@ -23,6 +23,9 @@ public:
     ~LograyApplication();
 
     void refreshLocalInterfaces() override;
+
+private:
+    void initializeIcons() override;
 };
 
 extern LograyApplication *lwApp;

ui/qt/main_application.cpp

@@ -903,19 +903,6 @@ void MainApplication::clearDynamicMenuGroupItems()
     }
 }
 
-void MainApplication::initializeIcons()
-{
-    // Do this as late as possible in order to allow time for
-    // MimeDatabaseInitThread to do its work.
-    QList<int> icon_sizes = QList<int>() << 16 << 24 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
-    foreach (int icon_size, icon_sizes) {
-        QString icon_path = QString(":/wsicon/wsicon%1.png").arg(icon_size);
-        normal_icon_.addFile(icon_path);
-        icon_path = QString(":/wsicon/wsiconcap%1.png").arg(icon_size);
-        capture_icon_.addFile(icon_path);
-    }
-}
-
 QList<QAction *> MainApplication::dynamicMenuGroupItems(int group)
 {
     if (!dynamic_menu_groups_.contains(group)) {

ui/qt/main_application.h

@@ -157,8 +157,6 @@ private:
     QTimer tap_update_timer_;
     QList<QString> pending_open_files_;
     QSocketNotifier *if_notifier_;
-    QIcon normal_icon_;
-    QIcon capture_icon_;
     static QString window_title_separator_;
     QList<AppSignal> app_signals_;
     int active_captures_;
@@ -168,10 +166,13 @@ private:
 
     void storeCustomColorsInRecent();
     void clearDynamicMenuGroupItems();
-    void initializeIcons();
 
 protected:
     bool event(QEvent *event);
+    virtual void initializeIcons() = 0;
+
+    QIcon normal_icon_;
+    QIcon capture_icon_;
 
 signals:
     void appInitialized();

ui/qt/wireshark_application.cpp

@@ -24,3 +24,16 @@ WiresharkApplication::~WiresharkApplication()
 {
     wsApp = NULL;
 }
+
+void WiresharkApplication::initializeIcons()
+{
+    // Do this as late as possible in order to allow time for
+    // MimeDatabaseInitThread to do its work.
+    QList<int> icon_sizes = QList<int>() << 16 << 24 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
+    foreach (int icon_size, icon_sizes) {
+        QString icon_path = QString(":/wsicon/wsicon%1.png").arg(icon_size);
+        normal_icon_.addFile(icon_path);
+        icon_path = QString(":/wsicon/wsiconcap%1.png").arg(icon_size);
+        capture_icon_.addFile(icon_path);
+    }
+}

ui/qt/wireshark_application.h

@@ -17,6 +17,9 @@ class WiresharkApplication : public MainApplication
 public:
     explicit WiresharkApplication(int &argc,  char **argv);
     ~WiresharkApplication();
+
+private:
+    void initializeIcons() override;
 };
 
 extern WiresharkApplication *wsApp;