macosx: added another button to download VLC's EyeTV plugin

plus some minor layout changes to make sure that all localised string fit in our UI

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
index e221b68670a6ce6b99f2218f785e95c0178a1c45..e0a7b6e66b2d6ff47de5154eee09b865b56a46f4 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
@@ -265,6 +265,7 @@
         },
                 {
             ACTIONS =             {
+                eyetvGetPlugin = id;
                 eyetvLaunch = id;
                 eyetvSwitchChannel = id;
                 openCaptureModeChanged = id;
@@ -316,6 +317,7 @@
                 "o_eyetv_chn_bgbar" = id;
                 "o_eyetv_chn_status_txt" = id;
                 "o_eyetv_currentChannel_lbl" = id;
+                "o_eyetv_getPlugin_btn" = id;
                 "o_eyetv_launchEyeTV_btn" = id;
                 "o_eyetv_nextProgram_btn" = id;
                 "o_eyetv_noInstanceLong_lbl" = id;

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
index c1735bcde48786db90b50cd17e0f6457846f1f67..64d3f5f24be20eb80e274f332892a2fb788417c0 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
@@ -7,13 +7,13 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>2297</key>
-               <string>366 462 548 183 0 0 1280 778 </string>
+               <string>366 460 548 183 0 0 1280 778 </string>
                <key>2301</key>
-               <string>366 462 548 183 0 0 1280 778 </string>
+               <string>366 460 548 183 0 0 1280 778 </string>
                <key>2304</key>
-               <string>366 462 547 183 0 0 1280 778 </string>
+               <string>366 460 547 183 0 0 1280 778 </string>
                <key>2346</key>
-               <string>15 513 548 183 0 0 1280 778 </string>
+               <string>366 460 548 183 0 0 1280 778 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>489.0</string>
@@ -26,10 +26,12 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
+               <integer>2304</integer>
+               <integer>2297</integer>
                <integer>636</integer>
-               <integer>2346</integer>
+               <integer>2301</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9D34</string>
+       <string>9E17</string>
 </dict>
 </plist>

diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
index abb86076583fcf9b3b343f4c783e5d1478c84e9c..544424afc96dd348f88a7a60284a5af7a1e9b41d 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index 92ff6146d5f6ee3e78a25d934484c46fce2ca94b..53b7440cd6668755ab4d5ef89c6c47cd46b9cf31 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -115,6 +115,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_eyetv_chn_status_txt;
     IBOutlet id o_eyetv_chn_bgbar;
     IBOutlet id o_eyetv_launchEyeTV_btn;
+    IBOutlet id o_eyetv_getPlugin_btn;
     IBOutlet id o_eyetv_nextProgram_btn;
     IBOutlet id o_eyetv_noInstance_lbl;
     IBOutlet id o_eyetv_noInstanceLong_lbl;
@@ -162,6 +163,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)openCaptureModeChanged:(id)sender;
 - (IBAction)eyetvSwitchChannel:(id)sender;
 - (IBAction)eyetvLaunch:(id)sender;
+- (IBAction)eyetvGetPlugin:(id)sender;
 - (void)eyetvChanged:(NSNotification *)o_notification;
 - (void)setupChannelInfo;
 - (IBAction)screenStepperChanged:(id)sender;

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 36fac3802ee4bb78b325bd078ee46e64499d64e2..557df8ea56968287e7bab66221ac52131cc4f933 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -216,6 +216,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_eyetv_noInstance_lbl setStringValue: _NS("EyeTV is not launched")];
     [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")];
     [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")];
+    [o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")];
 
     [self setSubPanel];
 
@@ -921,6 +922,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
 }
 
+- (IBAction)eyetvGetPlugin:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/eyetv"]];
+}
+
 - (void)eyetvChanged:(NSNotification *)o_notification
 {
     if( [[o_notification name] isEqualToString: @"DeviceAdded"] )