* modules/gui/wxwindows/interface.cpp: update the checkbox of the extended gui menu...

[vlc] / modules / gui / wxwindows / iteminfo.cpp

diff --git a/modules/gui/wxwindows/iteminfo.cpp b/modules/gui/wxwindows/iteminfo.cpp
index a6e83633cd4a1f5008efd4104c4da9222831bf70..1d97d9dbf80166e9494ef4d43ccc7f5524ca12d1 100644 (file)
--- a/modules/gui/wxwindows/iteminfo.cpp
+++ b/modules/gui/wxwindows/iteminfo.cpp
@@ -139,6 +139,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
     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")) );
@@ -147,12 +148,8 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
         wxU(p_item->input.psz_uri), wxDefaultPosition, wxSize( 300, -1 ),
         wxTE_PROCESS_ENTER );
 
-    wxBoxSizer *uri_sizer = new wxBoxSizer( wxHORIZONTAL );
-
-    uri_sizer->Add( uri_label, 0 , wxALIGN_RIGHT |wxALL , 5 );
-    uri_sizer->Add( uri_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
-    uri_sizer->Layout();
-    box_sizer->Add( uri_sizer, 1, wxEXPAND , 5);
+    sizer->Add( uri_label, 0 , wxALIGN_LEFT |wxALL , 5 );
+    sizer->Add( uri_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
 
     /* Name Textbox */
     wxStaticText *name_label =
@@ -162,29 +159,21 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
         wxU(p_item->input.psz_name), wxDefaultPosition, wxSize( 300, -1 ),
         wxTE_PROCESS_ENTER );
 
-    wxBoxSizer *name_sizer = new wxBoxSizer( wxHORIZONTAL );
-
-    name_sizer->Add( name_label, 0 , wxALIGN_RIGHT |wxALL , 5  );
-    name_sizer->Add( name_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
-    name_sizer->Layout();
-    box_sizer->Add( name_sizer, 1 , wxEXPAND, 5 );
+    sizer->Add( name_label, 0 , wxALIGN_LEFT |wxALL , 5  );
+    sizer->Add( name_text, 1 , wxALIGN_RIGHT | wxALL , 5 );
 
     /* Author Textbox */
     wxStaticText *author_label =
            new wxStaticText( info_panel, -1, wxU(_("Author")) );
 
-    author_text =
-                   new wxTextCtrl( info_panel, Uri_Event,
+    author_text = new wxTextCtrl( info_panel, Uri_Event,
                                    wxU( playlist_ItemGetInfo( p_item,
                                           _("General"), _("Author") ) ),
                                    wxDefaultPosition, wxSize( 300, -1 ),
                                    wxTE_PROCESS_ENTER);
 
-    wxBoxSizer *author_sizer = new wxBoxSizer( wxHORIZONTAL );
-    author_sizer->Add( author_label, 0 , wxALIGN_RIGHT | wxALL , 5 );
-    author_sizer->Add( author_text, 1 , wxALIGN_RIGHT | wxALL , 5);
-    author_sizer->Layout();
-    box_sizer->Add( author_sizer, 1, wxEXPAND, 5 );
+    sizer->Add( author_label, 0 , wxALIGN_LEFT | wxALL , 5 );
+    sizer->Add( author_text, 1 , wxALIGN_RIGHT | wxALL , 5);
 
     /* Treeview */
     info_tree = new wxTreeCtrl( info_panel, -1, wxDefaultPosition,
@@ -192,6 +181,8 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
                                 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 );
 
@@ -233,8 +224,7 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent )
 
     group_combo = new wxComboBox( group_subpanel, -1,
                                  wxT(""),wxDefaultPosition, wxDefaultSize,
-                                 0, NULL,
-                                 wxCB_READONLY );
+                                 0, NULL, wxCB_READONLY );
 
     wxButton *newgroup_button = new wxButton( group_subpanel, New_Event,
                                     wxU(_("New Group")));
@@ -299,6 +289,8 @@ void ItemInfoDialog::UpdateInfo()
                wxT(": ") +
                wxU(p_item->input.pp_categories[i]->pp_infos[j]->psz_value) );
         }
+
+        info_tree->Expand( cat );
     }
 }