Commit 106471ae authored by Felix Paul Kühne's avatar 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
parent c53bb185
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
}, },
{ {
ACTIONS = { ACTIONS = {
eyetvGetPlugin = id;
eyetvLaunch = id; eyetvLaunch = id;
eyetvSwitchChannel = id; eyetvSwitchChannel = id;
openCaptureModeChanged = id; openCaptureModeChanged = id;
...@@ -316,6 +317,7 @@ ...@@ -316,6 +317,7 @@
"o_eyetv_chn_bgbar" = id; "o_eyetv_chn_bgbar" = id;
"o_eyetv_chn_status_txt" = id; "o_eyetv_chn_status_txt" = id;
"o_eyetv_currentChannel_lbl" = id; "o_eyetv_currentChannel_lbl" = id;
"o_eyetv_getPlugin_btn" = id;
"o_eyetv_launchEyeTV_btn" = id; "o_eyetv_launchEyeTV_btn" = id;
"o_eyetv_nextProgram_btn" = id; "o_eyetv_nextProgram_btn" = id;
"o_eyetv_noInstanceLong_lbl" = id; "o_eyetv_noInstanceLong_lbl" = id;
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>2297</key> <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> <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> <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> <key>2346</key>
<string>15 513 548 183 0 0 1280 778 </string> <string>366 460 548 183 0 0 1280 778 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>489.0</string> <string>489.0</string>
...@@ -26,10 +26,12 @@ ...@@ -26,10 +26,12 @@
</array> </array>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>2304</integer>
<integer>2297</integer>
<integer>636</integer> <integer>636</integer>
<integer>2346</integer> <integer>2301</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9D34</string> <string>9E17</string>
</dict> </dict>
</plist> </plist>
...@@ -115,6 +115,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -115,6 +115,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_eyetv_chn_status_txt; IBOutlet id o_eyetv_chn_status_txt;
IBOutlet id o_eyetv_chn_bgbar; IBOutlet id o_eyetv_chn_bgbar;
IBOutlet id o_eyetv_launchEyeTV_btn; IBOutlet id o_eyetv_launchEyeTV_btn;
IBOutlet id o_eyetv_getPlugin_btn;
IBOutlet id o_eyetv_nextProgram_btn; IBOutlet id o_eyetv_nextProgram_btn;
IBOutlet id o_eyetv_noInstance_lbl; IBOutlet id o_eyetv_noInstance_lbl;
IBOutlet id o_eyetv_noInstanceLong_lbl; IBOutlet id o_eyetv_noInstanceLong_lbl;
...@@ -162,6 +163,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -162,6 +163,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)openCaptureModeChanged:(id)sender; - (IBAction)openCaptureModeChanged:(id)sender;
- (IBAction)eyetvSwitchChannel:(id)sender; - (IBAction)eyetvSwitchChannel:(id)sender;
- (IBAction)eyetvLaunch:(id)sender; - (IBAction)eyetvLaunch:(id)sender;
- (IBAction)eyetvGetPlugin:(id)sender;
- (void)eyetvChanged:(NSNotification *)o_notification; - (void)eyetvChanged:(NSNotification *)o_notification;
- (void)setupChannelInfo; - (void)setupChannelInfo;
- (IBAction)screenStepperChanged:(id)sender; - (IBAction)screenStepperChanged:(id)sender;
......
...@@ -216,6 +216,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -216,6 +216,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_eyetv_noInstance_lbl setStringValue: _NS("EyeTV is not launched")]; [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_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_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")];
[o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")];
[self setSubPanel]; [self setSubPanel];
...@@ -921,6 +922,11 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -921,6 +922,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
[[[VLCMain sharedInstance] getEyeTVController] launchEyeTV]; [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
} }
- (IBAction)eyetvGetPlugin:(id)sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: @"http://www.videolan.org/eyetv"]];
}
- (void)eyetvChanged:(NSNotification *)o_notification - (void)eyetvChanged:(NSNotification *)o_notification
{ {
if( [[o_notification name] isEqualToString: @"DeviceAdded"] ) if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment