[vlc-devel] commit: macosx: added another button to download VLC's EyeTV plugin ( Felix Paul Kühne )
git version control
git at videolan.org
Thu Aug 14 16:59:18 CEST 2008
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 14 17:01:58 2008 +0200| [106471ae6a2b943065e550b4242fe4a17e35ac56] | committer: Felix Paul Kühne
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
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=106471ae6a2b943065e550b4242fe4a17e35ac56
---
.../Resources/English.lproj/Open.nib/classes.nib | 2 ++
.../Resources/English.lproj/Open.nib/info.nib | 14 ++++++++------
.../English.lproj/Open.nib/keyedobjects.nib | Bin 64810 -> 65259 bytes
modules/gui/macosx/open.h | 2 ++
modules/gui/macosx/open.m | 6 ++++++
5 files changed, 18 insertions(+), 6 deletions(-)
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 e221b68..e0a7b6e 100644
--- 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 c1735bc..64d3f5f 100644
--- 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 abb8607..544424a 100644
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 92ff614..53b7440 100644
--- 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 36fac38..557df8e 100644
--- 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"] )
More information about the vlc-devel
mailing list