Changeset 1405cf748a267b5e7ad21b606172a27d688eda56

Timestamp:

15/06/08 23:31:19 (6 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1213565479 +0200

git-parent:

[8723270708232c719a2629ea58ac35b1e69aaf50]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1213550823 +0200

Message:

Redesigned the window to make it look more Mac-like and much smaller by adding a popupbutton at the top to choose the filters and by removing all the expanding stuff

This way adding more uis to different filters is much easier and faster to do.

Files:

• extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/extended.h (modified) (4 diffs)
• modules/gui/macosx/extended.m (modified) (4 diffs)
• modules/gui/macosx/intf.m (modified) (2 diffs)

extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib

@@ -1 +1 @@
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
- 
- 
+
+
-}

extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-    <key>IBDocumentLocation</key>
-69 85 356 240 0 0 1440 8
+59 108 356 240 0 0 1280 7
-    <key>IBEditorPositions</key>
-    <dict>
-        <key>13</key>
-153 575 390 138 0 0 1440 8
+444 613 390 120 0 0 1280 7
-        <key>32</key>
-525 476 390 255 0 0 1440 8
+445 426 390 237 0 0 1280 7
-        <key>5</key>
-18 235 390 230 0 0 1440 8
+7 437 390 214 0 0 1280 7
-    </dict>
-    <key>IBFramework Version</key>
-46.1
+89.0
-    <key>IBOpenObjects</key>
-    <array>
-        <integer>13</integer>
-        <integer>5</integer>
-        <integer>18</integer>
-        <integer>32</integer>
+        <integer>13</integer>
-    </array>
-    <key>IBSystem Version</key>
-8P135
+9D34
-    <key>targetFramework</key>
-    <string>IBCocoaFramework</string>

modules/gui/macosx/extended.h

@@ -39 +39 @@
-
-    /* window content */
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    /* video filters */
@@ -89 +80 @@
-
-    /* global variables */
-
-
-
-
+
-    BOOL o_config_changed;
-}
-
+- (IBAction)viewSelectorAction:(id)sender;
-- (IBAction)enableAdjustImage:(id)sender;
-- (IBAction)restoreDefaultsForAdjustImage:(id)sender;
@@ -103 +92 @@
-- (IBAction)sliderActionMaximumAudioLevel:(id)sender;
-- (IBAction)enableVolumeNormalization:(id)sender;
-- (IBAction)expandAdjustImage:(id)sender;
-- (IBAction)expandAudioFilters:(id)sender;
-- (IBAction)expandVideoFilters:(id)sender;
-- (IBAction)videoFilterAction:(id)sender;
-- (IBAction)moreInfoVideoFilters:(id)sender;
@@ -111 +97 @@
-+ (VLCExtended *)sharedInstance;
-- (BOOL)getConfigChanged;
-- (void)collapsAll;
-
-- (void)showPanel;

modules/gui/macosx/extended.m

@@ -66 +66 @@
-    /* 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")];
@@ -171 +166 @@
-        free( psz_afilters );
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -231 +225 @@
-    [o_extended_window displayIfNeeded];
-    [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];
-}
-
@@ -432 +473 @@
-    else
-        [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];
-}
-

modules/gui/macosx/intf.m

@@ -1818 +1818 @@
-    if( nib_extended_loaded )
-    {
-        [o_extended collapsAll];
-        [o_extended release];
-    }
@@ -1945 +1944 @@
-{
-    if( o_extended == nil )
-    {
-        o_extended = [[VLCExtended alloc] init];
-
+
-    if( !nib_extended_loaded )
-    {
-        nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
-
-
-
-
-
+
+
-}
-