* some GUI improvements, which need further work once the vout-filter-rework is compl...

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib
index 1292aeb9c8cc70b09f091ec95d957fc5d4093295..641b1b3fb70264e19573ed8372601197dc46ac07 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib
@@ -1,6 +1,131 @@
 {
     IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            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 = {
                 "adjImg_Enbl" = id; 
@@ -42,8 +167,6 @@
                 "o_expBtn_adjustImage" = id; 
                 "o_expBtn_audioFlts" = id; 
                 "o_expBtn_videoFlts" = id; 
-                "o_extWin_adjImg_sepe" = id; 
-                "o_extWin_vidFlts_sepe" = id; 
                 "o_extended_window" = id; 
                 "o_lbl_adjustImage" = id; 
                 "o_lbl_audio" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib
index c07740f475f5ff707de42ac94e95f5de95a2f24a..4a5244a4e427dad07535e5fc8ab28bb0d4894d6f 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib
@@ -3,29 +3,28 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>253 122 356 292 0 0 1440 878 </string>
+       <string>69 85 356 240 0 0 1440 878 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>13</key>
-               <string>525 535 390 138 0 0 1440 878 </string>
+               <string>525 541 390 138 0 0 1440 878 </string>
                <key>32</key>
-               <string>525 476 390 255 0 0 1440 878 </string>
+               <string>525 482 390 255 0 0 1440 878 </string>
                <key>5</key>
-               <string>525 489 390 230 0 0 1440 878 </string>
+               <string>525 495 390 230 0 0 1440 878 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>446.1</string>
-       <key>IBLockedObjects</key>
-       <array>
-               <integer>32</integer>
-       </array>
+       <string>454.0</string>
        <key>IBOpenObjects</key>
        <array>
                <integer>18</integer>
-               <integer>5</integer>
                <integer>32</integer>
+               <integer>13</integer>
+               <integer>5</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8J135</string>
+       <string>9A321</string>
+       <key>targetFramework</key>
+       <string>IBCocoaFramework</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib
index 52f2e99ee91d12e672d9ac2e407e1b003555d8f7..093dc10c4242e1a341581f9d14807ac74e7b11f9 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h
index fc912cce7afbed245e30852e21ce98ffb9dd3266..66ec61b9f995f705e0047885efb60899f7536f8f 100644 (file)
--- a/modules/gui/macosx/extended.h
+++ b/modules/gui/macosx/extended.h
@@ -45,8 +45,6 @@
     IBOutlet id o_lbl_adjustImage;
     IBOutlet id o_lbl_video;
     IBOutlet id o_lbl_audio;
-    IBOutlet id o_extWin_adjImg_sepe;
-    IBOutlet id o_extWin_vidFlts_sepe;
     IBOutlet id o_box_vidFlts;
     IBOutlet id o_box_audFlts;
     IBOutlet id o_box_adjImg;

diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index 4925ab2266729c368c6277d31ad8967f68abe575..9231cbc5ba2583c763dffa10d7cdccf68412e23d 100644 (file)
--- a/modules/gui/macosx/extended.m
+++ b/modules/gui/macosx/extended.m
@@ -81,7 +81,7 @@ static VLCExtended *_o_sharedInstance = nil;
     [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 setTitle: _NS("More Info")];
+    [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")];
     [o_ckb_psycho setTitle: _NS("Psychedelic")];
@@ -614,10 +614,10 @@ static VLCExtended *_o_sharedInstance = nil;
 - (IBAction)vidFlts_mrInfo:(id)sender
 {
     /* show info sheet */
-    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 "
+    NSBeginInformationalAlertSheet(_NS("About the video filters"), _NS("OK"), @"", @"",
+        o_extended_window, nil, nil, nil, nil, _NS("This panel allows "
+        "on-the-fly selection of various video effects.\n"
+        "These 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."));