1 files changed, 135 insertions, 156 deletions
diff --git a/ui/qt/uat_frame.ui b/ui/qt/uat_frame.ui
index 97f3d1097d..452ae65d09 100644
--- a/ui/qt/uat_frame.ui
+++ b/ui/qt/uat_frame.ui
@@ -17,166 +17,145 @@
    <number>0</number>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-      <widget class="TabnavTreeView" name="uatTreeView">
-        <column>
-          <property name="text">
-            <string notr="true">1</string>
-          </property>
-          <property name="dragEnabled">
-            <bool>false</bool>
-          </property>
-        </column>
+   <item>
+    <widget class="TabnavTreeView" name="uatTreeView"/>
+   </item>
+   <item>
+    <widget class="QLabel" name="hintLabel">
+     <property name="styleSheet">
+      <string notr="true">QLabel { color: red; }</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0,1">
+     <item>
+      <widget class="StockIconToolButton" name="newToolButton">
+       <property name="toolTip">
+        <string>Create a new entry.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
       </widget>
-    </item>
-    <item>
-      <widget class="QLabel" name="hintLabel">
-        <property name="styleSheet">
-          <string notr="true">QLabel { color: red; }</string>
-        </property>
-        <property name="text">
-          <string/>
-        </property>
-        <property name="textFormat">
-          <set>Qt::RichText</set>
-        </property>
-        <property name="wordWrap">
-          <bool>true</bool>
-        </property>
+     </item>
+     <item>
+      <widget class="StockIconToolButton" name="deleteToolButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Remove this entry.</string>
+       </property>
       </widget>
-    </item>
-    <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,1">
-        <item>
-          <widget class="QToolButton" name="newToolButton">
-            <property name="toolTip">
-              <string>Create a new entry.</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="deleteToolButton">
-            <property name="enabled">
-              <bool>false</bool>
-            </property>
-            <property name="toolTip">
-              <string>Remove this entry.</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>
-          <widget class="QToolButton" name="copyToolButton">
-            <property name="enabled">
-              <bool>false</bool>
-            </property>
-            <property name="toolTip">
-              <string>Copy this entry.</string>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-            <property name="icon">
-              <iconset resource="../../image/stock_icons.qrc">
-                <normaloff>:/stock/copy-8.png</normaloff>:/stock/copy-8.png
-              </iconset>
-            </property>
-          </widget>
-        </item>
-        <item>
-          <widget class="QToolButton" name="moveUpToolButton">
-            <property name="toolTip">
-              <string>Move entry up.</string>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-            <property name="icon">
-              <iconset resource="../../image/stock_icons.qrc">
-                <normaloff>:/stock/arrow_up.png</normaloff>:/stock/arrow_up.png
-              </iconset>
-            </property>
-          </widget>
-        </item>
-        <item>
-          <widget class="QToolButton" name="moveDownToolButton">
-            <property name="toolTip">
-              <string>Move entry down.</string>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-            <property name="icon">
-              <iconset resource="../../image/stock_icons.qrc">
-                <normaloff>:/stock/arrow_down.png</normaloff>:/stock/arrow_down.png
-              </iconset>
-            </property>
-          </widget>
-        </item>
-        <item>
-          <widget class="QToolButton" name="clearToolButton">
-            <property name="toolTip">
-              <string>Clear all entries.</string>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-            <property name="icon">
-              <iconset resource="../../image/stock_icons.qrc">
-                <normaloff>:/stock/delete_list.png</normaloff>:/stock/delete_list.png
-              </iconset>
-            </property>
-          </widget>
-        </item>
-        <item>
-          <widget class="ElidedLabel" name="pathLabel">
-            <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                <horstretch>1</horstretch>
-                <verstretch>0</verstretch>
-              </sizepolicy>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-            <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="openExternalLinks">
-              <bool>true</bool>
-            </property>
-          </widget>
-        </item>
-      </layout>
-    </item>
+     </item>
+     <item>
+      <widget class="StockIconToolButton" name="copyToolButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Copy this entry.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="StockIconToolButton" name="moveUpToolButton">
+       <property name="toolTip">
+        <string>Move entry up.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="StockIconToolButton" name="moveDownToolButton">
+       <property name="toolTip">
+        <string>Move entry down.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="StockIconToolButton" name="clearToolButton">
+       <property name="toolTip">
+        <string>Clear all entries.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="CopyFromProfileButton" name="copyFromProfileButton">
+       <property name="toolTip">
+        <string>Copy entries from another profile.</string>
+       </property>
+       <property name="text">
+        <string>Copy from</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ElidedLabel" name="pathLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
-    <customwidget>
-      <class>ElidedLabel</class>
-      <extends>QLabel</extends>
-      <header>widgets/elided_label.h</header>
-    </customwidget>
-    <customwidget>
-      <class>TabnavTreeView</class>
-      <extends>QTreeView</extends>
-      <header>widgets/tabnav_tree_view.h</header>
-    </customwidget>
-  </customwidgets>
-  <resources>
-  <include location="../../image/stock_icons.qrc"/>
- </resources>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/elided_label.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TabnavTreeView</class>
+   <extends>QTreeView</extends>
+   <header>widgets/tabnav_tree_view.h</header>
+  </customwidget>
+  <customwidget>
+   <class>StockIconToolButton</class>
+   <extends>QToolButton</extends>
+   <header>widgets/stock_icon_tool_button.h</header>
+  </customwidget>
+  <customwidget>
+   <class>CopyFromProfileButton</class>
+   <extends>QPushButton</extends>
+   <header>widgets/copy_from_profile_button.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
  <connections/>
 </ui>