Changeset 474a83cf3d35e1d7464fffa6042553bd66aae20b

Show
Ignore:
Timestamp:
04/21/03 02:54:26 (5 years ago)
Author:
Olivier Teulière <ipkiss@videolan.org>
git-committer:
Olivier Teulière <ipkiss@videolan.org> 1050886466 +0000
git-parent:

[e81da7d5571520c0162dd0a9d16bf3ae484d2284]

git-author:
Olivier Teulière <ipkiss@videolan.org> 1050886466 +0000
Message:
  • added preferences, file info and stream output dialogs to the skins
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/skins/Modules.am

    r51bf102 r474a83c  
    9999    modules/gui/skins/gtk2/gtk2_window.h \ 
    100100    \ 
     101    modules/gui/wxwindows/fileinfo.cpp \ 
    101102    modules/gui/wxwindows/messages.cpp \ 
    102103    modules/gui/wxwindows/open.cpp \ 
     104    modules/gui/wxwindows/preferences.cpp \ 
     105    modules/gui/wxwindows/streamout.cpp \ 
    103106    $(NULL) 
    104107 

  • modules/gui/skins/gtk2/gtk2_run.cpp

    r539e8b7 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: gtk2_run.cpp,v 1.14 2003/04/20 23:09:31 asmax Exp $ 
     5 * $Id: gtk2_run.cpp,v 1.15 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Cyril Deguet     <asmax@videolan.org> 
    …… 
    231231    p_intf->p_sys->OpenDlg = new OpenDialog( p_intf, NULL, FILE_ACCESS ); 
    232232    p_intf->p_sys->MessagesDlg = new Messages( p_intf, NULL ); 
     233    p_intf->p_sys->SoutDlg = new SoutDialog( p_intf, NULL ); 
     234    p_intf->p_sys->PrefsDlg = new PrefsDialog( p_intf, NULL ); 
     235    p_intf->p_sys->InfoDlg = new FileInfo( p_intf, NULL ); 
    233236    return TRUE; 
    234237} 

  • modules/gui/skins/src/banks.cpp

    racc28ba r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: banks.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $ 
     5 * $Id: banks.cpp,v 1.4 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    170170    Add( "volume_refresh",   "VLC_VOLUME_CHANGE(SET)",  "none" ); 
    171171 
    172     // Log events 
     172    // Dialogs events 
    173173    Add( "show_log",         "VLC_LOG_SHOW(TRUE)",      "none" ); 
    174174    Add( "hide_log",         "VLC_LOG_SHOW(FALSE)",     "none" ); 
    175175    Add( "clear_log",        "VLC_LOG_CLEAR",           "none" ); 
     176    Add( "show_prefs",       "VLC_PREFS_SHOW",          "none" ); 
     177    Add( "show_info",        "VLC_INFO_SHOW",           "none" ); 
    176178 
    177179    Add( "quit",             "VLC_HIDE(VLC_QUIT)",      "CTRL+C" ); 

  • modules/gui/skins/src/event.cpp

    racc28ba r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: event.cpp,v 1.11 2003/04/16 21:40:07 ipkiss Exp $ 
     5 * $Id: event.cpp,v 1.12 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    160160        return VLC_VOLUME_SET; 
    161161 
    162     // Logs 
     162    // Dialogs 
    163163    else if( Desc == "VLC_LOG_SHOW" ) 
    164164        return VLC_LOG_SHOW; 
    165165    else if( Desc == "VLC_LOG_CLEAR" ) 
    166166        return VLC_LOG_CLEAR; 
     167    else if( Desc == "VLC_PREFS_SHOW" ) 
     168        return VLC_PREFS_SHOW; 
     169    else if( Desc == "VLC_INFO_SHOW" ) 
     170        return VLC_INFO_SHOW; 
    167171 
    168172    // Playlist events 

  • modules/gui/skins/src/event.h

    rbfdcf83 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: event.h,v 1.6 2003/04/14 10:00:38 karibu Exp $ 
     5 * $Id: event.h,v 1.7 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    6363#define VLC_LOG_SHOW        (VLC_MESSAGE + 20) 
    6464#define VLC_LOG_CLEAR       (VLC_MESSAGE + 22) 
     65#define VLC_PREFS_SHOW      (VLC_MESSAGE + 23) 
     66#define VLC_INFO_SHOW       (VLC_MESSAGE + 24) 
    6567 
    6668#define VLC_INTF_REFRESH    (VLC_MESSAGE + 30) 

  • modules/gui/skins/src/skin_common.h

    r51bf102 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: skin_common.h,v 1.2 2003/04/20 20:28:39 ipkiss Exp $ 
     5 * $Id: skin_common.h,v 1.3 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    3636class OpenDialog; 
    3737class Messages; 
     38class SoutDialog; 
     39class PrefsDialog; 
     40class FileInfo; 
    3841 
    3942//--------------------------------------------------------------------------- 
    …… 
    6669 
    6770    // Dialogs 
    68     OpenDialog *OpenDlg; 
    69     Messages   *MessagesDlg; 
     71    OpenDialog  *OpenDlg; 
     72    Messages    *MessagesDlg; 
     73    SoutDialog  *SoutDlg; 
     74    PrefsDialog *PrefsDlg; 
     75    FileInfo    *InfoDlg; 
    7076}; 
    7177 
    …… 
    7379 
    7480 
    75  
    76  

  • modules/gui/skins/src/skin_main.cpp

    r51bf102 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: skin_main.cpp,v 1.12 2003/04/20 20:28:39 ipkiss Exp $ 
     5 * $Id: skin_main.cpp,v 1.13 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    283283    p_intf->p_sys->MessagesDlg->UpdateLog(); 
    284284 
     285    // Update the file info window 
     286    p_intf->p_sys->InfoDlg->UpdateFileInfo(); 
     287 
    285288    //------------------------------------------------------------------------- 
    286289    if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die ) 

  • modules/gui/skins/src/vlcproc.cpp

    r2735cac r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: vlcproc.cpp,v 1.11 2003/04/21 00:18:37 asmax Exp $ 
     5 * $Id: vlcproc.cpp,v 1.12 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    132132 
    133133        case VLC_LOG_SHOW: 
    134 //            p_intf->p_sys->p_theme->ShowLog( evt->GetParam2() ); 
    135134            p_intf->p_sys->MessagesDlg->Show( 
    136135                !p_intf->p_sys->MessagesDlg->IsShown() ); 
    …… 
    138137 
    139138        case VLC_LOG_CLEAR: 
    140 //            p_intf->p_sys->p_theme->ClearLog(); 
     139            return true; 
     140 
     141        case VLC_PREFS_SHOW: 
     142            p_intf->p_sys->PrefsDlg->Show( 
     143                !p_intf->p_sys->PrefsDlg->IsShown() ); 
     144            return true; 
     145 
     146        case VLC_INFO_SHOW: 
     147            p_intf->p_sys->InfoDlg->Show( 
     148                !p_intf->p_sys->InfoDlg->IsShown() ); 
    141149            return true; 
    142150 

  • modules/gui/skins/win32/win32_run.cpp

    r51bf102 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: win32_run.cpp,v 1.6 2003/04/20 20:28:39 ipkiss Exp $ 
     5 * $Id: win32_run.cpp,v 1.7 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    9393    p_intf->p_sys->OpenDlg = new OpenDialog( p_intf, NULL, FILE_ACCESS ); 
    9494    p_intf->p_sys->MessagesDlg = new Messages( p_intf, NULL ); 
     95    p_intf->p_sys->SoutDlg = new SoutDialog( p_intf, NULL ); 
     96    p_intf->p_sys->PrefsDlg = new PrefsDialog( p_intf, NULL ); 
     97    p_intf->p_sys->InfoDlg = new FileInfo( p_intf, NULL ); 
    9598    return TRUE; 
    9699} 

  • modules/gui/wxwindows/fileinfo.cpp

    r3aa0d43 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: fileinfo.cpp,v 1.8 2003/04/17 14:00:44 anil Exp $ 
     5 * $Id: fileinfo.cpp,v 1.9 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> 
    …… 
    4646#include <vlc/intf.h> 
    4747 
    48 #include "wxwindows.h" 
     48#if defined MODULE_NAME_IS_skins 
     49#   include "../skins/src/skin_common.h" 
     50#   include "../skins/src/wxdialogs.h" 
     51#else 
     52#   include "wxwindows.h" 
     53#endif 
     54 
    4955 
    5056/***************************************************************************** 
    …… 
    7783    p_intf = _p_intf; 
    7884    SetIcon( *p_intf->p_sys->p_icon ); 
    79     SetAutoLayout(TRUE); 
     85    SetAutoLayout( TRUE ); 
    8086 
    8187    /* Create a panel to put everything in */ 
    …… 
    105111    SetSizerAndFit( main_sizer ); 
    106112 
    107     UpdateFileInfo();     
     113    UpdateFileInfo(); 
    108114} 
    109115 
    110116void FileInfo::UpdateFileInfo() 
    111117{ 
    112     if( !p_intf->p_sys->p_input || p_intf->p_sys->p_input->b_dead ) 
     118    input_thread_t *p_input = p_intf->p_sys->p_input; 
     119 
     120    if( !p_input || p_input->b_dead ) 
    113121    { 
    114122        if( fileinfo_root ) 
    115123        { 
    116             fileinfo_tree->SetItemText ( fileinfo_root , ""); 
     124            fileinfo_tree->SetItemText ( fileinfo_root , "" ); 
    117125            fileinfo_tree->DeleteChildren ( fileinfo_root ); 
    118         }  
     126        } 
    119127        return; 
    120128    } 
    121  
    122     input_thread_t *p_input = p_intf->p_sys->p_input; 
    123129 
    124130    if( !fileinfo_root ) 
    …… 
    134140 
    135141    vlc_mutex_lock( &p_input->stream.stream_lock ); 
    136      
     142 
    137143    fileinfo_tree->SetItemText( fileinfo_root , p_input->psz_name ); 
    138144    input_info_category_t *p_cat = p_input->stream.p_info; 
    …… 
    146152        { 
    147153            fileinfo_tree->AppendItem( cat, wxString(p_info->psz_name) + ": " 
    148                                  + p_info->psz_value ); 
     154                                            + p_info->psz_value ); 
    149155            p_info = p_info->p_next; 
    150156        } 

  • modules/gui/wxwindows/open.cpp

    r51bf102 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: open.cpp,v 1.14 2003/04/20 20:28:40 ipkiss Exp $ 
     5 * $Id: open.cpp,v 1.15 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    678678{ 
    679679    /* Show/hide the open dialog */ 
    680 #if !defined MODULE_NAME_IS_skins 
    681680    SoutDialog dialog( p_intf, p_main_interface ); 
    682681 
    …… 
    685684        config_PutPsz( p_intf, "sout", (char *)dialog.mrl.c_str() ); 
    686685    } 
    687 #endif 
    688686} 
    689687 

  • modules/gui/wxwindows/preferences.cpp

    r5cc0938 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: preferences.cpp,v 1.10 2003/04/01 16:11:43 gbazin Exp $ 
     5 * $Id: preferences.cpp,v 1.11 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    5454#include <vlc/intf.h> 
    5555 
    56 #include "wxwindows.h" 
     56#if defined MODULE_NAME_IS_skins 
     57#   include "../skins/src/skin_common.h" 
     58#   include "../skins/src/wxdialogs.h" 
     59#else 
     60#   include "wxwindows.h" 
     61#endif 
     62 
    5763 
    5864#ifndef wxRB_SINGLE 

  • modules/gui/wxwindows/streamout.cpp

    r5cc0938 r474a83c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: streamout.cpp,v 1.5 2003/04/01 16:11:43 gbazin Exp $ 
     5 * $Id: streamout.cpp,v 1.6 2003/04/21 00:54:26 ipkiss Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    5050#include <vlc/intf.h> 
    5151 
    52 #include "wxwindows.h" 
     52#if defined MODULE_NAME_IS_skins 
     53#   include "../skins/src/skin_common.h" 
     54#   include "../skins/src/wxdialogs.h" 
     55#else 
     56#   include "wxwindows.h" 
     57#endif 
     58 
    5359 
    5460#ifndef wxRB_SINGLE