Changeset a8855655eb349eea1910b82c57261946f08934e7

Timestamp:

22/09/03 16:40:12 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1064241612 +0000

git-parent:

[03f4adcdce0be78eab1bb2978aaf8bb0dc3331e0]

git-author:

Clément Stenac <zorglub@videolan.org> 1064241612 +0000

Message:

* modules/gui/wxwindows/preferences.cpp:

• Created the "General Settings" section
  
• Added help strings in the two main sections,
  

in the libvlc categories,
and in the module capabilities

* modules/gui/wxwindows/playlist.cpp & wxwindows.h

-Implemented random, loop and repeat using variables
-The eye candy of the dialog box is not very good

but I have no idea how to improve it.

-Focus on the currently playing item

* src/libvlc.h:

• Added help strings for the libvlc categories
  
• Changed a few "advanced" flag
  

* include/vlc_help.h:

• Help strings for the two main sections
  
• Help string for the module capabilities (both by Anil)
  

* po/*: updated potfiles with the new strings

Files:

• include/vlc_help.h (added)
• modules/gui/wxwindows/playlist.cpp (modified) (10 diffs)
• modules/gui/wxwindows/preferences.cpp (modified) (20 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (2 diffs)
• po/POTFILES.in (modified) (5 diffs)
• po/de.po (modified) (119 diffs)
• po/en_GB.po (modified) (108 diffs)
• po/es.po (modified) (113 diffs)
• po/fr.po (modified) (120 diffs)
• po/it.po (modified) (115 diffs)
• po/ja.po (modified) (113 diffs)
• po/nl.po (modified) (118 diffs)
• po/no.po (modified) (119 diffs)
• po/pl.po (modified) (116 diffs)
• po/pt_BR.po (modified) (118 diffs)
• po/ru.po (modified) (111 diffs)
• po/sv.po (modified) (109 diffs)
• po/vlc.pot (modified) (107 diffs)
• src/libvlc.h (modified) (22 diffs)
• src/playlist/playlist.c (modified) (3 diffs)

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-0 2003/09/21 18:07:51 gbazin
+1 2003/09/22 14:40:10 zorglub
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -60 +60 @@
-    Random_Event,
-    Loop_Event,
+    Repeat_Event,
-    SelectAll_Event,
-
@@ -82 +83 @@
-    EVT_MENU(SelectAll_Event, Playlist::OnSelectAll)
-    EVT_CHECKBOX(Random_Event, Playlist::OnRandom)
+    EVT_CHECKBOX(Repeat_Event, Playlist::OnRepeat)
-    EVT_CHECKBOX(Loop_Event, Playlist::OnLoop)
-
@@ -108 +110 @@
-    /* Initializations */
-    p_intf = _p_intf;
+    vlc_value_t  val;
-    i_update_counter = 0;
-    b_need_update = VLC_FALSE;
-    vlc_mutex_init( p_intf, &lock );
-    SetIcon( *p_intf->p_sys->p_icon );
+
+    var_Create( p_intf, "random", VLC_VAR_BOOL );
+    var_Change( p_intf, "random", VLC_VAR_INHERITVALUE, & val, NULL );
+    var_Create( p_intf, "loop", VLC_VAR_BOOL );
+    var_Create( p_intf, "loop", VLC_VAR_BOOL );
+    var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL );
+    var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL );
-
-    /* Create our "Manage" menu */
@@ -148 +158 @@
-     * playlist window is ridiculously small */
-    listview = new wxListView( playlist_panel, ListView_Event,
-5
+0
-                               wxLC_REPORT | wxSUNKEN_BORDER );
-    listview->InsertColumn( 0, wxU(_("Url")) );
-
-
-
+
+
+
+
+
+
+
-
-    /* Create the Random checkbox */
-    wxCheckBox *random_checkbox = 
-        new wxCheckBox( playlist_panel, Random_Event, wxU(_("Random")) );
-
-
+
+
+
+
-
-    /* Create the Loop Checkbox */
-    wxCheckBox *loop_checkbox = 
-        new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) );
-
+
+
+
-    loop_checkbox->SetValue( b_loop );
+
+    /* Create the Repeat one checkbox */
+    wxCheckBox *repeat_checkbox = 
+    new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat one")) );
+
+    var_Get( p_intf, "repeat", &val );
+    int b_repeat = val.b_bool ; 
+    repeat_checkbox->SetValue( b_repeat );
-
-    /* Create the Search Textbox */
-    search_text =
-    new wxTextCtrl( playlist_panel, SearchText_Event, wxT(""), 
-0
+4
-            wxTE_PROCESS_ENTER);    
-
@@ -179 +205 @@
- 
-    /* Place everything in sizers */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    search_sizer->Layout();
+
+    wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
+    bottom_sizer->Add( search_sizer , 0, wxALL|wxALIGN_CENTER, 5 );
+    bottom_sizer->Add( button_sizer , 0, wxALL|wxALIGN_CENTER, 5 );
+    
+    bottom_sizer->Layout();
-
-    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
@@ -192 +231 @@
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-    panel_sizer->Add( listview, 1, wxEXPAND | wxALL, 5 );
-
+
+
-    panel_sizer->Layout();
-
@@ -255 +295 @@
-        listview->InsertItem( i, filename );
-        /* FIXME: we should try to find the actual duration... */
-
+
+
+
+
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
@@ -264 +307 @@
-    listitem.SetTextColour( *wxRED );
-    listview->SetItem( listitem );
+
+//    listview->Select( p_playlist->i_index, TRUE );
+    listview->Focus( p_playlist->i_index );
-
-    vlc_object_release( p_playlist );
@@ -519 +565 @@
-void Playlist::OnRandom( wxCommandEvent& event )
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-void Playlist::OnLoop ( wxCommandEvent& event )
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

