From a0278cdf0124defa2b16528bde90dd4a1350f6b7 Mon Sep 17 00:00:00 2001
From: osy <50960678+osy@users.noreply.github.com>
Date: Thu, 11 Mar 2021 12:41:51 -0800
Subject: [PATCH] iOS: add USB icon to toolbar

---
 .../Toolbar USB.imageset/Contents.json        |  26 ++++++++++++++++++
 .../Toolbar USB.imageset/usb-cable@1x.png     | Bin 0 -> 494 bytes
 .../Toolbar USB.imageset/usb-cable@2x.png     | Bin 0 -> 621 bytes
 .../Toolbar USB.imageset/usb-cable@3x.png     | Bin 0 -> 774 bytes
 Platform/iOS/Display/VMDisplayView.xib        |  15 +++++++++-
 .../iOS/Display/VMDisplayViewController.h     |   2 ++
 .../iOS/Display/VMDisplayViewController.m     |   3 ++
 README.md                                     |   2 ++
 8 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 Platform/Assets.xcassets/Toolbar USB.imageset/Contents.json
 create mode 100644 Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@1x.png
 create mode 100644 Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@2x.png
 create mode 100644 Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@3x.png

diff --git a/Platform/Assets.xcassets/Toolbar USB.imageset/Contents.json b/Platform/Assets.xcassets/Toolbar USB.imageset/Contents.json
new file mode 100644
index 00000000..2bfce7ce
--- /dev/null
+++ b/Platform/Assets.xcassets/Toolbar USB.imageset/Contents.json	
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "usb-cable@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "usb-cable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "usb-cable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@1x.png b/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd940d293255fecda7084259dffa7ee82ab0d21
GIT binary patch
literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk<d+1mtlR
zctjQh=|v#SsMJuQ1!S<7c>21sKV{|?kusRBE;Ab_w8zuMF~s8Z+ewC8ha5y)?t9HL
zDZAzVfu&Jo+auFA%+s2_WwQ7`v<>1Gd&H;|rw|c2d*jBAle1i!S|`2y_h;tcGaD{2
zGPs_a;=b&}vf?%G7&?kSPg$^2G9_*2!#we?w~lDXhRwH>b6YKw`C&^!dR}R2YgPLO
zyUpBdEX5+`^X6?n<fm4rn(}s8XyV+T?PtRe=x_X29L&o*HLAXBm1AJG&NoAEHwK>u
zTL$rM&;A6ese0`Tn-RRzc7a*{e`UG2Mal1Xt(-9#=nvHr*NBpo#FA92<f2p{#b9J$
zWT<OktZQf(Vq{=tWM*Yzu5DmoWnhqU_pum?hTQy=%(P0}8blkSR{=Fhf@}!RPb(=;
nEJ|f4FE7{2%*!rLPAo{(%P&fw{mw=TsEEPS)z4*}Q$iB}I9a7>

literal 0
HcmV?d00001

diff --git a/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@2x.png b/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..92cc46bc468c533510937d7ab2c00bc630fa83d3
GIT binary patch
literal 621
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw0wgDV75oXLSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXICJ|Af_a5cNYeRRlUkaKptm-
zM`SSr10zs`(S^~MXKM^lkiEpy*OmP#Gq;G8zLdUT9#GEO)5S3);_%z)d%c()McnqA
zmR)q|uxk+8*RW`9rO;8Oy=%8}C_YeLkuNBCbpJWG?Cz}|>MjOlPTwLjHnzUL*Xi8x
zWM0v;+12lO&KPN1_8FUQI3Vj>mwZC^>yJlbVo}$sjMIvBle{kFJUC|jR{V?%TTYTl
z;iZ3-P0a>{0Tya{a?+laEz9~sf@66-U+h%aw#FqWK3^(Be`ntX>HcN@?(^C|t(vwt
zkLCNW2)T{-A6Lgp2KnZ)Y>#BIWw2V7!`={AS@dh&<nGuvN#eV29M$_L|A^o7(wvp|
zYVwZ8Ka^>(TYBEYtdjMCPG5!kkJ!Dk?lBLIJgOa4yCN2y(wylztI+9c(B%*Bzv#wa
zoHnh9d3V&*FH0WZxzU|B$>dTVxAaS<3$mquUG67~*MHRWl<L`=e9hA{QhN7|!a1D}
zh2JfV(C4^wcr7qwRZCnWN>UO_QmvAUQh^kMk%5t+u7R<xp<#%Tft8V&m5I5wfq|8Q
zLCW37VkjDN^HVa@DsgKNZHQh4)F276Aviy+q&%@Gm7%=6TrV>(yEr+qAXP8FD1G)j
R8!4b722WQ%mvv4FO#t(4;fDYK

literal 0
HcmV?d00001

diff --git a/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@3x.png b/Platform/Assets.xcassets/Toolbar USB.imageset/usb-cable@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..658be0a9a6241f3f6a2b087747f3dc8448ebd5f9
GIT binary patch
literal 774
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S900wgCb?Cb<mEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4<Bu&P(t2*~3s
z@Q5sCU|@U>!i?eTEX{y|>?NMQuIx{lxkaS(ay1lx0OhWDx;Tbp+<QA~w->XcNZWad
z^&C-J8XeOG1Rt~3uthswFc;w7C~&ZSgOGPEvve)P#=fRj1tEbeY6*+hO7uS5e$m%M
zDdk*Fnfj0VtCBa2pU+M#D@zD#5pd#AT#|c0$w=d1n~+gNN3dn1y7t3(xr>7HOM;g2
zFnCVim8bl!Tk&$Fm710FtK}+}eQl;r)tkR0QEpZR$3v0q(@z~Uy@GEsPl=YhG)YJ~
zdFsLBwVhi|iRdb;PFS<EH)n}O$b8Ez%MLF~*;z&mXKqPnTr1JKVwv&mvwTy@4*m6u
z%(rhozWa`*ae55j^1Msm(>$klNYA`HJ@<6&tV>gtZD9`pQr{T7f@fWla{$|<;hX7I
z&9Jm~+CQ#Ea;10gvF+U&vP-}vSmL5Ya)?^9Tbymd>PgK%IP~Q8CT=_D|5)pUe$s(^
z2Ucu3pR#n-Pqq1CC+}X0ziMT=`qa+N)8=jelmAlRYgV?>-fv|Zm!bu=x;qj!XQgIq
zBq=AQ3JUr>kXWzvP+TT4CO-13Qdp;YN<`bMs+*I)&VS+ZEjw66|NOEyL03PPD+EuQ
z^W;@q(9M(F&u*=CQvP=~-KI>#_vMMD-MmWgm+CjY*rWP)JKGzjcA2tA-xNUMUie&k
z`?|#sYCe>Kl9y_UYeY#(Vo9o1a#1RfVlXl=GSoFN)-^N?F*2|+GP5!<(>5@$GB7x_
z>ct`y4Y~O#nQ4`{HEjMKAP3YS39=zLKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX
PpdtoOS3j3^P6<r_%=;)i

literal 0
HcmV?d00001

diff --git a/Platform/iOS/Display/VMDisplayView.xib b/Platform/iOS/Display/VMDisplayView.xib
index 642c6a34..11df3dec 100644
--- a/Platform/iOS/Display/VMDisplayView.xib
+++ b/Platform/iOS/Display/VMDisplayView.xib
@@ -21,6 +21,7 @@
                 <outlet property="restartButton" destination="xt5-Fw-Nb9" id="1o8-4n-lvl"/>
                 <outlet property="resumeBigButton" destination="q8Q-UP-yRo" id="XJg-Mq-IBz"/>
                 <outlet property="toolbarAccessoryView" destination="FjS-ZA-duw" id="D8Q-Zf-eVY"/>
+                <outlet property="usbButton" destination="lhn-j4-i51" id="Mdz-XK-Ikr"/>
                 <outlet property="zoomButton" destination="aZW-jv-ozW" id="q9y-bK-xbD"/>
                 <outletCollection property="customKeyModifierButtons" destination="jxu-AQ-u8c" id="4En-WD-DQc"/>
                 <outletCollection property="customKeyModifierButtons" destination="bCv-uH-SSy" id="iDi-by-YwA"/>
@@ -125,6 +126,18 @@
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pvl-sJ-gEX">
                                                     <rect key="frame" x="76" y="0.0" width="30" height="30"/>
                                                     <accessibility key="accessibilityConfiguration" label="Settings"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="30" id="a3z-pY-gWm"/>
+                                                        <constraint firstAttribute="width" constant="30" id="pWn-tf-bcE"/>
+                                                    </constraints>
+                                                    <state key="normal" image="Toolbar USB"/>
+                                                    <connections>
+                                                        <action selector="usbPressed:" destination="-1" eventType="touchUpInside" id="ibi-6S-HUk"/>
+                                                    </connections>
+                                                </button>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pvl-sJ-gEX">
+                                                    <rect key="frame" x="114" y="0.0" width="30" height="30"/>
+                                                    <accessibility key="accessibilityConfiguration" label="Settings"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="30" id="Sb4-jZ-q30"/>
                                                         <constraint firstAttribute="width" constant="30" id="d0B-1d-7nz"/>
@@ -907,6 +920,6 @@
         <image name="Toolbar Pause" width="30" height="30"/>
         <image name="Toolbar Power" width="30" height="30"/>
         <image name="Toolbar Restart" width="30" height="30"/>
-        <image name="Toolbar Settings" width="30" height="30"/>
+        <image name="Toolbar USB" width="30" height="30"/>
     </resources>
 </document>
diff --git a/Platform/iOS/Display/VMDisplayViewController.h b/Platform/iOS/Display/VMDisplayViewController.h
index c0de346e..85faaf76 100644
--- a/Platform/iOS/Display/VMDisplayViewController.h
+++ b/Platform/iOS/Display/VMDisplayViewController.h
@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIButton *zoomButton;
 @property (weak, nonatomic) IBOutlet UIButton *keyboardButton;
 @property (weak, nonatomic) IBOutlet UIButton *drivesButton;
+@property (weak, nonatomic) IBOutlet UIButton *usbButton;
 @property (weak, nonatomic) IBOutlet UIVisualEffectView *placeholderView;
 @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *placeholderIndicator;
 @property (weak, nonatomic) IBOutlet UIButton *resumeBigButton;
@@ -59,6 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (IBAction)showKeyboardButton:(UIButton *)sender;
 - (IBAction)hideToolbarButton:(UIButton *)sender;
 - (IBAction)drivesPressed:(UIButton *)sender;
+- (IBAction)usbPressed:(UIButton *)sender;
 
 @end
 
diff --git a/Platform/iOS/Display/VMDisplayViewController.m b/Platform/iOS/Display/VMDisplayViewController.m
index 304bd420..bec56648 100644
--- a/Platform/iOS/Display/VMDisplayViewController.m
+++ b/Platform/iOS/Display/VMDisplayViewController.m
@@ -326,6 +326,9 @@
     self.keyboardVisible = !self.keyboardVisible;
 }
 
+- (IBAction)usbPressed:(UIButton *)sender {
+}
+
 - (IBAction)drivesPressed:(UIButton *)sender {
     self.removableDrivesViewController.modalPresentationStyle = UIModalPresentationPageSheet;
     self.removableDrivesViewController.vm = self.vm;
diff --git a/README.md b/README.md
index bd9f8ec2..e8671e6c 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,8 @@ Apple does not permit any apps that have interpreted or generated code therefore
 
 UTM is distributed under the permissive Apache 2.0 license. However, it uses several (L)GPL components. Most are dynamically linked but the gstreamer plugins are statically linked and parts of the code are taken from qemu. Please be aware of this if you intend on redistributing this application.
 
+Some icons made by [Freepik](https://www.freepik.com) from [www.flaticon.com](https://www.flaticon.com/).
+
   [1]: https://github.com/utmapp/UTM/actions?query=event%3Arelease+workflow%3ABuild
   [2]: https://dantheman827.github.io/ios-app-signer/
   [3]: https://github.com/utmapp/UTM/releases