From 7b557088e9cf2e1d9bb82eb3714851e671414c43 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 20 Jun 2019 11:25:49 -0700
Subject: Qt: Convert the rest of the preference dialog list buttons.

We no longer use the old icon names, so remove their aliases from
stock_icons.qrc.

Ping-Bug: 15511
Change-Id: If3c5e2b95825207a401e12607fcb94cdcc8a51c8
Reviewed-on: https://code.wireshark.org/review/33689
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/manage_interfaces_dialog.ui | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'ui/qt/manage_interfaces_dialog.ui')

diff --git a/ui/qt/manage_interfaces_dialog.ui b/ui/qt/manage_interfaces_dialog.ui
index eff0b9475b..fa93023cf0 100644
--- a/ui/qt/manage_interfaces_dialog.ui
+++ b/ui/qt/manage_interfaces_dialog.ui
@@ -96,31 +96,23 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-          <widget class="QToolButton" name="addPipe">
+          <widget class="StockIconToolButton" name="addPipe">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add a new pipe using default settings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../../image/stock_icons.qrc">
-             <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
-          <widget class="QToolButton" name="delPipe">
+          <widget class="StockIconToolButton" name="delPipe">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove the selected pipe from the list.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../../image/stock_icons.qrc">
-             <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
@@ -165,31 +157,23 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-          <widget class="QToolButton" name="addRemote">
+          <widget class="StockIconToolButton" name="addRemote">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add a remote host and its interfaces&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../../image/stock_icons.qrc">
-             <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
-          <widget class="QToolButton" name="delRemote">
+          <widget class="StockIconToolButton" name="delRemote">
            <property name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove the selected host from the list.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset resource="../../image/stock_icons.qrc">
-             <normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
-           </property>
           </widget>
          </item>
          <item>
@@ -237,9 +221,14 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../image/stock_icons.qrc"/>
- </resources>
+ <customwidgets>
+  <customwidget>
+   <class>StockIconToolButton</class>
+   <extends>QToolButton</extends>
+   <header>widgets/stock_icon_tool_button.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
-- 
cgit v1.2.3