Skip to content

V
vlc
Commit 5e8666c8 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: removed the outdated and dysfunctional service discovery menu items... 

macosx: removed the outdated and dysfunctional service discovery menu items from both the playlist and the main menu
parent c6ba3a10
Hide whitespace changes
Inline Side-by-side
Showing with 19012 additions and 18850 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 5e8666c8
This source diff could not be displayed because it is too large. You can view the blob instead.
modules/gui/macosx/playlist.h
View file @ 5e8666c8
......@@ -99,14 +99,6 @@
IBOutlet id o_mi_sort_author;
IBOutlet id o_mi_recursive_expand;
/* "services discovery" menu in the playlist menu */
IBOutlet id o_mi_services;
IBOutlet id o_mu_services;
/* "services discovery" menu in the main menu */
IBOutlet id o_mm_mi_services;
IBOutlet id o_mm_mu_services;
IBOutlet id o_save_accessory_view;
IBOutlet id o_save_accessory_popup;
IBOutlet id o_save_accessory_text;
......@@ -135,7 +127,6 @@
- (BOOL)isSelectionEmpty;
- (IBAction)servicesChange:(id)sender;
- (IBAction)playItem:(id)sender;
- (IBAction)revealItemInFinder:(id)sender;
- (IBAction)preparseItem:(id)sender;
......
modules/gui/macosx/playlist.m
View file @ 5e8666c8
......@@ -27,8 +27,6 @@
/* TODO
* add 'icons' for different types of nodes? (http://www.cocoadev.com/index.pl?IconAndTextInTableCell)
* reimplement enable/disable item
* create a new 'tool' button (see the gear button in the Finder window) for 'actions'
(adding service discovery, other views, new node/playlist, save node/playlist) stuff like that
*/
......@@ -51,7 +49,6 @@
#import "open.h"
#include <vlc_keys.h>
#import <vlc_services_discovery.h>
#import <vlc_osd.h>
#import <vlc_interface.h>
......@@ -464,45 +461,6 @@
o_descendingSortingImage = [[NSOutlineView class] _defaultTableHeaderReverseSortImage];
o_tc_sortColumn = nil;
#if 0
char ** ppsz_name;
char ** ppsz_services = vlc_sd_GetNames( VLCIntf, &ppsz_name, NULL );
if( !ppsz_services )
return;
for( i = 0; ppsz_services[i]; i++ )
{
bool b_enabled;
NSMenuItem *o_lmi;
char * name = ppsz_name[i] ? ppsz_name[i] : ppsz_services[i];
/* Check whether to enable these menuitems */
b_enabled = playlist_IsServicesDiscoveryLoaded( p_playlist, ppsz_services[i] );
/* Create the menu entries used in the playlist menu */
o_lmi = [[o_mi_services submenu] addItemWithTitle:
[NSString stringWithUTF8String: name]
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
[o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
/* Create the menu entries for the main menu */
o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
[NSString stringWithUTF8String: name]
action: @selector(servicesChange:)
keyEquivalent: @""];
[o_lmi setTarget: self];
[o_lmi setRepresentedObject: [NSString stringWithUTF8String: ppsz_services[i]]];
if( b_enabled ) [o_lmi setState: NSOnState];
free( ppsz_services[i] );
free( ppsz_name[i] );
}
free( ppsz_services );
free( ppsz_name );
#endif
}
- (void)searchfieldChanged:(NSNotification *)o_notification
......@@ -527,8 +485,6 @@
[[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO];
[o_mi_sort_name setTitle: _NS("Sort Node by Name")];
[o_mi_sort_author setTitle: _NS("Sort Node by Author")];
[o_mi_services setTitle: _NS("Services discovery")];
[o_mm_mi_services setTitle: _NS("Services discovery")];
[o_search_field setToolTip: _NS("Search in Playlist")];
[o_search_field_other setToolTip: _NS("Search in Playlist")];
......@@ -933,23 +889,6 @@
[self playlistUpdated];
}
- (IBAction)servicesChange:(id)sender
{
NSMenuItem *o_mi = (NSMenuItem *)sender;
NSString *o_string = [o_mi representedObject];
playlist_t * p_playlist = pl_Get( VLCIntf );
if( !playlist_IsServicesDiscoveryLoaded( p_playlist, [o_string UTF8String] ) )
playlist_ServicesDiscoveryAdd( p_playlist, [o_string UTF8String] );
else
playlist_ServicesDiscoveryRemove( p_playlist, [o_string UTF8String] );
[o_mi setState: playlist_IsServicesDiscoveryLoaded( p_playlist,
[o_string UTF8String] ) ? YES : NO];
[self playlistUpdated];
return;
}
- (IBAction)selectAll:(id)sender
{
[o_outline_view selectAll: nil];
......
po/fr.po
View file @ 5e8666c8
......@@ -30,7 +30,8 @@ msgid ""
"see the file named COPYING for details.\n"
"Written by the VideoLAN team; see the AUTHORS file.\n"
msgstr ""
"Ce programme est fourni SANS AUCUNE GARANTIE, tel qu'il est permis par la loi.\n"
"Ce programme est fourni SANS AUCUNE GARANTIE, tel qu'il est permis par la "
"loi.\n"
"Vous pouvez le redistribuer selon les termes de la Licence Publique Générale "
"GNU ;\n"
"voir le fichier COPYING pour plus de détails.\n"
......@@ -797,14 +798,14 @@ msgstr ""
"raccourcis clavier principaux, lisez la page sur les <a href=\"http://wiki."
"videolan.org/Hotkeys\">raccourcis</a>.</p><h3>Aide</h3><p>Avant de poser une "
"question, référez vous d'abord à la <a href=\"http://wiki.videolan.org/"
"Frequently_Asked_Questions\">FAQ</a>.</p><p>Vous pouvez ensuite demander "
"(et apporter) de l'aide sur les <a href=\"http://forum.videolan.org"
"\">Forums</a>, les <a href=\"http://www.videolan.org/vlc/lists.html\">listes "
"de diffusion</a> ou notre cannal irc ( <a href=\"http://www.videolan.org/"
"webirc/\"><em>#videolan</em></a> sur irc.freenode.net ).</p><h3>Contribuer "
"au projet</h3><p>Vous pouvez aider le projet VideoLAN en donnant de votre "
"temps pour aider la communauté, pour concevoir des interfaces, pour traduire "
"la documentation, pour tester et pour coder. Vous pouvez aussi donner de "
"Frequently_Asked_Questions\">FAQ</a>.</p><p>Vous pouvez ensuite demander (et "
"apporter) de l'aide sur les <a href=\"http://forum.videolan.org\">Forums</"
"a>, les <a href=\"http://www.videolan.org/vlc/lists.html\">listes de "
"diffusion</a> ou notre cannal irc ( <a href=\"http://www.videolan.org/webirc/"
"\"><em>#videolan</em></a> sur irc.freenode.net ).</p><h3>Contribuer au "
"projet</h3><p>Vous pouvez aider le projet VideoLAN en donnant de votre temps "
"pour aider la communauté, pour concevoir des interfaces, pour traduire la "
"documentation, pour tester et pour coder. Vous pouvez aussi donner de "
"l'argent ou du matériel pour nous aider. Et bien sûr, vous pouvez "
"<b>promouvoir</b> le lecteur multimédia VLC.</p></body></html>"
......@@ -1650,7 +1651,8 @@ msgid ""
"The step size of the volume is adjustable using this option, in a range from "
"0 to 1024."
msgstr ""
"Cette option permet de modifier le pas de réglage du volume audio, de 0 à 1024"
"Cette option permet de modifier le pas de réglage du volume audio, de 0 à "
"1024"
#: src/libvlc-module.c:280
msgid "Audio output frequency (Hz)"
......@@ -2675,8 +2677,8 @@ msgstr "Liste de résolutions vidéos préférées"
msgid ""
"When several video formats are available, select one whose resolution is "
"closest to (but not higher than) this setting, in number of lines. Use this "
"option if you don't have enough CPU power or network bandwidth to play higher "
"resolutions."
"option if you don't have enough CPU power or network bandwidth to play "
"higher resolutions."
msgstr ""
"Quand plusieurs formats de vidéo sont disponibles, choisir celui dont la "
"résolution est la plus proche (mais pas supérieure) de ce paramètre en "
......@@ -18427,10 +18429,6 @@ msgstr " g Aller à l'élément courant"
msgid " / Look for an item"
msgstr " / Rechercher"
#: modules/gui/ncurses.c:910
msgid " ; Look for the next item"
msgstr " ; Rechercher le prochain"
#: modules/gui/ncurses.c:911
msgid " A Add an entry"
msgstr " A Ajouter"
......@@ -18517,11 +18515,6 @@ msgstr " Source: <pas d'élément>"
msgid " [ h for help ]"
msgstr " [ h pour l'aide ]"
#: modules/gui/ncurses.c:1136
#, c-format
msgid "Open: %s"
msgstr "Ouvrir: %s"
#: modules/gui/qt4/components/controller.cpp:339
msgid "Shift+L"
msgstr "Shift+L"
......@@ -28268,6 +28261,12 @@ msgstr "Rafraîchir les flux"
msgid "Enqueue"
msgstr "Mettre à la file"
#~ msgid " ; Look for the next item"
#~ msgstr " ; Rechercher le prochain"
#~ msgid "Open: %s"
#~ msgstr "Ouvrir: %s"
#~ msgid ""
#~ "The specified sound font file (%s) is incorrect.\n"
#~ "Please install a valid sound font and reconfigure it from the VLC "
......
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