Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/wxwidgets/dialogs/updatevlc.cpp b/modules/gui/wxwidgets/dialogs/updatevlc.cpp
index c2f82f20a1209eadf36bc873bed62cf6b4bb5fb0..fa2ad5307fa27926be66de7dd342e40f26fb3819 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/updatevlc.cpp
+++ b/modules/gui/wxwidgets/dialogs/updatevlc.cpp
@@ -62,9 +62,10 @@ END_EVENT_TABLE()
  * Constructor.
  *****************************************************************************/
 UpdateVLC::UpdateVLC( intf_thread_t *_p_intf, wxWindow *p_parent ):
-    wxFrame( p_parent, -1, wxU(_("VLC media player - Updates")),
+    wxFrame( p_parent, -1, wxU(_("Updates")),
              wxDefaultPosition, wxDefaultSize,
-         wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT|wxFRAME_TOOL_WINDOW)
+             wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT
+             |wxFRAME_TOOL_WINDOW|wxCAPTION )
 {
     /* Initializations */
     p_intf = _p_intf;
@@ -74,7 +75,7 @@ UpdateVLC::UpdateVLC( intf_thread_t *_p_intf, wxWindow *p_parent ):
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     wxButton *update_button =
         new wxButton( this, CheckForUpdate_Event,
-                      wxU(_("Check for updates now !")) );
+                      wxU(_("Check for updates")) );
     main_sizer->Add( update_button );
     SetSizerAndFit( main_sizer );
 
@@ -115,7 +116,7 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event )
         wxListCtrl *list =
             new wxListCtrl( this, ChooseItem_Event,
                             wxDefaultPosition, wxSize( 400, 300 ),
-                            wxLC_AUTOARRANGE|wxLC_SINGLE_SEL );
+                            wxLC_SINGLE_SEL|wxLC_LIST );
         wxImageList *images = new wxImageList( 32, 32, TRUE );
         images->Add( wxIcon( update_ascii_xpm ) );
         images->Add( wxIcon( update_info_xpm ) );
@@ -143,14 +144,32 @@ void UpdateVLC::OnCheckForUpdate( wxCommandEvent& event )
                 default:
                     i_image = 0;
             }
+            char *psz_tmp = NULL;
+            if( p_uit->file.l_size )
+            {
+                if( p_uit->file.l_size > 1024 * 1024 * 1024 )
+                     asprintf( &psz_tmp, "(%ld GB)",
+                                p_uit->file.l_size / (1024*1024*1024) );
+                if( p_uit->file.l_size > 1024 * 1024 )
+                    asprintf( &psz_tmp, "(%ld MB)",
+                                p_uit->file.l_size / (1024*1024) );
+                else if( p_uit->file.l_size > 1024 )
+                    asprintf( &psz_tmp, "(%ld kB)",
+                                p_uit->file.l_size / 1024 );
+                else
+                    asprintf( &psz_tmp, "(%ld B)", p_uit->file.l_size );
+            }
             list->InsertItem( list->GetItemCount(),
                               wxU(p_uit->file.psz_description)+wxU("\n")
-                              + wxU(p_uit->release.psz_version)+wxU(" (")
-                              + wxU(p_uit->release.psz_svn_revision)+wxU(")"),
+                              + wxU(p_uit->release.psz_version)+wxU(" ")
+                              + wxU(psz_tmp),
                               i_image );
+            if( psz_tmp ) free( psz_tmp );
         }
 
-        main_sizer->Add( new wxStaticText( this, -1, wxU( _("\nAvailable updates and related downloads:\n(Double click on a file to download it)\n" ) ) ) );
+        main_sizer->Add( new wxStaticText( this, -1, wxU( _("\nAvailable "
+                "updates and related downloads.\n"
+                "(Double click on a file to download it)\n" ) ) ) );
         main_sizer->Add( list );
         SetSizerAndFit( main_sizer );
         Layout();
@@ -181,7 +200,7 @@ void UpdateVLC::OnChooseItem( wxListEvent& event )
                         wxSAVE | wxOVERWRITE_PROMPT );
         if( filedialog->ShowModal() == wxID_OK )
         {
-            update_download( p_uit, filedialog->GetPath().mb_str() );
+            update_download( p_uit, filedialog->GetPath().mb_str(wxConvUTF8) );
         }
         update_iterator_Delete( p_uit );
         delete filedialog;