Changeset 2458a977ecf22a95a75153471ff0733d922d90d2

Timestamp:

29/01/06 18:33:55 (3 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1138556035 +0000

git-parent:

[0638177349c21821748e4d329f509f7bf266f41d]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1138556035 +0000

Message:

infopanels: Redimension the text area. implement modifiable
iteminfo: Use infopanel.

Files:

• modules/gui/wxwidgets/dialogs/infopanels.cpp (modified) (4 diffs)
• modules/gui/wxwidgets/dialogs/infopanels.hpp (modified) (1 diff)
• modules/gui/wxwidgets/dialogs/iteminfo.cpp (modified) (5 diffs)
• modules/gui/wxwidgets/dialogs/iteminfo.hpp (modified) (3 diffs)

modules/gui/wxwidgets/dialogs/infopanels.cpp

@@ -41 +41 @@
-    wxPanel( _p_parent, -1 )
-{
+    int flags= wxTE_PROCESS_ENTER;
-    /* Initializations */
-    p_intf = _p_intf;
@@ -50 +51 @@
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
+
+
+
+
-    /* URI Textbox */
-    wxStaticText *uri_static =
-           new wxStaticText( this, -1, wxU(_("URI")) );
-5
+0
-
-    uri_text = new wxTextCtrl( this, -1,
-
-
-
+
+
-
-    /* Name Textbox */
-    wxStaticText *name_static =
-           new wxStaticText(  this, -1, wxU(_("Name")) );
-5
+0
-
-    name_text = new wxTextCtrl( this, -1,
-
-
-
+
+
-
-    /* Treeview */
@@ -79 +83 @@
-
-    sizer->Layout();
-
+1
-    panel_sizer->Add( info_tree, 1, wxEXPAND | wxALL, 5 );
-    panel_sizer->Layout();
@@ -112 +116 @@
-        info_tree->Expand( cat );
-    }
+}
+
+char* ItemInfoPanel::GetURI( )
+{
+    return  strdup( uri_text->GetLineText(0).mb_str() );
+}
+
+char* ItemInfoPanel::GetName( )
+{
+    return  strdup( name_text->GetLineText(0).mb_str() );
-}
-

modules/gui/wxwidgets/dialogs/infopanels.hpp

@@ -40 +40 @@
-    void Update( input_item_t *);
-    void Clear();
+
+
+    char* GetURI();
+    char* GetName();
-
-    void OnOk();

modules/gui/wxwidgets/dialogs/iteminfo.cpp

@@ -23 +23 @@
-
-#include "dialogs/iteminfo.hpp"
+#include "dialogs/infopanels.hpp"
-#include <wx/combobox.h>
-#include <wx/statline.h>
@@ -69 +70 @@
-
-    /* Create the standard info panel */
-wxPanel *info_panel = InfoPanel( panel
-
+info_panel = new ItemInfoPanel(p_intf, panel, true
+
-    /* Separation */
-    wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
@@ -87 +88 @@
-    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-0
+1
-    panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
-    panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
@@ -102 +103 @@
-}
-
-/*****************************************************************************
- * 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 | wxTR_HAS_VARIABLE_ROW_HEIGHT );
-
-    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 );
-    }
-}
-
-/*****************************************************************************
@@ -193 +110 @@
-{
-    vlc_mutex_lock( &p_item->input.lock );
-strdup( name_text->GetLineText(0).mb_str() 
-strdup( uri_text->GetLineText(0).mb_str() 
+info_panel->GetName(
+info_panel->GetURI(
-    vlc_mutex_unlock( &p_item->input.lock );
-    EndModal( wxID_OK );

modules/gui/wxwidgets/dialogs/iteminfo.hpp

@@ -26 +26 @@
-
-#include "wxwidgets.hpp"
-
+
-#include <wx/treectrl.h>
-
@@ -42 +42 @@
-
-private:
-    wxPanel *InfoPanel( wxWindow* parent );
-    wxPanel *GroupPanel( wxWindow* parent );
-
@@ -59 +58 @@
-    /* Controls for the iteminfo dialog box */
-    wxPanel *info_subpanel;
-wx
+ItemInfo
-
-    wxPanel *group_subpanel;