From 762e394acc8865e4a5dae98edb6edc3569da0db7 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Fri, 28 Aug 2015 19:32:00 -0700
Subject: [PATCH] Style fixes in installers

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
---
 .../project.pbxproj                           |   4 +--
 .../Base.lproj/overviewplugin.xib             |  14 ++++-----
 .../Base.lproj/quickstartplugin.xib           |  28 +++++++++---------
 osx/mpkg/Distribution                         |   2 +-
 .../Contents/MacOS/managevmplugin             | Bin 43388 -> 43388 bytes
 .../Contents/MacOS/overviewplugin             | Bin 23252 -> 23252 bytes
 .../Resources/Base.lproj/overviewplugin.nib   | Bin 7758 -> 7759 bytes
 .../Contents/MacOS/quickstartplugin           | Bin 24080 -> 24080 bytes
 .../Resources/Base.lproj/quickstartplugin.nib | Bin 8869 -> 8868 bytes
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
index b016783119..e38a243b43 100644
--- a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
+++ b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
@@ -51,9 +51,9 @@
 		1B4C91BE1B85198100A06068 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/quickstartplugin.xib; sourceTree = "<group>"; };
 		1B4C91C11B85198100A06068 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		1B4C91C31B85198100A06068 /* InstallerSections.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = InstallerSections.plist; sourceTree = "<group>"; };
-		1B763C8C1B90F96800981AA8 /* informationplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = informationplugin.bundle; path = /Users/jmorgan/workspace/toolbox/osx/installerplugins/build/Debug/informationplugin.bundle; sourceTree = "<absolute>"; };
 		1B8417E71B85261F00B1FA4D /* kitematic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = kitematic.png; sourceTree = "<group>"; };
 		1B8417E81B85261F00B1FA4D /* quickstart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = quickstart.png; sourceTree = "<group>"; };
+		1BDCE93A1B914EE2009C3488 /* informationplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = informationplugin.bundle; path = /Users/jmorgan/workspace/toolbox/osx/installerplugins/build/Debug/informationplugin.bundle; sourceTree = "<absolute>"; };
 		1BF102BB1B8BDEDA00FCB650 /* overviewplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = overviewplugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		1BF102BE1B8BDEDA00FCB650 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1BF102C01B8BDEDA00FCB650 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -241,7 +241,7 @@
 			);
 			name = informationplugin;
 			productName = informationplugin;
-			productReference = 1B763C8C1B90F96800981AA8 /* informationplugin.bundle */;
+			productReference = 1BDCE93A1B914EE2009C3488 /* informationplugin.bundle */;
 			productType = "com.apple.product-type.bundle";
 		};
 		1BF102BA1B8BDEDA00FCB650 /* overviewplugin */ = {
diff --git a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
index fc6f028101..e75f62f894 100644
--- a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
+++ b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib
@@ -24,8 +24,8 @@
             <rect key="frame" x="0.0" y="0.0" width="418" height="330"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5n-p7-Zro">
-                    <rect key="frame" x="20" y="46" width="378" height="283"/>
+                <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5n-p7-Zro">
+                    <rect key="frame" x="20" y="120" width="378" height="190"/>
                     <clipView key="contentView" misplaced="YES" id="GuL-k4-Axf">
                         <rect key="frame" x="1" y="1" width="223" height="133"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -35,11 +35,11 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <size key="minSize" width="378" height="283"/>
-                                <size key="maxSize" width="463" height="433"/>
+                                <size key="minSize" width="378" height="100"/>
+                                <size key="maxSize" width="463" height="100"/>
                                 <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                <size key="minSize" width="378" height="283"/>
-                                <size key="maxSize" width="463" height="433"/>
+                                <size key="minSize" width="378" height="100"/>
+                                <size key="maxSize" width="463" height="100"/>
                             </textView>
                         </subviews>
                         <animations/>
@@ -51,7 +51,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <animations/>
                     </scroller>
-                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="gzS-9C-bOX">
+                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="gzS-9C-bOX">
                         <rect key="frame" x="224" y="1" width="15" height="133"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <animations/>
diff --git a/osx/installerplugins/quickstartplugin/Base.lproj/quickstartplugin.xib b/osx/installerplugins/quickstartplugin/Base.lproj/quickstartplugin.xib
index 622cfb58c6..1d1dcd51ca 100644
--- a/osx/installerplugins/quickstartplugin/Base.lproj/quickstartplugin.xib
+++ b/osx/installerplugins/quickstartplugin/Base.lproj/quickstartplugin.xib
@@ -35,8 +35,17 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h81-Lr-9M8">
+                    <rect key="frame" x="18" y="29" width="382" height="34"/>
+                    <animations/>
+                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="You can find these later in the Docker directory under Applications." id="Svq-5c-kHJ">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ijs-dB-4JA">
-                    <rect key="frame" x="254" y="175" width="104" height="104"/>
+                    <rect key="frame" x="255" y="157" width="104" height="104"/>
                     <animations/>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSInfo" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="N0R-Mh-4ck">
                         <behavior key="behavior" lightByContents="YES"/>
@@ -47,7 +56,7 @@
                     </connections>
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="O4m-wW-5Fw">
-                    <rect key="frame" x="59" y="121" width="118" height="39"/>
+                    <rect key="frame" x="60" y="103" width="118" height="39"/>
                     <animations/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="oVp-lY-Mah">
                         <font key="font" metaFont="system"/>
@@ -58,7 +67,7 @@ Terminal</string>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jKy-qa-eNn">
-                    <rect key="frame" x="253" y="143" width="107" height="17"/>
+                    <rect key="frame" x="254" y="125" width="107" height="17"/>
                     <animations/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Kitematic (Beta)" id="fs6-3u-0I6">
                         <font key="font" metaFont="system"/>
@@ -66,17 +75,8 @@ Terminal</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h81-Lr-9M8">
-                    <rect key="frame" x="18" y="51" width="382" height="34"/>
-                    <animations/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="You can find these later in the Docker directory under Applications." id="Svq-5c-kHJ">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BmR-gU-wJa">
-                    <rect key="frame" x="237" y="104" width="139" height="39"/>
+                    <rect key="frame" x="238" y="86" width="139" height="39"/>
                     <animations/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Visual Management for Docker" id="38E-OE-8oK">
                         <font key="font" metaFont="system"/>
@@ -85,7 +85,7 @@ Terminal</string>
                     </textFieldCell>
                 </textField>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DYu-eG-6Cr">
-                    <rect key="frame" x="66" y="175" width="104" height="104"/>
+                    <rect key="frame" x="67" y="157" width="104" height="104"/>
                     <animations/>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSInfo" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="2CN-xC-hdg">
                         <behavior key="behavior" lightByContents="YES"/>
diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution
index 00968873c5..efad6fb41c 100644
--- a/osx/mpkg/Distribution
+++ b/osx/mpkg/Distribution
@@ -148,7 +148,7 @@
      {
          try {
              vboxplist = system.files.plistAtPath('/Applications/VirtualBox.app/Contents/Info.plist');
-             if (!vboxplist || !vboxplist.CFBundleVersion || system.compareVersions(vboxplist.CFBundleVersion, '%VBOX_VERSION%') === -1) {
+             if (!vboxplist || !vboxplist.CFBundleVersion || vboxplist.CFBundleVersion === '5.0.2' || system.compareVersions(vboxplist.CFBundleVersion, '%VBOX_VERSION%') === -1) {
                  return true;
              }
 
diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin
index 34d71712688232b9a5b4997bc7d838b425306e12..a631a8ab80fe9c3adad0224b11090c2e85d6bc73 100755
GIT binary patch
delta 18
acmex!iRsTJrVSIynFYijZk}BJ(hvY$0SP()

delta 18
acmex!iRsTJrVSIynM>|G*gU!Xr6B-iehOj$

diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin
index c89251d22fb1063686828d50a137252c4ceddb4c..9b1fbb4cf150b34fa12e0e380ec63a8c7080fb71 100755
GIT binary patch
delta 18
acmcbzmGR0}#tjc#nX|+nZhq|gQ3L>4A_*@5

delta 18
acmcbzmGR0}#tjc#nM>|G*!<Y_qX+<A&k6ki

diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib
index 79ad558b62a44fb4688529a042bd000770ab9511..21ebc2a50acc96310a6f1560c8efceaf8306caf4 100644
GIT binary patch
delta 522
zcmX|%O-R#m7{}Xe*tT5m|NNfk`%tFC-gD|Uv$<R)qZh%94n`$(@(@TwtXSckvlpVE
ziw^1K7<B1S%VoZlB_a|LODeQXBIwW|M3eAZo;rO#@cHDU@1xnLPTQ(nzw@!JAXppD
zwYl#*Ji$mH)tamc*ZF-bnsIw01uM)Q_Ey^Lw&_g5sum=Zp}<NG1yX+B|1~#aS@zX-
zm)(__G8gP;#&QSwSYdk9nzTMzbJkC5k!(~z4k{!kxv7ZOk(Y=X=s2}gnr_owdPrHC
zpjn!y1^P`(^oN$|uc<eUro|*o%JiB(^T^DYFXpS6GvCa2cCwp`*u%waaXs(l{oKGY
zZsKO{;7;!1bega5HO_KBKjQ%&<Y6A?Up&tXyvR$kK{iU6_@rDaBp?xKlx8_4?Q&Mm
z$$5!OxAaIx`s9w>lLwNM0U4BGc_De3kp)?X10HO`7Hq=~RG<>o2%-kH2qS_R4&V^d
zEjW!hE+T=;=s+jB(2c9OjvKg%9z4eoM(`4^FotnVU=nZe7VnV96h7b+rtulG_@Qgm
zrEArr#cHWhQPuTYqNVE7a^0+3b-V6VzgB5LL%K_MYn|@VsP5B-5{+q-9?_$ELQiU|
VwrN~1=`HQmCpwy`DlN0U{s)&sjR^n%

delta 521
zcmX}iO-R#m9LMo(u5{|u{lCBO_w%jHhn}<9%q^X^8Y60827%ENo$4e}F+@YwTn|J+
z7j06}E$Gt4r>R+5AtDiBVv%JML5B`0GYPMer%vzJ;XNICAL{FO*^ANxt{!_<!0%6=
z&wI3{U=@ioaer;lTUH(Pr}8{?S*uM)J(YHc?NX}E^0CC@)m7fIKuyA1_Ww+eT9(6U
zTd*ypW=xAC)|Woa$Fh@S)}-~pnzw#hOJpMlIcY8BP%h<D0Tq!&VLDFD)IoRY0X?B!
znxHvaqzwJ0W%@%a^w-pzsA)2-=Bnv3-R7y8HDAnEGjG0`@0`QAoX>79WDnPKh!1d>
zBiz7^+|F@Ma7U7_@eS_feopfs5Az6*^DkcH3@`Drte0Xbky0s_3h_x$qS7d*q**S=
zMY$|7NlK^OlWw^$59P58$e;|%h`f*~nU##JzzH`tVGFil2P)vjZd9Qf0n{Lf2oB;9
zl1(^^7+TPZD`-a?2_$hHH*pKM(TO2E!*h({C0=736PUysyu~|AVHz{|h)?*8IsDLU
zb!ncuwNO1u$_ibl8+4<VYPoLKt-4)z>MpHRpYBn=?$uhY(|x*M!^IlW20fxj^@N_(
W(|S&0+NO83OM7%I<tr(*zxoH}A&q$e

diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin
index e2d0056526d0720f58d1bfad0338f67680275ba6..9899d08a5980e2607ce9fa17bdb936add4235646 100755
GIT binary patch
delta 18
acmbQRhjGFl#tk=InFYijZochmDggjYdk2#M

delta 18
acmbQRhjGFl#tk=InM>|G*nHd7R0050_z1fI

diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib
index 54930772f1d4b1bb8dd35cf64f594d961aeea58d..4e73a9fe60bf1d1f181e7740dffb7ffae828d2f7 100644
GIT binary patch
delta 3206
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

delta 3188
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