Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / modules / gui / wxwidgets / dialogs / iteminfo.cpp

diff --git a/modules/gui/wxwidgets/dialogs/iteminfo.cpp b/modules/gui/wxwidgets/dialogs/iteminfo.cpp
index 2d9fcba23a3000c1ef104be506f8e375d5f69170..01cc2eaae1e67e9150d9c041646b0374315fe4db 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/iteminfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/iteminfo.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2000-2004 the VideoLAN team
  * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include "dialogs/iteminfo.hpp"
+#include "dialogs/infopanels.hpp"
 #include <wx/combobox.h>
 #include <wx/statline.h>
 
@@ -68,28 +69,27 @@ ItemInfoDialog::ItemInfoDialog( intf_thread_t *_p_intf,
     panel->SetAutoLayout( TRUE );
 
     /* Create the standard info panel */
-    wxPanel *info_panel = InfoPanel( panel );
-
+    info_panel = new MetaDataPanel(p_intf, panel, true );
+    info_panel->Update( p_item->p_input );
     /* Separation */
     wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
 
     /* Create the buttons */
-    wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
+    wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("&OK")) );
     ok_button->SetDefault();
     wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
-                                            wxU(_("Cancel")) );
+                                            wxU(_("&Cancel")) );
 
     /* Place everything in sizers */
-    wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
-    button_sizer->Add( ok_button, 0, wxALL, 5 );
-    button_sizer->Add( cancel_button, 0, wxALL, 5 );
-    button_sizer->Layout();
+    wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer;
+    button_sizer->AddButton( ok_button );
+    button_sizer->AddButton( cancel_button );
+    button_sizer->Realize();
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-    panel_sizer->Add( info_panel, 0, wxEXPAND | wxALL, 5 );
+    panel_sizer->Add( info_panel, 1, wxEXPAND | wxALL, 5 );
     panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
-    panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
-                      wxALL, 5 );
+    panel_sizer->Add( button_sizer, 0, wxEXPAND | wxALL, 5 );
     panel_sizer->Layout();
     panel->SetSizerAndFit( panel_sizer );
     main_sizer->Add( panel, 1, wxGROW, 0 );
@@ -101,100 +101,16 @@ ItemInfoDialog::~ItemInfoDialog()
 {
 }
 
-/*****************************************************************************
- * Private methods.
- *****************************************************************************/
-wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
-{
-    wxPanel *info_panel = new wxPanel( parent, -1, wxDefaultPosition,
-                                  wxDefaultSize );
-    info_panel->SetAutoLayout( TRUE );
-    wxBoxSizer *info_sizer = new wxBoxSizer( wxHORIZONTAL );
-
-    /* Create a box to surround the controls */
-    wxStaticBox *panel_box = new wxStaticBox( info_panel, -1,
-                                   wxU(_("Item Info")) );
-
-    wxStaticBoxSizer *box_sizer = new wxStaticBoxSizer( panel_box,
-                                                          wxVERTICAL );
-
-    wxFlexGridSizer *sizer = new wxFlexGridSizer(2,3,20);
-    /* URI Textbox */
-    wxStaticText *uri_label =
-           new wxStaticText( info_panel, -1, wxU(_("URI")) );
-
-    uri_text = new wxTextCtrl( info_panel, Uri_Event,
-        wxU(p_item->input.psz_uri), wxDefaultPosition, wxSize( 300, -1 ),
-        wxTE_PROCESS_ENTER );
-
-    sizer->Add( uri_label, 0 , wxALIGN_LEFT |wxALL , 5 );
-    sizer->Add( uri_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
-
-    /* Name Textbox */
-    wxStaticText *name_label =
-           new wxStaticText(  info_panel, -1, wxU(_("Name")) );
-
-    name_text = new wxTextCtrl( info_panel, Uri_Event,
-        wxU(p_item->input.psz_name), wxDefaultPosition, wxSize( 300, -1 ),
-        wxTE_PROCESS_ENTER );
-
-    sizer->Add( name_label, 0 , wxALIGN_LEFT |wxALL , 5  );
-    sizer->Add( name_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
-
-    /* Treeview */
-    info_tree = new wxTreeCtrl( info_panel, -1, wxDefaultPosition,
-                                wxSize(220,200),
-                                wxSUNKEN_BORDER |wxTR_HAS_BUTTONS |
-                                wxTR_HIDE_ROOT );
-
-    sizer->Layout();
-    box_sizer->Add( sizer, 0, wxEXPAND, 5 );
-    box_sizer->Add( info_tree, 0, wxEXPAND, 5 );
-    info_sizer->Add( box_sizer, 1, wxBOTTOM, 5 );
-
-    info_panel->SetSizer( info_sizer );
-    info_sizer->Layout();
-    info_sizer->SetSizeHints( info_panel );
-
-    UpdateInfo();
-
-    return info_panel;
-}
-
-void ItemInfoDialog::UpdateInfo()
-{
-    if( !info_root )
-    {
-       info_root = info_tree->AddRoot( wxU( p_item->input.psz_name) );
-    }
-
-    /* Rebuild the tree */
-    for( int i = 0; i< p_item->input.i_categories ; i++)
-    {
-        wxTreeItemId cat = info_tree->AppendItem( info_root,
-                            wxU( p_item->input.pp_categories[i]->psz_name) );
-
-        for( int j = 0 ; j < p_item->input.pp_categories[i]->i_infos ; j++ )
-        {
-           info_tree->AppendItem( cat , (wxString)
-               wxU(p_item->input.pp_categories[i]->pp_infos[j]->psz_name) +
-               wxT(": ") +
-               wxU(p_item->input.pp_categories[i]->pp_infos[j]->psz_value) );
-        }
-
-        info_tree->Expand( cat );
-    }
-}
 
 /*****************************************************************************
  * Events methods.
  *****************************************************************************/
 void ItemInfoDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
 {
-    vlc_mutex_lock( &p_item->input.lock );
-    p_item->input.psz_name = strdup( name_text->GetLineText(0).mb_str() );
-    p_item->input.psz_uri = strdup( uri_text->GetLineText(0).mb_str() );
-    vlc_mutex_unlock( &p_item->input.lock );
+    vlc_mutex_lock( &p_item->p_input->lock );
+    p_item->p_input->psz_name = info_panel->GetName();
+    p_item->p_input->psz_uri = info_panel->GetURI();
+    vlc_mutex_unlock( &p_item->p_input->lock );
     EndModal( wxID_OK );
 }