w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct Mac OS X version portability settings for KVASD-installer 

Disable drag and drop target selection in KVASD-installer

The Mac KVASD-installer running on OS X 10.7 crashes when trying
to process a target selected by drag and drop. Due to issues
debuging issues on 10.7 with Xcode 4, I have disabled the
feature since there is an alternative mechanisim available.

Merged r4754 & r4756 from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-12-05 15:37:24 +00:00
parent f37ed4cd78
commit c938a0bd89
8 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Darwin/KVASD-installer/KVASD-installer.xcodeproj/project.pbxproj
View File

@ -259,7 +259,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "KVASD-installer/KVASD-installer-Prefix.pch"; GCC_PREFIX_HEADER = "KVASD-installer/KVASD-installer-Prefix.pch";
INFOPLIST_FILE = "KVASD-installer/KVASD-installer-Info.plist"; INFOPLIST_FILE = "KVASD-installer/KVASD-installer-Info.plist";
MACOSX_DEPLOYMENT_TARGET = ""; MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
@ -273,7 +273,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "KVASD-installer/KVASD-installer-Prefix.pch"; GCC_PREFIX_HEADER = "KVASD-installer/KVASD-installer-Prefix.pch";
INFOPLIST_FILE = "KVASD-installer/KVASD-installer-Info.plist"; INFOPLIST_FILE = "KVASD-installer/KVASD-installer-Info.plist";
MACOSX_DEPLOYMENT_TARGET = ""; MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };

17
Darwin/KVASD-installer/KVASD-installer/MainMenu.xib
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment version="1070" defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
</dependencies> </dependencies>
<objects> <objects>
@ -125,7 +126,7 @@
<action selector="doChooseTarget:" target="494" id="T3v-Fi-ceL"/> <action selector="doChooseTarget:" target="494" id="T3v-Fi-ceL"/>
</connections> </connections>
</button> </button>
<button toolTip="Click to process all the selected WSJT-X application bundles you have selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WgE-a2-qYH"> <button toolTip="Click to process all the WSJT-X application bundles you have selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WgE-a2-qYH">
<rect key="frame" x="430" y="63" width="46" height="25"/> <rect key="frame" x="430" y="63" width="46" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="squareTextured" title="Install" bezelStyle="texturedSquare" imagePosition="overlaps" alignment="center" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Wul-Wc-vif"> <buttonCell key="cell" type="squareTextured" title="Install" bezelStyle="texturedSquare" imagePosition="overlaps" alignment="center" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Wul-Wc-vif">
@ -144,7 +145,7 @@
<rect key="frame" x="20" y="184" width="456" height="288"/> <rect key="frame" x="20" y="184" width="456" height="288"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<string key="toolTip">Please read the agreement and tick the "Agree" checkbox below if you accept the terms and wish to continue with the installation.</string> <string key="toolTip">Please read the agreement and tick the "Agree" checkbox below if you accept the terms and wish to continue with the installation.</string>
<clipView key="contentView" id="98d-J5-d83"> <clipView key="contentView" id="hfA-a7-tlo">
<rect key="frame" x="1" y="1" width="439" height="286"/> <rect key="frame" x="1" y="1" width="439" height="286"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
@ -176,7 +177,7 @@
<constraints> <constraints>
<constraint firstAttribute="height" constant="37" id="hQV-aJ-MXM"/> <constraint firstAttribute="height" constant="37" id="hQV-aJ-MXM"/>
</constraints> </constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Use &quot;Choose target ...&quot; to pick WSJT-X application bundles to install KVASD into or simply drop them onto this window" id="3OK-wt-WuN"> <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Use &quot;Choose target ...&quot; to pick WSJT-X application bundles to install KVASD into" id="3OK-wt-WuN">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@ -203,9 +204,12 @@
</connections> </connections>
</buttonCell> </buttonCell>
</button> </button>
<button verticalHuggingPriority="750" misplaced="YES" tag="-1" translatesAutoresizingMaskIntoConstraints="NO" id="ylZ-OO-wid"> <button verticalHuggingPriority="750" tag="-1" translatesAutoresizingMaskIntoConstraints="NO" id="ylZ-OO-wid">
<rect key="frame" x="179" y="5" width="102" height="32"/> <rect key="frame" x="179" y="5" width="102" height="32"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="x77-Gu-2d1"/>
</constraints>
<buttonCell key="cell" type="push" title="Print ..." bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="2cB-RL-2Da"> <buttonCell key="cell" type="push" title="Print ..." bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="2cB-RL-2Da">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
@ -214,9 +218,12 @@
<action selector="doPrint:" target="494" id="879-hA-tbm"/> <action selector="doPrint:" target="494" id="879-hA-tbm"/>
</connections> </connections>
</button> </button>
<button misplaced="YES" tag="-1" translatesAutoresizingMaskIntoConstraints="NO" id="art-4p-gjI"> <button tag="-1" translatesAutoresizingMaskIntoConstraints="NO" id="art-4p-gjI">
<rect key="frame" x="347" y="-1" width="102" height="47"/> <rect key="frame" x="347" y="-1" width="102" height="47"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<constraints>
<constraint firstAttribute="width" constant="98" id="tcI-KQ-cBc"/>
</constraints>
<buttonCell key="cell" type="check" title="Agree" bezelStyle="regularSquare" imagePosition="left" enabled="NO" inset="2" id="NP4-SZ-zup"> <buttonCell key="cell" type="check" title="Agree" bezelStyle="regularSquare" imagePosition="left" enabled="NO" inset="2" id="NP4-SZ-zup">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>

