vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Jul 14 14:26:12 2012 +0200| [82876db84bc3d2624c73dcfaead1c3343929c237] | committer: Felix Paul Kühne
macosx: CAS: simplification > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82876db84bc3d2624c73dcfaead1c3343929c237 --- .../Resources/English.lproj/ConvertAndSave.xib | 25 ++++---------------- modules/gui/macosx/ConvertAndSave.h | 1 - modules/gui/macosx/ConvertAndSave.m | 15 ++++-------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib index 06e40fc..2290064 100644 --- a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib +++ b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib @@ -12,8 +12,8 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="2"/> <integer value="132"/> - <integer value="10"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2097,14 +2097,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">profileSelection:</string> - <reference key="source" ref="203744709"/> - <reference key="destination" ref="803077624"/> - </object> - <int key="connectionID">100</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">windowButtonAction:</string> <reference key="source" ref="203744709"/> <reference key="destination" ref="210468830"/> @@ -4000,9 +3992,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{617, 266}, {663, 490}}</string> + <string>{{305, 266}, {663, 490}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{617, 266}, {663, 490}}</string> + <string>{{305, 266}, {663, 490}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -4023,9 +4015,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSAffineTransform"> <bytes key="NSTransformStruct">P4AAAL+AAABDUQAAwmgAAA</bytes> </object> - <string>{{292, 96}, {558, 370}}</string> + <string>{{329, 96}, {558, 370}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{292, 96}, {558, 370}}</string> + <string>{{329, 96}, {558, 370}}</string> <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -4356,7 +4348,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>closeCustomizationSheet:</string> <string>customizeProfile:</string> <string>openMedia:</string> - <string>profileSelection:</string> <string>windowButtonAction:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -4366,7 +4357,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -4377,7 +4367,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>closeCustomizationSheet:</string> <string>customizeProfile:</string> <string>openMedia:</string> - <string>profileSelection:</string> <string>windowButtonAction:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -4399,10 +4388,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">profileSelection:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">windowButtonAction:</string> <string key="candidateClassName">id</string> </object> diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h index f58d06a..957c306 100644 --- a/modules/gui/macosx/ConvertAndSave.h +++ b/modules/gui/macosx/ConvertAndSave.h @@ -104,7 +104,6 @@ - (IBAction)windowButtonAction:(id)sender; - (IBAction)openMedia:(id)sender; -- (IBAction)profileSelection:(id)sender; - (IBAction)customizeProfile:(id)sender; - (IBAction)closeCustomizationSheet:(id)sender; - (IBAction)chooseDestination:(id)sender; diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 06afd0e..0838c8c 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -243,17 +243,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil; { } -- (IBAction)profileSelection:(id)sender -{ - NSInteger index = [sender indexOfSelectedItem]; - if (index != ([sender numberOfItems] - 1)) - { - if (_currentProfile) - [_currentProfile release]; - _currentProfile = [[NSMutableArray alloc] initWithArray: [[_profileValueList objectAtIndex:index] componentsSeparatedByString:@";"]]; - } -} - - (IBAction)customizeProfile:(id)sender { [self resetCustomizationSheetBasedOnProfile:[_profileValueList objectAtIndex:[_profile_pop indexOfSelectedItem]]]; @@ -416,6 +405,10 @@ static VLCConvertAndSave *_o_sharedInstance = nil; } } } + + if (_currentProfile) + [_currentProfile release]; + _currentProfile = [[NSMutableArray alloc] initWithArray: [profileString componentsSeparatedByString:@";"]]; } - (void)selectCellByEncapsulationFormat:(NSString *)format _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
