vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Dec 4 13:42:22 2016 +0100| [24ce1f2bf0ed2e3bf20c40ae5ed4380fd443becf] | committer: Felix Paul Kühne
macosx: remove 'README' UI > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24ce1f2bf0ed2e3bf20c40ae5ed4380fd443becf --- .../macosx/Resources/English.lproj/MainMenu.xib | 18 ++++-------------- modules/gui/macosx/VLCMainMenu.h | 2 -- modules/gui/macosx/VLCMainMenu.m | 8 -------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index ba6fcc2..bca91fd 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <deployment version="1070" identifier="macosx"/> + <deployment identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="VLCMainMenu"> @@ -104,7 +104,6 @@ <outlet property="rate_sld" destination="4597" id="HsT-Rx-eia"/> <outlet property="rate_slowerLabel" destination="4600" id="vRN-S8-MSb"/> <outlet property="rate_view" destination="4596" id="MPC-hG-6bj"/> - <outlet property="readme" destination="1136" id="QoP-Va-kF5"/> <outlet property="record" destination="5137" id="Ka3-jl-auY"/> <outlet property="renderer" destination="Rf6-Uj-7Ja" id="Nzc-Qb-SnK"/> <outlet property="repeat" destination="5143" id="ulG-wD-gtG"/> @@ -801,12 +800,6 @@ <action selector="showHelp:" target="-2" id="Tuw-ca-6xj"/> </connections> </menuItem> - <menuItem title="ReadMe / FAQ..." keyEquivalent="?" id="1136"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/> - <connections> - <action selector="openReadMe:" target="-2" id="jdq-YH-NRX"/> - </connections> - </menuItem> <menuItem title="Licence" id="2834"> <connections> <action selector="showLicense:" target="-2" id="RZ4-f2-Smi"/> @@ -977,14 +970,11 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <box horizontalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="4601"> + <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="4601"> <rect key="frame" x="156" y="11" width="5" height="8"/> <constraints> <constraint firstAttribute="height" constant="8" id="3TW-kT-FcC"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - <font key="titleFont" metaFont="system"/> </box> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4615"> <rect key="frame" x="19" y="35" width="108" height="18"/> diff --git a/modules/gui/macosx/VLCMainMenu.h b/modules/gui/macosx/VLCMainMenu.h index 271bfeb..167412b 100644 --- a/modules/gui/macosx/VLCMainMenu.h +++ b/modules/gui/macosx/VLCMainMenu.h @@ -177,7 +177,6 @@ @property (readwrite, weak) IBOutlet NSMenu *helpMenu; @property (readwrite, weak) IBOutlet NSMenuItem *help; -@property (readwrite, weak) IBOutlet NSMenuItem *readme; @property (readwrite, weak) IBOutlet NSMenuItem *documentation; @property (readwrite, weak) IBOutlet NSMenuItem *license; @property (readwrite, weak) IBOutlet NSMenuItem *website; @@ -275,7 +274,6 @@ - (IBAction)showLicense:(id)sender; - (IBAction)showPreferences:(id)sender; - (IBAction)showHelp:(id)sender; -- (IBAction)openReadMe:(id)sender; - (IBAction)openDocumentation:(id)sender; - (IBAction)openWebsite:(id)sender; - (IBAction)openForum:(id)sender; diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m index 46634b7..920137c 100644 --- a/modules/gui/macosx/VLCMainMenu.m +++ b/modules/gui/macosx/VLCMainMenu.m @@ -451,7 +451,6 @@ [_helpMenu setTitle: _NS("Help")]; [_help setTitle: _NS("VLC media player Help...")]; - [_readme setTitle: _NS("ReadMe / FAQ...")]; [_license setTitle: _NS("License")]; [_documentation setTitle: _NS("Online Documentation...")]; [_website setTitle: _NS("VideoLAN Website...")]; @@ -1254,13 +1253,6 @@ [_rendererDialog showWindow:self]; } -- (IBAction)openReadMe:(id)sender -{ - NSString *path = [[NSBundle mainBundle] pathForResource: @"README.MacOSX" ofType: @"rtf"]; - - [[NSWorkspace sharedWorkspace] openFile: path withApplication: @"TextEdit"]; -} - - (IBAction)openDocumentation:(id)sender { NSURL *url = [NSURL URLWithString: @"http://www.videolan.org/doc/";]; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