modules/gui/wxwindows/preferences.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-7 2003/09/21 17:52:43 gbazin
+8 2003/09/22 14:40:10 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -33 +33 @@
-#include <vlc/intf.h>
-
+#include <vlc_help.h>
+
-#include "wxwindows.h"
-#include <wx/notebook.h>
@@ -47 +49 @@
-#endif
-
+#define GENERAL_ID 1242
+#define PLUGIN_ID 1243
+#define CAPABILITY_ID 1244
+
-/*****************************************************************************
- * Classes declarations.
@@ -79 +85 @@
-
-    wxTreeItemId root_item;
+    wxTreeItemId general_item;
-    wxTreeItemId plugins_item;
-};
@@ -115 +122 @@
-    PrefsPanel() { }
-    PrefsPanel( wxWindow *parent, intf_thread_t *_p_intf,
-
+, char *
-    virtual ~PrefsPanel() {}
-
@@ -141 +148 @@
-
-    vlc_bool_t b_submodule;
+
+    char *psz_help;
-
-    PrefsPanel *panel;
@@ -212 +221 @@
-PrefsDialog::PrefsDialog( intf_thread_t *_p_intf, wxWindow *p_parent)
-  :  wxFrame( p_parent, -1, wxU(_("Preferences")), wxDefaultPosition,
-65
+70
-{
-    /* Initializations */
@@ -331 +340 @@
-
-/*****************************************************************************
+ * GetCapabilityHelp: Display the help for one capability.
+ *****************************************************************************/
+static char * GetCapabilityHelp( char *psz_capability)
+{
+    if( psz_capability == NULL)
+    return NULL;
+
+    if( !strcasecmp(psz_capability,"access") )
+    return strdup(ACCESS_HELP);
+    if( !strcasecmp(psz_capability,"audio filter") )
+    return strdup(AUDIO_FILTER_HELP);
+    if( !strcasecmp(psz_capability,"audio output") )
+    return strdup(AOUT_HELP);
+    if( !strcasecmp(psz_capability,"chroma") )
+    return strdup(CHROMA_HELP);
+    if( !strcasecmp(psz_capability,"decoder") )
+    return strdup(DECODER_HELP);
+    if( !strcasecmp(psz_capability,"demux") )
+    return strdup(DEMUX_HELP);
+    if( !strcasecmp(psz_capability,"interface") )
+    return strdup(INTERFACE_HELP);
+    if( !strcasecmp(psz_capability,"sout access") )
+    return strdup(SOUT_HELP);
+    if( !strcasecmp(psz_capability,"subtitle demux") )
+    return strdup(SUBTITLE_DEMUX_HELP);
+    if( !strcasecmp(psz_capability,"text renderer") )
+    return strdup(TEXT_HELP);
+    if( !strcasecmp(psz_capability,"video output") )
+    return strdup(VOUT_HELP);
+    if( !strcasecmp(psz_capability,"video filter") )
+    return strdup(VIDEO_FILTER_HELP);
+
+    return strdup(UNKNOWN_HELP);
+}
+
+/*****************************************************************************
- * PrefsTreeCtrl class definition.
- *****************************************************************************/
@@ -362 +407 @@
-     * Build a tree of the main options
-     */
+    ConfigTreeData *config_data = new ConfigTreeData;
+    config_data->psz_section = NULL;
+    config_data->i_object_id = GENERAL_ID;
+    config_data->psz_help = strdup( GENERAL_HELP );
+printf("dans pouet: %i\n",config_data->i_object_id);
+    general_item = AppendItem( root_item, wxU(_("General Settings")),
+                -1, -1, config_data );
+
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
@@ -383 +436 @@
-                ConfigTreeData *config_data = new ConfigTreeData;
-                config_data->psz_section = strdup(p_item->psz_text);
+        if( p_item->psz_longtext )
+        {
+            config_data->psz_help = strdup( p_item->psz_longtext);
+        }
+        else
+        {
+            config_data->psz_help = NULL;
+        }
-                config_data->i_object_id = p_module->i_object_id;
-
-                /* Add the category to the tree */
-root
+general
-                            -1, -1, config_data );
-                break;
@@ -393 +454 @@
-        while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-
-root
+general
-    }
-
@@ -400 +461 @@
-     * Build a tree of all the plugins
-     */
-
+
+
+
+
+
+
-
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
@@ -445 +511 @@
-        {
-            /* We didn't find it, add it */
+            ConfigTreeData *config_data = new ConfigTreeData;
+            config_data->psz_section = NULL;
+            config_data->psz_help = 
+        GetCapabilityHelp( p_module->psz_capability );
+            config_data->i_object_id = CAPABILITY_ID;
-            capability_item = AppendItem( plugins_item,
-
+
+
-        }
-
@@ -455 +527 @@
-            ((module_t *)p_module->p_parent)->i_object_id :
-            p_module->i_object_id;
+    config_data->psz_help = strdup( "" );
-        AppendItem( capability_item, wxU(p_module->psz_object_name), -1, -1,
-                    config_data );
@@ -654 +727 @@
-                new PrefsPanel( p_parent, p_intf, p_prefs_dialog,
-                                config_data->i_object_id,
-
+
+
-            config_data->panel->SwitchAdvanced( b_advanced );
-        }
@@ -692 +766 @@
-PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
-                        PrefsDialog *_p_prefs_dialog,
-
+, char*psz_help
-  :  wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize )
-{
@@ -700 +774 @@
-
-    wxStaticText *label;
+    wxStaticText *help;
-    wxComboBox *combo;
-    wxSpinCtrl *spin;
@@ -707 +782 @@
-    wxArrayString array;
-
+    vlc_bool_t b_has_advanced = VLC_FALSE;
+    module_t *p_module = NULL;
+    
-    /* Initializations */
-    p_intf = _p_intf;
@@ -716 +794 @@
-    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        wxDefaultPosition, wxDefaultSize,
-                                        0, NULL, wxCB_READONLY | wxCB_SORT );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-