From c25fd3912bd8c115b0556d8480fd56de08f52e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <jan.kaeberich@francis-weiler.de>
Date: Wed, 17 Feb 2021 16:39:31 +0100
Subject: [PATCH] Added missing up/down icon on windows

---
 Software/PC_Application/Application.pro       |   1 -
 .../Traces/Math/tracematheditdialog.ui        |   8 ++--
 .../VNA/Deembedding/deembeddingdialog.ui      |   8 ++--
 .../PC_Application/VNA/Deembedding/form.ui    |  41 ------------------
 Software/PC_Application/icons.qrc             |   2 +
 Software/PC_Application/icons/down.png        | Bin 0 -> 490 bytes
 Software/PC_Application/icons/up.png          | Bin 0 -> 496 bytes
 Software/PC_Application/preferencesdialog.ui  |   2 +-
 8 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 Software/PC_Application/VNA/Deembedding/form.ui
 create mode 100644 Software/PC_Application/icons/down.png
 create mode 100644 Software/PC_Application/icons/up.png

diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro
index d80f365..9a06d93 100644
--- a/Software/PC_Application/Application.pro
+++ b/Software/PC_Application/Application.pro
@@ -256,7 +256,6 @@ FORMS += \
     Traces/tracewidget.ui \
     Traces/xyplotaxisdialog.ui \
     VNA/Deembedding/deembeddingdialog.ui \
-    VNA/Deembedding/form.ui \
     VNA/Deembedding/matchingnetworkdialog.ui \
     VNA/Deembedding/measurementdialog.ui \
     VNA/Deembedding/portextensioneditdialog.ui \
diff --git a/Software/PC_Application/Traces/Math/tracematheditdialog.ui b/Software/PC_Application/Traces/Math/tracematheditdialog.ui
index 44b44d1..4dcff3d 100644
--- a/Software/PC_Application/Traces/Math/tracematheditdialog.ui
+++ b/Software/PC_Application/Traces/Math/tracematheditdialog.ui
@@ -113,8 +113,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-up">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="go-up" resource="../../icons.qrc">
+           <normaloff>:/icons/up.png</normaloff>:/icons/up.png</iconset>
          </property>
         </widget>
        </item>
@@ -130,8 +130,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-down">
-           <normaloff>.</normaloff>.</iconset>
+          <iconset theme="go-down" resource="../../icons.qrc">
+           <normaloff>:/icons/down.png</normaloff>:/icons/down.png</iconset>
          </property>
         </widget>
        </item>
diff --git a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
index 1cbf9d2..8918e4a 100644
--- a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
+++ b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.ui
@@ -79,8 +79,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-up">
-           <normaloff>../../Traces/Math</normaloff>../../Traces/Math</iconset>
+          <iconset theme="go-up" resource="../../icons.qrc">
+           <normaloff>:/icons/up.png</normaloff>:/icons/up.png</iconset>
          </property>
         </widget>
        </item>
@@ -96,8 +96,8 @@
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="go-down">
-           <normaloff>../../Traces/Math</normaloff>../../Traces/Math</iconset>
+          <iconset theme="go-down" resource="../../icons.qrc">
+           <normaloff>:/icons/down.png</normaloff>:/icons/down.png</iconset>
          </property>
         </widget>
        </item>
diff --git a/Software/PC_Application/VNA/Deembedding/form.ui b/Software/PC_Application/VNA/Deembedding/form.ui
deleted file mode 100644
index e116c9a..0000000
--- a/Software/PC_Application/VNA/Deembedding/form.ui
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>339</width>
-    <height>238</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">QWidget#Form {image: url(:/icons/parallelC.svg);}
-border: 1px solid red;</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLineEdit" name="lineEdit"/>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>186</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Software/PC_Application/icons.qrc b/Software/PC_Application/icons.qrc
index 2e6e1eb..53c4752 100644
--- a/Software/PC_Application/icons.qrc
+++ b/Software/PC_Application/icons.qrc
@@ -47,5 +47,7 @@
         <file>icons/DUT.svg</file>
         <file>icons/port1.svg</file>
         <file>icons/port2.svg</file>
