From f14c45740bcda8579d1d71b8d3310c5cb8a573f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Fri, 12 May 2006 17:54:28 +0000 Subject: [PATCH] * added "Magnify" to the available video filters - re-designed the view a bit, so it is smaller (and nicer IMO) - string fix --- .../English.lproj/Extended.nib/classes.nib | 1 + .../English.lproj/Extended.nib/info.nib | 9 +-- .../Extended.nib/keyedobjects.nib | Bin 20156 -> 20714 bytes modules/gui/macosx/extended.h | 3 +- modules/gui/macosx/extended.m | 69 +++++++++--------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib index 306bb16474..8cad7a30dd 100644 --- a/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib @@ -33,6 +33,7 @@ "o_ckb_imgClone" = id; "o_ckb_imgCrop" = id; "o_ckb_imgInvers" = id; + "o_ckb_intZoom" = id; "o_ckb_trnsform" = id; "o_ckb_vlme_norm" = id; "o_expBtn_adjustImage" = id; diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib index ceb2178a2b..97e8056f3c 100644 --- a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib @@ -11,10 +11,10 @@ 32 525 487 390 233 0 0 1440 878 5 - 525 506 390 196 0 0 1440 878 + 467 464 392 178 0 0 1440 878 IBFramework Version - 437.0 + 443.0 IBLockedObjects 32 @@ -22,10 +22,9 @@ IBOpenObjects 18 - 32 - 13 + 5 IBSystem Version - 8C46 + 8I127 diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib index 9b779b814baa425548912a39704e18ee5ccdac84..f4e5259b18ebbf5509d0a51c793d6e62f12f6f0e 100644 GIT binary patch literal 20714 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 C&}8iZ literal 20156 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 diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h index 5b3c7f560a..20660390f7 100644 --- a/modules/gui/macosx/extended.h +++ b/modules/gui/macosx/extended.h @@ -1,7 +1,7 @@ /***************************************************************************** * extended.h: MacOS X Extended interface panel ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2006 the VideoLAN team * $Id$ * * Authors: Felix Kühne @@ -59,6 +59,7 @@ IBOutlet id o_ckb_imgCrop; IBOutlet id o_ckb_imgInvers; IBOutlet id o_ckb_trnsform; + IBOutlet id o_ckb_intZoom; /* audio filters */ IBOutlet id o_ckb_vlme_norm; diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m index 8987b6d308..09a8aabde6 100644 --- a/modules/gui/macosx/extended.m +++ b/modules/gui/macosx/extended.m @@ -1,7 +1,7 @@ /***************************************************************************** * extended.m: MacOS X Extended interface panel ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2006 the VideoLAN team * $Id$ * * Authors: Felix Kühne @@ -88,7 +88,7 @@ static VLCExtended *_o_sharedInstance = nil; [o_ckb_distortion setTitle: _NS("Distortion")]; [o_ckb_distortion setToolTip: _NS("Adds distortion effects")]; [o_ckb_imgClone setTitle: _NS("Image clone")]; - [o_ckb_imgClone setToolTip: _NS("Creates several copies of the Video " \ + [o_ckb_imgClone setToolTip: _NS("Creates several copies of the Video " "output window" )]; [o_ckb_imgCrop setTitle: _NS("Image cropping")]; [o_ckb_imgCrop setToolTip: _NS("Crops a defined part of the image")]; @@ -96,11 +96,13 @@ static VLCExtended *_o_sharedInstance = nil; [o_ckb_imgInvers setToolTip: _NS("Inverts the colors of the image")]; [o_ckb_trnsform setTitle: _NS("Transformation")]; [o_ckb_trnsform setToolTip: _NS("Rotates or flips the image")]; + [o_ckb_intZoom setTitle: _NS("Interactive Zoom")]; + [o_ckb_intZoom setToolTip: _NS("Enables an interactive Zoom feature")]; [o_ckb_vlme_norm setTitle: _NS("Volume normalization")]; - [o_ckb_vlme_norm setToolTip: _NS("Prevents the audio output from going " \ + [o_ckb_vlme_norm setToolTip: _NS("Prevents the audio output from going " "over a predefined value.")]; [o_ckb_hdphnVirt setTitle: _NS("Headphone virtualization")]; - [o_ckb_hdphnVirt setToolTip: _NS("Imitates the effect of surround sound " \ + [o_ckb_hdphnVirt setToolTip: _NS("Imitates the effect of surround sound " "when using headphones.")]; [o_lbl_maxLevel setStringValue: _NS("Maximum level")]; [o_btn_rstrDefaults setTitle: _NS("Restore Defaults")]; @@ -233,7 +235,7 @@ static VLCExtended *_o_sharedInstance = nil; [o_sld_maxLevel setFloatValue: f_value ]; } - [o_sld_opaque setFloatValue: (config_GetFloat( p_intf, \ + [o_sld_opaque setFloatValue: (config_GetFloat( p_intf, "macosx-opaqueness") * 100)]; @@ -351,7 +353,7 @@ static VLCExtended *_o_sharedInstance = nil; id o_window = [NSApp keyWindow]; NSArray *o_windows = [NSApp orderedWindows]; NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, \ + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); vout_thread_t *p_real_vout; @@ -459,7 +461,6 @@ static VLCExtended *_o_sharedInstance = nil; if (o_adjImg_expanded) { o_box_adjImg_rect.size.height = [o_box_adjImg frame].size.height - 171; - msg_Dbg( VLCIntf, "collapsed adjust-image section"); o_adjImg_expanded = NO; } else { /* insert view */ @@ -468,7 +469,6 @@ static VLCExtended *_o_sharedInstance = nil; [o_adjustImg_view setNeedsDisplay:YES]; [o_adjustImg_view setAutoresizesSubviews: YES]; [[o_box_adjImg contentView] addSubview: o_adjustImg_view]; - msg_Dbg( VLCIntf, "expanded adjust-image section"); o_adjImg_expanded = YES; } [o_box_adjImg setFrameFromContentFrame: o_box_adjImg_rect]; @@ -501,7 +501,6 @@ static VLCExtended *_o_sharedInstance = nil; if (o_audFlts_expanded) { o_box_audFlts_rect.size.height = [o_box_audFlts frame].size.height - 66; - msg_Dbg( VLCIntf, "collapsed audio-filters section"); o_audFlts_expanded = NO; } else { /* insert view */ @@ -510,7 +509,6 @@ static VLCExtended *_o_sharedInstance = nil; [o_audioFlts_view setNeedsDisplay:YES]; [o_audioFlts_view setAutoresizesSubviews: YES]; [[o_box_audFlts contentView] addSubview: o_audioFlts_view]; - msg_Dbg( VLCIntf, "expanded audio-filters section"); o_audFlts_expanded = YES; } [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect]; @@ -527,18 +525,18 @@ static VLCExtended *_o_sharedInstance = nil; { /* move the window contents upwards (partially done through settings * inside the nib) and resize the window */ - o_win_rect.size.height = o_win_rect.size.height - 134; - o_win_rect.origin.y = [o_extended_window frame].origin.y + 134; - o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 134; + o_win_rect.size.height = o_win_rect.size.height - 116; + o_win_rect.origin.y = [o_extended_window frame].origin.y + 116; + o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 116; /* remove the inserted view */ [o_videoFilters_view removeFromSuperviewWithoutNeedingDisplay]; }else{ /* move the window contents downwards and resize the window */ - o_win_rect.size.height = o_win_rect.size.height + 134; - o_win_rect.origin.y = [o_extended_window frame].origin.y - 134; - o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 134; + o_win_rect.size.height = o_win_rect.size.height + 116; + o_win_rect.origin.y = [o_extended_window frame].origin.y - 116; + o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 116; } [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect]; @@ -547,17 +545,15 @@ static VLCExtended *_o_sharedInstance = nil; if (o_vidFlts_expanded) { - o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height - 134; - msg_Dbg( VLCIntf, "collapsed video-filters section"); + o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height - 116; o_vidFlts_expanded = NO; } else { /* insert view */ - o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height + 134; - [o_videoFilters_view setFrame: NSMakeRect( 20, -10, 370, 144)]; + o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height + 116; + [o_videoFilters_view setFrame: NSMakeRect( 20, -10, 370, 116)]; [o_videoFilters_view setNeedsDisplay:YES]; [o_videoFilters_view setAutoresizesSubviews: YES]; [[o_box_vidFlts contentView] addSubview: o_videoFilters_view]; - msg_Dbg( VLCIntf, "expanded video-filters section"); o_vidFlts_expanded = YES; } [o_box_vidFlts setFrameFromContentFrame: o_box_vidFlts_rect]; @@ -589,22 +585,25 @@ static VLCExtended *_o_sharedInstance = nil; else if (sender == o_ckb_trnsform) { [self changeVFiltersString: "transform" onOrOff: [o_ckb_trnsform state]]; + } + else if (sender == o_ckb_intZoom ) + { + [self changeVFiltersString: "magnify" onOrOff: [o_ckb_intZoom state]]; } else { /* this shouldn't happen */ - msg_Warn (VLCIntf, "cannot find selected video-filter"); + msg_Warn (VLCIntf, "cannot find switched video-filter"); } } - (IBAction)vidFlts_mrInfo:(id)sender { /* show info sheet */ -/// \bug [String] Misplaced \n - NSBeginInformationalAlertSheet(_NS("More Information"), _NS("OK"), @"", @"", \ - o_extended_window, nil, nil, nil, nil, _NS("This panel allows to " \ - "select video effects filters to apply.\n" \ - "The filters can be configured indivudually in the Preferences, in " \ - "the subsections of Video/Filters\n." \ - "To choose the order in which the filter are applied, a filter " \ + NSBeginInformationalAlertSheet(_NS("More Information"), _NS("OK"), @"", @"", + o_extended_window, nil, nil, nil, nil, _NS("This panel allows to " + "select video effects filters to apply.\n" + "The filters can be configured individually in the Preferences, in " + "the subsections of Video/Filters.\n" + "To choose the order in which the filter are applied, a filter " "option string can be set in the Preferences, Video / Filters section.")); } @@ -761,24 +760,24 @@ static VLCExtended *_o_sharedInstance = nil; { /* save the preferences to make sure that our module-changes will up on * next launch again */ - playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, \ + playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); int returnedValue; NSArray * theModules; - theModules = [[NSArray alloc] initWithObjects: @"main", @"headphone", \ - @"transform", @"adjust", @"invert", @"motionblur", @"distort", \ - @"clone", @"crop", @"normvol", @"headphone_channel_mixer", @"macosx", \ + theModules = [[NSArray alloc] initWithObjects: @"main", @"headphone", + @"transform", @"adjust", @"invert", @"motionblur", @"distort", + @"clone", @"crop", @"normvol", @"headphone_channel_mixer", @"macosx", nil]; unsigned int x = 0; while ( x != [theModules count] ) { - returnedValue = config_SaveConfigFile( p_playlist, [[theModules \ + returnedValue = config_SaveConfigFile( p_playlist, [[theModules objectAtIndex: x] UTF8String] ); if (returnedValue != 0) { - msg_Err(p_playlist, "unable to save the preferences of the " \ + msg_Err(p_playlist, "unable to save the preferences of the " "extended control attribute '%s' (%i)", [[theModules objectAtIndex: x] UTF8String] , returnedValue); [theModules release]; -- GitLab