{
- IBClasses = (
- {
- ACTIONS = {
- alignCenter = id;
- alignJustified = id;
- alignLeft = id;
- alignRight = id;
- arrangeInFront = id;
- centerSelectionInVisibleArea = id;
- changeFont = id;
- checkSpelling = id;
- clear = id;
- clearRecentDocuments = id;
- complete = id;
- copy = id;
- copyFont = id;
- copyRuler = id;
- cut = id;
- delete = id;
- deminiaturize = id;
- fax = id;
- hide = id;
- hideOtherApplications = id;
- loosenKerning = id;
- lowerBaseline = id;
- makeKeyAndOrderFront = id;
- miniaturize = id;
- newDocument = id;
- openDocument = id;
- orderBack = id;
- orderFront = id;
- orderFrontColorPanel = id;
- orderFrontHelpPanel = id;
- orderOut = id;
- outline = id;
- paste = id;
- pasteAsPlainText = id;
- pasteAsRichText = id;
- pasteFont = id;
- pasteRuler = id;
- pause = id;
- performClose = id;
- performFindPanelAction = id;
- performMiniaturize = id;
- performZoom = id;
- play = id;
- print = id;
- printDocument = id;
- raiseBaseline = id;
- record = id;
- redo = id;
- resume = id;
- revertDocumentToSaved = id;
- run = id;
- runPageLayout = id;
- runToolbarCustomizationPalette = id;
- saveAllDocuments = id;
- saveDocument = id;
- saveDocumentAs = id;
- saveDocumentTo = id;
- selectAll = id;
- selectText = id;
- showGuessPanel = id;
- showHelp = id;
- start = id;
- startSpeaking = id;
- stop = id;
- stopSpeaking = id;
- subscript = id;
- superscript = id;
- terminate = id;
- tightenKerning = id;
- toggleContinuousSpellChecking = id;
- toggleRuler = id;
- toggleToolbarShown = id;
- turnOffKerning = id;
- turnOffLigatures = id;
- underline = id;
- undo = id;
- unhideAllApplications = id;
- unscript = id;
- useAllLigatures = id;
- useStandardKerning = id;
- useStandardLigatures = id;
- };
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {
- CLASS = IBInspector;
- LANGUAGE = ObjC;
- OUTLETS = {inspectorView = NSView; };
- SUPERCLASS = NSObject;
- },
- {
- CLASS = IBLibraryObjectTemplate;
- LANGUAGE = ObjC;
- OUTLETS = {draggedView = NSView; representedObject = NSObject; };
- SUPERCLASS = NSView;
- },
- {CLASS = NSDateFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; },
- {CLASS = NSFormatter; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {CLASS = NSNumberFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; },
- {
- CLASS = PDFThumbnailView;
- LANGUAGE = ObjC;
- OUTLETS = {pdfView = PDFView; };
- SUPERCLASS = NSView;
- },
- {
- ACTIONS = {
- goBack = id;
- goForward = id;
- goToFirstPage = id;
- goToLastPage = id;
- goToNextPage = id;
- goToPreviousPage = id;
- selectAll = id;
- takeBackgroundColorFrom = id;
- zoomIn = id;
- zoomOut = id;
- };
- CLASS = PDFView;
- LANGUAGE = ObjC;
- SUPERCLASS = NSView;
- },
- {
- ACTIONS = {
- enableAdjustImage = id;
- enableHeadphoneVirtualizer = id;
- enableVolumeNormalization = id;
- expandAdjustImage = id;
- expandAudioFilters = id;
- expandVideoFilters = id;
- moreInfoVideoFilters = id;
- opaqueSliderAction = id;
- restoreDefaultsForAdjustImage = id;
- sliderActionAdjustImage = id;
- sliderActionMaximumAudioLevel = id;
- videoFilterAction = id;
- };
- CLASS = VLCExtended;
- LANGUAGE = ObjC;
- OUTLETS = {
- "o_adjustImg_view" = id;
- "o_audioFlts_view" = id;
- "o_box_adjImg" = id;
- "o_box_audFlts" = id;
- "o_box_vidFlts" = id;
- "o_btn_rstrDefaults" = id;
- "o_btn_vidFlts_mrInfo" = id;
- "o_ckb_blur" = id;
- "o_ckb_enblAdjustImg" = id;
- "o_ckb_gradient" = id;
- "o_ckb_hdphnVirt" = id;
- "o_ckb_imgClone" = id;
- "o_ckb_imgCrop" = id;
- "o_ckb_imgInvers" = id;
- "o_ckb_intZoom" = id;
- "o_ckb_psycho" = id;
- "o_ckb_ripple" = id;
- "o_ckb_trnsform" = id;
- "o_ckb_vlme_norm" = id;
- "o_ckb_wave" = id;
- "o_expBtn_adjustImage" = id;
- "o_expBtn_audioFlts" = id;
- "o_expBtn_videoFlts" = id;
- "o_extended_window" = id;
- "o_lbl_adjustImage" = id;
- "o_lbl_audio" = id;
- "o_lbl_audioFlts" = id;
- "o_lbl_brightness" = id;
- "o_lbl_contrast" = id;
- "o_lbl_distort" = id;
- "o_lbl_gamma" = id;
- "o_lbl_general" = id;
- "o_lbl_hue" = id;
- "o_lbl_maxLevel" = id;
- "o_lbl_opaque" = id;
- "o_lbl_saturation" = id;
- "o_lbl_video" = id;
- "o_lbl_videoFlts" = id;
- "o_sld_brightness" = id;
- "o_sld_contrast" = id;
- "o_sld_gamma" = id;
- "o_sld_hue" = id;
- "o_sld_maxLevel" = id;
- "o_sld_opaque" = id;
- "o_sld_saturation" = id;
- "o_videoFilters_view" = id;
- };
- SUPERCLASS = NSObject;
+ IBClasses = (
+ {
+ ACTIONS = {
+ alignCenter = id;
+ alignJustified = id;
+ alignLeft = id;
+ alignRight = id;
+ arrangeInFront = id;
+ centerSelectionInVisibleArea = id;
+ changeFont = id;
+ checkSpelling = id;
+ clear = id;
+ clearRecentDocuments = id;
+ complete = id;
+ copy = id;
+ copyFont = id;
+ copyRuler = id;
+ cut = id;
+ delete = id;
+ deminiaturize = id;
+ fax = id;
+ hide = id;
+ hideOtherApplications = id;
+ loosenKerning = id;
+ lowerBaseline = id;
+ makeKeyAndOrderFront = id;
+ miniaturize = id;
+ newDocument = id;
+ openDocument = id;
+ orderBack = id;
+ orderFront = id;
+ orderFrontColorPanel = id;
+ orderFrontHelpPanel = id;
+ orderOut = id;
+ outline = id;
+ paste = id;
+ pasteAsPlainText = id;
+ pasteAsRichText = id;
+ pasteFont = id;
+ pasteRuler = id;
+ pause = id;
+ performClose = id;
+ performFindPanelAction = id;
+ performMiniaturize = id;
+ performZoom = id;
+ play = id;
+ print = id;
+ printDocument = id;
+ raiseBaseline = id;
+ record = id;
+ redo = id;
+ resume = id;
+ revertDocumentToSaved = id;
+ run = id;
+ runPageLayout = id;
+ runToolbarCustomizationPalette = id;
+ saveAllDocuments = id;
+ saveDocument = id;
+ saveDocumentAs = id;
+ saveDocumentTo = id;
+ selectAll = id;
+ selectText = id;
+ showGuessPanel = id;
+ showHelp = id;
+ start = id;
+ startSpeaking = id;
+ stop = id;
+ stopSpeaking = id;
+ subscript = id;
+ superscript = id;
+ terminate = id;
+ tightenKerning = id;
+ toggleContinuousSpellChecking = id;
+ toggleRuler = id;
+ toggleToolbarShown = id;
+ turnOffKerning = id;
+ turnOffLigatures = id;
+ underline = id;
+ undo = id;
+ unhideAllApplications = id;
+ unscript = id;
+ useAllLigatures = id;
+ useStandardKerning = id;
+ useStandardLigatures = id;
+ };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ CLASS = IBInspector;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ inspectorView = NSView;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ CLASS = IBLibraryObjectTemplate;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ draggedView = NSView;
+ representedObject = NSObject;
+ };
+ SUPERCLASS = NSView;
+ },
+ {
+ CLASS = NSDateFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSFormatter;
+ },
+ {
+ CLASS = NSFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ CLASS = NSNumberFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSFormatter;
+ },
+ {
+ CLASS = PDFThumbnailView;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ pdfView = PDFView;
+ };
+ SUPERCLASS = NSView;
+ },
+ {
+ ACTIONS = {
+ goBack = id;
+ goForward = id;
+ goToFirstPage = id;
+ goToLastPage = id;
+ goToNextPage = id;
+ goToPreviousPage = id;
+ selectAll = id;
+ takeBackgroundColorFrom = id;
+ zoomIn = id;
+ zoomOut = id;
+ };
+ CLASS = PDFView;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSView;
+ },
+ {
+ ACTIONS = {
+ enableAdjustImage = id;
+ enableHeadphoneVirtualizer = id;
+ enableVolumeNormalization = id;
+ moreInfoVideoFilters = id;
+ opaqueSliderAction = id;
+ restoreDefaultsForAdjustImage = id;
+ sliderActionAdjustImage = id;
+ sliderActionMaximumAudioLevel = id;
+ videoFilterAction = id;
+ viewSelectorAction = id;
+ };
+ CLASS = VLCExtended;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ "o_adjustImg_view" = id;
+ "o_audioFlts_view" = id;
+ "o_btn_rstrDefaults" = id;
+ "o_btn_vidFlts_mrInfo" = id;
+ "o_ckb_blur" = id;
+ "o_ckb_enblAdjustImg" = id;
+ "o_ckb_gradient" = id;
+ "o_ckb_hdphnVirt" = id;
+ "o_ckb_imgClone" = id;
+ "o_ckb_imgCrop" = id;
+ "o_ckb_imgInvers" = id;
+ "o_ckb_intZoom" = id;
+ "o_ckb_psycho" = id;
+ "o_ckb_ripple" = id;
+ "o_ckb_trnsform" = id;
+ "o_ckb_vlme_norm" = id;
+ "o_ckb_wave" = id;
+ "o_extended_window" = id;
+ "o_lbl_brightness" = id;
+ "o_lbl_contrast" = id;
+ "o_lbl_distort" = id;
+ "o_lbl_gamma" = id;
+ "o_lbl_general" = id;
+ "o_lbl_hue" = id;
+ "o_lbl_maxLevel" = id;
+ "o_lbl_opaque" = id;
+ "o_lbl_saturation" = id;
+ "o_selector_pop" = id;
+ "o_sld_brightness" = id;
+ "o_sld_contrast" = id;
+ "o_sld_gamma" = id;
+ "o_sld_hue" = id;
+ "o_sld_maxLevel" = id;
+ "o_sld_opaque" = id;
+ "o_sld_saturation" = id;
+ "o_top_controls_box" = id;
+ "o_videoFilters_view" = id;
+ };
+ SUPERCLASS = NSObject;
}
- );
- IBVersion = 1;
+ );
+ IBVersion = 1;
}
\ No newline at end of file
/* localise GUI-strings */
/* method is called from intf.m (in method showExtended) */
[o_extended_window setTitle: _NS("Extended controls")];
- [o_lbl_video setStringValue: _NS("Video")];
- [o_lbl_audio setStringValue: _NS("Audio")];
- [o_lbl_audioFlts setStringValue: _NS("Audio filters")];
- [o_lbl_videoFlts setStringValue: _NS("Video filters")];
- [o_lbl_adjustImage setStringValue: _NS("Image adjustment")];
[o_btn_vidFlts_mrInfo setToolTip: _NS("Shows more information about the available video filters.")];
[o_ckb_wave setTitle: _NS("Wave")];
[o_ckb_ripple setTitle: _NS("Ripple")];
free( psz_afilters );
}
-}
-- (void)collapsAll
-{
- /* collaps all views so Cocoa saves the window position correctly */
- if( o_adjImg_expanded )
- [self expandAdjustImage: nil];
+ /* fill the popup button according to our available views */
+ [o_selector_pop removeAllItems];
+ [o_selector_pop addItemWithTitle: _NS("Adjust Image")];
+ [o_selector_pop addItemWithTitle: _NS("Video Filter")];
+ [o_selector_pop addItemWithTitle: _NS("Audio Filter")];
+ [o_selector_pop selectItemAtIndex: 0];
- if( o_audFlts_expanded )
- [self expandAudioFilters: nil];
+ /* make sure we draw a view on launch */
+ [self viewSelectorAction: self];
- if( o_vidFlts_expanded )
- [self expandVideoFilters: nil];
+ [self initStrings];
}
- (BOOL)getConfigChanged
[o_extended_window makeKeyAndOrderFront:nil];
}
+- (IBAction)viewSelectorAction:(id)sender
+{
+ NSView *o_toBeShown_view;
+ /* check which view to show */
+ if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Adjust Image")] )
+ o_toBeShown_view = o_adjustImg_view;
+ else if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Audio Filter")] )
+ o_toBeShown_view = o_audioFlts_view;
+ else if( [[[o_selector_pop selectedItem] title] isEqualToString: _NS("Video Filter")] )
+ o_toBeShown_view = o_videoFilters_view;
+ else
+ msg_Err( VLCIntf, "invalid ui view requested" );
+
+ NSRect o_win_rect, o_view_rect, o_old_view_rect;
+ o_win_rect = [o_extended_window frame];
+ o_view_rect = [o_toBeShown_view frame];
+
+ if( o_currentlyshown_view != nil )
+ {
+ /* restore our window's height, if we've shown another category previously */
+ o_old_view_rect = [o_currentlyshown_view frame];
+ o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height;
+ o_win_rect.origin.y = ( o_win_rect.origin.y + o_old_view_rect.size.height ) - o_view_rect.size.height;
+
+ /* remove our previous category view */
+ [o_currentlyshown_view removeFromSuperviewWithoutNeedingDisplay];
+ }
+
+ o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
+
+ //[o_extended_window displayIfNeeded];
+ [o_extended_window setFrame: o_win_rect display:YES animate: YES];
+
+ [o_toBeShown_view setFrame: NSMakeRect( 0,
+ 0, //[o_top_controls_box frame].size.height,
+ o_view_rect.size.width,
+ o_view_rect.size.height )];
+ [o_toBeShown_view setNeedsDisplay: YES];
+ [o_toBeShown_view setAutoresizesSubviews: YES];
+ [[o_extended_window contentView] addSubview: o_toBeShown_view];
+
+ /* keep our current category for further reference */
+ [o_currentlyshown_view release];
+ o_currentlyshown_view = o_toBeShown_view;
+ [o_currentlyshown_view retain];
+}
+
- (IBAction)enableAdjustImage:(id)sender
{
/* en-/disable the sliders */
[self changeAFiltersString: "normvol" onOrOff: NO ];
}
-- (IBAction)expandAdjustImage:(id)sender
-{
- /* expand or collapse adjImg */
- NSRect o_win_rect = [o_extended_window frame];
- NSRect o_box_audFlts_rect = [o_box_audFlts frame];
- NSRect o_box_vidFlts_rect = [o_box_vidFlts frame];
- NSRect o_box_adjImg_rect = [o_box_adjImg frame];
-
- if( o_adjImg_expanded )
- {
- /* 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 - 193;
- o_win_rect.origin.y = [o_extended_window frame].origin.y + 193;
- o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 193;
- o_box_vidFlts_rect.origin.y = o_box_vidFlts_rect.origin.y + 193;
-
- /* remove the inserted view */
- [o_adjustImg_view removeFromSuperviewWithoutNeedingDisplay];
- }
- else
- {
- /* move the window contents downwards and resize the window */
- o_win_rect.size.height = o_win_rect.size.height + 193;
- o_win_rect.origin.y = [o_extended_window frame].origin.y - 193;
- o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 193;
- o_box_vidFlts_rect.origin.y = o_box_vidFlts_rect.origin.y - 193;
- }
-
- [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect];
- [o_box_vidFlts setFrameFromContentFrame: o_box_vidFlts_rect];
- [o_extended_window displayIfNeeded];
- [o_extended_window setFrame: o_win_rect display:YES animate: YES];
-
- if( o_adjImg_expanded )
- {
- o_box_adjImg_rect.size.height = [o_box_adjImg frame].size.height - 193;
- o_adjImg_expanded = NO;
- }
- else
- {
- /* insert view */
- o_box_adjImg_rect.size.height = [o_box_adjImg frame].size.height + 193;
- [o_adjustImg_view setFrame: NSMakeRect( 20, -10, 370, 203)];
- [o_adjustImg_view setNeedsDisplay:YES];
- [o_adjustImg_view setAutoresizesSubviews: YES];
- [[o_box_adjImg contentView] addSubview: o_adjustImg_view];
- o_adjImg_expanded = YES;
- }
- [o_box_adjImg setFrameFromContentFrame: o_box_adjImg_rect];
-}
-
-- (IBAction)expandAudioFilters:(id)sender
-{
- /* expand or collapse audFlts */
- NSRect o_win_rect = [o_extended_window frame];
- NSRect o_box_audFlts_rect = [o_box_audFlts frame];
-
- if( o_audFlts_expanded )
- {
- /* 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 - 66;
- o_win_rect.origin.y = [o_extended_window frame].origin.y + 66;
-
- /* remove the inserted view */
- [o_audioFlts_view removeFromSuperviewWithoutNeedingDisplay];
- }
- else
- {
- /* move the window contents downwards and resize the window */
- o_win_rect.size.height = o_win_rect.size.height + 66;
- o_win_rect.origin.y = [o_extended_window frame].origin.y - 66;
- }
- [o_extended_window displayIfNeeded];
- [o_extended_window setFrame: o_win_rect display:YES animate: YES];
-
-
- if( o_audFlts_expanded )
- {
- o_box_audFlts_rect.size.height = [o_box_audFlts frame].size.height - 66;
- o_audFlts_expanded = NO;
- }
- else
- {
- /* insert view */
- o_box_audFlts_rect.size.height = [o_box_audFlts frame].size.height + 66;
- [o_audioFlts_view setFrame: NSMakeRect( 20, -20, 370, 76)];
- [o_audioFlts_view setNeedsDisplay:YES];
- [o_audioFlts_view setAutoresizesSubviews: YES];
- [[o_box_audFlts contentView] addSubview: o_audioFlts_view];
- o_audFlts_expanded = YES;
- }
- [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect];
-}
-
-- (IBAction)expandVideoFilters:(id)sender
-{
- /* expand or collapse vidFlts */
- NSRect o_win_rect = [o_extended_window frame];
- NSRect o_box_audFlts_rect = [o_box_audFlts frame];
- NSRect o_box_vidFlts_rect = [o_box_vidFlts frame];
-
- if( o_vidFlts_expanded )
- {
- /* 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 - 172;
- o_win_rect.origin.y = [o_extended_window frame].origin.y + 172;
- o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 172;
-
- /* 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 + 172;
- o_win_rect.origin.y = [o_extended_window frame].origin.y - 172;
- o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 172;
- }
-
- [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect];
- [o_extended_window displayIfNeeded];
- [o_extended_window setFrame: o_win_rect display:YES animate: YES];
-
- if( o_vidFlts_expanded )
- {
- o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height - 172;
- o_vidFlts_expanded = NO;
- }
- else
- {
- /* insert view */
- o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height + 172;
- [o_videoFilters_view setFrame: NSMakeRect( 20, -10, 370, 172)];
- [o_videoFilters_view setNeedsDisplay:YES];
- [o_videoFilters_view setAutoresizesSubviews: YES];
- [[o_box_vidFlts contentView] addSubview: o_videoFilters_view];
- o_vidFlts_expanded = YES;
- }
- [o_box_vidFlts setFrameFromContentFrame: o_box_vidFlts_rect];
-}
-
- (IBAction)videoFilterAction:(id)sender
{
/* en-/disable video filters */
projects / vlc / commitdiff