* modules/gui/skins/src/banks.cpp: Two events had the same shortcut

 * doc/skins/events-howto.txt: Updated the doc accordingly

diff --git a/doc/skins/events-howto.txt b/doc/skins/events-howto.txt
index 8afa55c4408c148417a07d7e4d5f94f5740aa3a7..afe464e7d9780a3ba4d74ada735e5674fea148af 100644 (file)
--- a/doc/skins/events-howto.txt
+++ b/doc/skins/events-howto.txt
@@ -16,7 +16,7 @@ How to create an event ?
 ========================
 
 An event describes a simple action as seen above.
-All attiributes are explained in the 'skins-howto.txt' file except the 'event'
+All attributes are explained in the 'skins-howto.txt' file except the 'event'
 attribute wich is a bit special.
 In the 'event' attribute you will enter a simple script with the following
 syntax :
@@ -54,6 +54,10 @@ EVENT is the action to execute, it can be one of the following:
    Action    : Open an "open file dialog box" to change the current skin.
    Parameters: none.
 
+ - VLC_ON_TOP:
+   Action    : Toggle the "Always on top" status
+   Parameters: none.
+
  - VLC_LOG_SHOW:
    Not supported yet
 
@@ -185,7 +189,7 @@ shortcut.
 
   ID           Shortcut     Description
 
-  tray         CTRL+T       Hide or show in the system tray.
+  tray                      Hide or show in the system tray.
   taskbar      CTRL+B       Hide or show in the taskbar.
   play         X            Play.
   pause        C            Pause.
@@ -200,6 +204,7 @@ shortcut.
   open         CTRL+O       Open a file.
   add_file     CTRL+A       Add a file.
   load_skin    CTRL+S       Change skin.
+  on_top       CTRL+T       Toggle the "Always on top" status
   show_prefs                Show the preferences dialog box.
   show_info                 Show the FileInfo dialog box.
   show_log                  Show the Messages dialog box.

diff --git a/modules/gui/skins/src/banks.cpp b/modules/gui/skins/src/banks.cpp
index caeb4ed4e7f62a836ed9e4ac5ae482691c89a7cc..59815c6b55d6199a3ffbda133e1a6021d8c828a9 100644 (file)
--- a/modules/gui/skins/src/banks.cpp
+++ b/modules/gui/skins/src/banks.cpp
@@ -2,7 +2,7 @@
  * banks.cpp: Bitmap bank, Event bank, Font bank and OffSet bank
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: banks.cpp,v 1.10 2003/10/17 18:17:28 ipkiss Exp $
+ * $Id: banks.cpp,v 1.11 2003/10/17 20:21:59 ipkiss Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -155,7 +155,7 @@ EventBank::EventBank( intf_thread_t *_p_intf )
     Add( "title",            "VLC_STREAM_TITLE",        "none" );
     Add( "help",             "VLC_HELP_TEXT",           "none" );
 
-    Add( "tray",             "VLC_CHANGE_TRAY",         "CTRL+T" );
+    Add( "tray",             "VLC_CHANGE_TRAY",         "none" );
     Add( "taskbar",          "VLC_CHANGE_TASKBAR",      "CTRL+B" );
 
     Add( "playlist_refresh", "CTRL_PLAYLIST",           "none" );