X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fmacosx.m;h=88bad558c5325f161ab7c0c7863bce66ae8a5542;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=19b2b9debe87e7c13865fa5dbe9313b8a87e35ff;hpb=17605dded6b1b46e0dd4b0bfa1010746027ffb6f;p=vlc

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 19b2b9debe..88bad558c5 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx.m: Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -13,7 +13,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -47,50 +47,57 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define EMBEDDED_TEXT N_("Use embedded video output")
-#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \
-    "be opened in a separate window instead of in the control window.")
+#define EMBEDDED_TEXT N_("Embedded video output")
+#define EMBEDDED_LONGTEXT N_( \
+   "Display the video in the controller window instead of a in separate window.")
 
 #define VDEV_TEXT N_("Video device")
-#define VDEV_LONGTEXT N_("Choose a number corresponding to " \
-    "a screen in you video device selection menu and this screen " \
-    "will be used by default as the screen for 'fullscreen'.")
+#define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
+    "videos in 'fullscreen'. The screen number correspondance can be found in "\
+    "the video device selection menu.")
 
 #define OPAQUENESS_TEXT N_("Opaqueness")
 #define OPAQUENESS_LONGTEXT N_( \
     "Set the transparency of the video output. 1 is non-transparent (default) " \
     "0 is fully transparent.")
-    
+ 
 #define STRETCH_TEXT N_("Stretch video to fill window")
-#define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \
-        "of the movie when resizing the video, stretch the video " \
-        "to fill the entire window." )
-
-#define FILL_TEXT N_("Fill fullscreen")
-#define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \
-        "necessary in order to fill the screen without black " \
-        "borders (OpenGL only)." )
+#define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
+        "resizing the video instead of keeping the aspect ratio and "\
+        "displaying black borders.")
 
 #define BLACK_TEXT N_("Black screens in fullscreen")
-#define BLACK_LONGTEXT N_("In fullscreen mode, black non-video screens." )
+#define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
+        "video displayed black" )
 
 #define BACKGROUND_TEXT N_("Use as Desktop Background")
 #define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
-        "of the Finder. Desktop icons cannot be interacted with in this mode." )
-        
-#define WIZARD_OPTIONS_SAVING_TEXT N_("Keep wizard selections")
-#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Keeps the selections in the " \
-        "wizard for one session of VLC, so you do not need to choose them " \
-        "over and over again for similar purposes.") 
+        "Desktop icons cannot be interacted with in this mode." )
+
+#define FSPANEL_TEXT N_("Show Fullscreen controller")
+#define FSPANEL_LONGTEXT N_("Shows a lucent controller when moving the mouse " \
+                            "in fullscreen mode.")
+
+#define WIZARD_OPTIONS_SAVING_TEXT N_("Remember wizard options")
+#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Remember the options in the " \
+        "wizard during one session of VLC.")
+
+#define AUTOPLAY_OSX_TEST N_("Auto-playback of new items")
+#define AUTOPLAY_OSX_LONGTEXT N_("Start playback of new items immediately " \
+        "once they were added." )
 
 vlc_module_begin();
     set_description( _("Mac OS X interface") );
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
                      VLC_FALSE );
+    add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
+                     VLC_FALSE );
+    add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
+                     VLC_FALSE );
     add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT,
                 WIZARD_OPTIONS_SAVING_LONGTEXT, VLC_TRUE );
 
@@ -107,10 +114,8 @@ vlc_module_begin();
                      VLC_FALSE );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
                 OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
-        add_bool( "macosx-black", 0, NULL, BLACK_TEXT, BLACK_LONGTEXT,
-                  VLC_TRUE );
-        add_bool( "macosx-fill", 0, NULL, FILL_TEXT, FILL_LONGTEXT,
-                  VLC_TRUE );
+        add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT,
+                  VLC_FALSE );
         add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
                      VLC_FALSE );
     add_submodule();