+        <file>icons/down.png</file>
+        <file>icons/up.png</file>
     </qresource>
 </RCC>
diff --git a/Software/PC_Application/icons/down.png b/Software/PC_Application/icons/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..3866fd041ab798c44ee28c8658b2cc5a30e798fe
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000ie
z000ie0hKEb8vp<SoJmAMR7i=nmN9MuK@3Hox1c~&2yp<!0U`>-6>@_V5hvgp93@gN
zfVN6ag%Szn1c)X|OF==LV*iBAFbqo+MzU7=YyUsvwLNR@PSa&(1%SJMHH|4Q5cbS$
zW@e?CZGk<oH?ys<nVEI73hsVlKpU6?JHRj4PQL9VSAu*9yes$sl)$6#mTV}jl#eTB
zkQD$1z_u1JN$o0%nbbD4jYZ<L1jiSkbBVkb+fhu|SUV*!uQ@a(k3_--=f4Diu0GZw
zmlj|NEH9+%Ag*p*U?$}<6I>|x02CR&Qd~24|LKE!J)d$V-Eaktic_kga!$(Z4<{Ii
zYZInKLDiuSv=TXA0sUA&*ox?zQ1yw6v&fDLIghAHuwTRb!bb8rzofcJrAS0;j^!Ip
z5Xx~4^s^}vxDYr^<g_kQw-a*tPxXG$xJ(lwN%B;g2C&Dm(Z(5(SJ^r8F{wto`KXY?
zZHJv4humshM`adYI8))_!Wjs=?!t-E^)FYZg?W)$X4V59s0P;^$8P=r-gJUzcmF)g
gkrPM=Uj5th4UoDif^B)SWB>pF07*qoM6N<$g1aBgZvX%Q

literal 0
HcmV?d00001

diff --git a/Software/PC_Application/icons/up.png b/Software/PC_Application/icons/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..9426d12c0f470af782b699fd2e5f7720df57ec71
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000ie
z000ie0hKEb8vp<SqDe$SR7i=vmN9O^KoCXWxS&8(2q9|30aBq9=~CqeiG*?jUxT~k
z0?1WrDo6z41jr3aOF<-OQg~Kb7PB@IWTlm*@0tH+#<Q~)Ri)_?kpw_hf13IvHH1A8
zNkt?RksLSx2NB5)OGTs`RZ!KF4YYwNum`ke@6EPd$yGr<0ygGc02webyk&c2SY|eA
zKEtR0Fa&bX;l3)Wz~|lzC=W%#vN*$cpi@Wg`F7051=g+-n0f|{$paA=;PglU=-S6B
z&Xon|10S~gk#ZHr)%68ZQ_dpfYp-+G5s}PnQeR+Z;G_Y0RK&VVftfGhI%gOm-&p#E
zSL+iI>qG^%Zb~GSCsct}V7%~%2A;sc6J7*9EyE8$5*-!5H?RaAft`o%3|pGb`DLox
zsuBf}C0+(e#O|m>E`yalA8ImcvK+_CMFnMR0lZv6z;TqEmR66ygEo$&KL_TK_hYIK
z+RaDBzYIGw9C5309kf|^;k+8|E}WrZmt8nPxvp|$iklZzOGJ9WGw=l5QO+hPPx7Z_
m@TRI?XE|a56@nN4w)_I{TmiDVLuLd30000<MNUMnLSTZm*2z5p

literal 0
HcmV?d00001

diff --git a/Software/PC_Application/preferencesdialog.ui b/Software/PC_Application/preferencesdialog.ui
index 0ed73e4..ae3c812 100644
--- a/Software/PC_Application/preferencesdialog.ui
+++ b/Software/PC_Application/preferencesdialog.ui
@@ -73,7 +73,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="Startup">
         <layout class="QHBoxLayout" name="horizontalLayout_4">