Changeset b0e050e497cff4a73abcecd293c080fb01b7deeb

Show
Ignore:
Timestamp:
04/06/04 12:58:41 (4 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1081249121 +0000
git-parent:

[81d2d57eb460d2321882b26484967f447c861e0c]

git-author:
Gildas Bazin <gbazin@videolan.org> 1081249121 +0000
Message:

* modules/gui/wxwindows/*: some code cleanup for the bookmarks dialog.
* AUTHORS: updated my entry.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • AUTHORS

    r6d9eed1 rb0e050e  
    5656 
    5757N: Gildas Bazin 
    58 E: gbazin@netcourrier.com 
     58E: gbazin@videolan.org 
    5959C: gbazin 
     60D: Core improvements, decoders API 
    6061D: Win32 port, win32 VCD/CDDA input and win32 ipv6 code 
    6162D: DirectX audio/video output, win32 WaveOut audio output 
    62 D: DirectShow input plugin, decoders API  
    63 D: a52 (liba52), vorbis (libvorbis) and theora (libtheora) decoders 
     63D: DirectShow input 
     64D: a52, dts, vorbis, speex, flac and theora decoders/packetizers 
    6465D: mpeg1/2 video decoder (libmpeg2), bandlimited resampling 
    6566D: Ogg and Raw DV demultiplexers 

  • modules/gui/wxwindows/bookmarks.cpp

    r8bc6226 rb0e050e  
    4040 
    4141/***************************************************************************** 
     42 * Class declaration. 
     43 *****************************************************************************/ 
     44class BookmarksDialog: public wxFrame 
     45{ 
     46public: 
     47    /* Constructor */ 
     48    BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent ); 
     49    virtual ~BookmarksDialog(); 
     50 
     51    bool Show( bool ); 
     52 
     53private: 
     54 
     55    void Update(); 
     56 
     57    /* Event handlers (these functions should _not_ be virtual) */ 
     58    void OnClose( wxCommandEvent& event ); 
     59    void OnAdd( wxCommandEvent& event ); 
     60    void OnDel( wxCommandEvent& event ); 
     61    void OnClear( wxCommandEvent& event ); 
     62    void OnActivateItem( wxListEvent& event ); 
     63    void OnUpdate( wxCommandEvent &event ); 
     64 
     65    DECLARE_EVENT_TABLE(); 
     66 
     67    intf_thread_t *p_intf; 
     68    wxWindow *p_parent; 
     69 
     70    wxListView *list_ctrl; 
     71}; 
     72 
     73/***************************************************************************** 
    4274 * Event Table. 
    4375 *****************************************************************************/ 
    …… 
    145177 * Private methods. 
    146178 *****************************************************************************/ 
     179wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent ) 
     180{ 
     181    return new BookmarksDialog::BookmarksDialog( p_intf, p_parent ); 
     182} 
    147183 
    148184void BookmarksDialog::Update() 
    …… 
    266302                            vlc_value_t oval, vlc_value_t nval, void *param ) 
    267303{ 
    268     BookmarksDialog *p_dialog = (BookmarksDialog *)param; 
     304    BookmarksDialog::BookmarksDialog *p_dialog = 
     305        (BookmarksDialog::BookmarksDialog *)param; 
    269306 
    270307    wxCommandEvent bookmarks_event( wxEVT_BOOKMARKS, 0 ); 

  • modules/gui/wxwindows/dialogs.cpp

    rb09db11 rb0e050e  
    55 * $Id$ 
    66 * 
    7  * Authors: Gildas Bazin <gbazin@netcourrier.com> 
     7 * Authors: Gildas Bazin <gbazin@videolan.org> 
    88 * 
    99 * This program is free software; you can redistribute it and/or modify 
    …… 
    208208    /* Show/hide the open dialog */ 
    209209    if( !p_bookmarks_dialog ) 
    210         p_bookmarks_dialog = new BookmarksDialog( p_intf, this ); 
     210        p_bookmarks_dialog = BookmarksDialog( p_intf, this ); 
    211211 
    212212    if( p_bookmarks_dialog ) 

  • modules/gui/wxwindows/interface.cpp

    r62d82a4 rb0e050e  
    55 * $Id$ 
    66 * 
    7  * Authors: Gildas Bazin <gbazin@netcourrier.com> 
     7 * Authors: Gildas Bazin <gbazin@videolan.org> 
    88 * 
    99 * This program is free software; you can redistribute it and/or modify 
    …… 
    793793                             wxU(_("&Extended GUI") ), wxU(_(HELP_EXTENDED)) ); 
    794794            p_settings_menu->AppendCheckItem( Bookmarks_Event, 
    795                              wxU(_("&Bookmarks") ), wxU(_(HELP_BOOKMARKS)) ); 
     795                             wxU(_("&Bookmarks...") ), wxU(_(HELP_BOOKMARKS)) ); 
    796796            p_settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")), 
    797797                                     wxU(_(HELP_PREFS)) ); 

  • modules/gui/wxwindows/wxwindows.h

    r59b0ce4 rb0e050e  
    55 * $Id$ 
    66 * 
    7  * Authors: Gildas Bazin <gbazin@netcourrier.com> 
     7 * Authors: Gildas Bazin <gbazin@videolan.org> 
    88 * 
    99 * This program is free software; you can redistribute it and/or modify 
    …… 
    138138wxArrayString SeparateEntries( wxString ); 
    139139wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent ); 
     140wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent ); 
    140141 
    141142namespace wxvlc 
    …… 
    150151class FileInfo; 
    151152class StreamDialog; 
    152 class BookmarksDialog; 
    153153class ItemInfoDialog; 
    154154class NewGroup; 
    …… 
    319319    StreamDialog        *p_streamwizard_dialog; 
    320320    wxFrame             *p_prefs_dialog; 
    321     BookmarksDialog     *p_bookmarks_dialog; 
     321    wxWindow            *p_bookmarks_dialog; 
    322322    wxFileDialog        *p_file_generic_dialog; 
    323323}; 
    …… 
    10001000 
    10011001    int  i_item_id; 
    1002 }; 
    1003  
    1004 class BookmarksDialog: public wxFrame 
    1005 { 
    1006 public: 
    1007     /* Constructor */ 
    1008     BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent ); 
    1009     virtual ~BookmarksDialog(); 
    1010  
    1011     bool Show( bool ); 
    1012  
    1013 private: 
    1014  
    1015     void Update(); 
    1016  
    1017     /* Event handlers (these functions should _not_ be virtual) */ 
    1018     void OnClose( wxCommandEvent& event ); 
    1019     void OnAdd( wxCommandEvent& event ); 
    1020     void OnDel( wxCommandEvent& event ); 
    1021     void OnClear( wxCommandEvent& event ); 
    1022     void OnActivateItem( wxListEvent& event ); 
    1023     void OnUpdate( wxCommandEvent &event ); 
    1024  
    1025     DECLARE_EVENT_TABLE(); 
    1026  
    1027     intf_thread_t *p_intf; 
    1028     wxWindow *p_parent; 
    1029  
    1030     wxListView *list_ctrl; 
    10311002}; 
    10321003