66
Darwin/KVASD-installer/KVASD-installer/WSJTAppDelegate.applescript
View File

@ -192,29 +192,33 @@ script WSJTAppDelegate
end applicationShouldTerminate_ end applicationShouldTerminate_
-- --
-- NSDraggingDestination (NSWindow Delgate) Protocol -- NSDraggingDestination (NSWindow Delgate) Protocol (Not working on 10.7)
-- --
-- Accept Generic drag&drop sources -- Accept Generic drag&drop sources
on draggingEntered_(sender) -- on draggingEntered_(sender)
return current application's NSDragOperationGeneric -- return current application's NSDragOperationGeneric
end draggingEntered_ -- end draggingEntered_
-- Process a drop on our window -- Process a drop on our window
on performDragOperation_(sender) -- on performDragOperation_(sender)
set pb to sender's draggingPasteboard() -- try
if pb's types() as list contains current application's NSURLPboardType then -- set pb to sender's draggingPasteboard()
set options to {NSPasteboardURLReadingContentsConformToTypesKey:{"com.apple.application-bundle"}} -- if pb's types() as list contains current application's NSURLPboardType then
repeat with u in pb's readObjectsForClasses_options_({current application's |NSURL|},options) -- set options to {NSPasteboardURLReadingContentsConformToTypesKey:{"com.apple.application-bundle"}}
copy u's |path| to end of bundlesToProcess -- repeat with u in pb's readObjectsForClasses_options_({current application's |NSURL|},options)
end repeat -- copy u's |path| to end of bundlesToProcess
if bundlesToProcess ≠ {} and licenceAgreed then -- end repeat
installButton's setEnabled_(true) -- if bundlesToProcess ≠ {} and licenceAgreed then
end if -- installButton's setEnabled_(true)
return true -- end if
end if -- return true
return false -- end if
end performDragOperation_ -- on error errorString
-- abort(errorString)
-- end try
-- return false
-- end performDragOperation_
-- --
-- UI handlers -- UI handlers
@ -286,20 +290,28 @@ script WSJTAppDelegate
-- Install button handler -- Install button handler
on doInstall_(sender) on doInstall_(sender)
process() try
set bundlesToProcess to {} process()
installButton's setEnabled_(false) set bundlesToProcess to {}
installButton's setEnabled_(false)
on error errorString
abort(errorString)
end try
end doInstall_ end doInstall_
-- handler called on eulaTextView scroll or view changes -- handler called on eulaTextView scroll or view changes
-- enables agree/install button once the bottom is reached -- enables agree/install button once the bottom is reached
on viewChanged_(aNotification) on viewChanged_(aNotification)
set dr to eulaTextView's |bounds| as record try
set vdr to eulaTextView's visibleRect as record set dr to eulaTextView's |bounds| as record
if height of |size| of dr - (y of origin of vdr + height of |size| of vdr) is less than or equal to 0 ¬ set vdr to eulaTextView's visibleRect as record
and not licenceAgreed then if height of |size| of dr - (y of origin of vdr + height of |size| of vdr) is less than or equal to 0 ¬
agreeCheckBox's setEnabled_(true) and not licenceAgreed then
end if agreeCheckBox's setEnabled_(true)
end if
on error errorString
abort(errorString)
end try
end viewChanged end viewChanged
-- Abort handler -- Abort handler

7
Darwin/ReadMe.txt
View File

@ -57,10 +57,9 @@ The install DMG includes an installer tool KVASD-installer that allows you to in
KVASD into your WSJT-X application. When you run KVASD-installer you must have a KVASD into your WSJT-X application. When you run KVASD-installer you must have a
functioning Internet connection since it downloads KVASD during the installation. functioning Internet connection since it downloads KVASD during the installation.
Run KVASD-installer and review the license terms then either drag the newly installed Run KVASD-installer and review the license terms then use the "Choose target …" button
WSJT-X application onto it or use the "Choose target …" button to select the WSJT-X to select the WSJT-X application you have just installed then; click "Install" to inject
application you have just installed then; click "Install" to inject KVASD into the KVASD into the WSJT-X application.
WSJT-X application.
You need to configure your sound card. Visit Applications > Utilities > Audio MIDI You need to configure your sound card. Visit Applications > Utilities > Audio MIDI
Setup and select your sound card and then set Format to be "48000Hz 2ch-16bit" for Setup and select your sound card and then set Format to be "48000Hz 2ch-16bit" for

2
contrib/Darwin/KVASD-installer.app/Contents/Info.plist
View File

@ -52,7 +52,7 @@
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string></string> <string>10.7</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Created by Bill Somerville (G4WJS) on 12/11/2014. <string>Created by Bill Somerville (G4WJS) on 12/11/2014.

BIN
contrib/Darwin/KVASD-installer.app/Contents/MacOS/KVASD-installer
View File

Binary file not shown.

BIN
contrib/Darwin/KVASD-installer.app/Contents/Resources/MainMenu.nib generated
View File

Binary file not shown.

BIN
contrib/Darwin/KVASD-installer.app/Contents/Resources/WSJTAppDelegate.scpt
View File

Binary file not shown.