Disable update checking per default, re-enable with --enable-update-check

[vlc] / modules / gui / wxwidgets / interface.cpp

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 01f6d7be4407abc56086efab7b75c01665d47738..fa73e2776d65b961dfa4e1bf10575a5f0bbc823d 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -31,15 +31,17 @@
 #include "video.hpp"
 #include <vlc_keys.h>
 
-#include "charset.h"
+#include "vlc_charset.h"
 
-#include <vlc/aout.h>
-#include "charset.h"
+#include <vlc_aout.h>
+#include "vlc_charset.h"
 
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
 
 #include <wx/splitter.h>
 
+#include <wx/utils.h>                             /* wxLaunchDefaultBrowser() */
+
 /* include the toolbar graphics */
 #include "bitmaps/play.xpm"
 #include "bitmaps/pause.xpm"
@@ -296,8 +298,12 @@ enum
      * this standard value as otherwise it won't be handled properly under Mac
      * (where it is special and put into the "Apple" menu) */
     About_Event = wxID_ABOUT,
+    OnWebLink_Event,
+    OnWebHelp_Event,
+#ifdef UPDATE_CHECK
     UpdateVLC_Event,
-    VLM_Event,
+#endif
+    //VLM_Event,
 
     Iconize_Event,
 };
@@ -308,8 +314,12 @@ BEGIN_EVENT_TABLE(Interface, wxFrame)
     /* Menu events */
     EVT_MENU(Exit_Event, Interface::OnExit)
     EVT_MENU(About_Event, Interface::OnAbout)
+    EVT_MENU(OnWebLink_Event, Interface::OnWebLink)
+    EVT_MENU(OnWebHelp_Event, Interface::OnWebHelp)
+#ifdef UPDATE_CHECK
     EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
-    EVT_MENU(VLM_Event, Interface::OnShowDialog)
+#endif
+    //EVT_MENU(VLM_Event, Interface::OnShowDialog)
 
     EVT_MENU(Playlist_Event, Interface::OnShowDialog)
     EVT_MENU(PlaylistSmall_Event, Interface::OnSmallPlaylist)
@@ -368,7 +378,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
 
 
     /* Give our interface a nice little icon */
-    SetIcon( wxIcon( vlc_xpm ) );
+    SetIcon( wxIcon( (const char**) vlc_xpm ) );
 
     /* Create a splitter window that will fill in the interface window.
      * We need a splitter bar in order to make the embedded playlist
@@ -418,7 +428,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
     /* Creation of the status bar
      * Helptext for menu items and toolbar tools will automatically get
      * displayed here. */
-    int i_status_width[3] = {100, 40, -1};
+    int i_status_width[3] = {150, 55, -1};
     statusbar = CreateStatusBar( 3 );                            /* 2 fields */
     statusbar->SetStatusWidths( 3, i_status_width );
     statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
@@ -594,8 +604,10 @@ void Interface::CreateOurMenuBar()
     view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
     view_menu->Append( FileInfo_Event,
                        wxU(_("Stream and Media &Info...\tCtrl-I")) );
+#if 0
     view_menu->Append( VLM_Event,
                        wxU(_("VLM Control...\tCtrl-V")) );
+#endif
 
     /* Create the "Auto-generated" menus */
     p_settings_menu = SettingsMenu( p_intf, this );
@@ -605,14 +617,19 @@ void Interface::CreateOurMenuBar()
 
     /* Create the "Help" menu */
     wxMenu *help_menu = new wxMenu;
+    help_menu->Append( OnWebLink_Event, wxU(_("VideoLAN's Website")) );
+    help_menu->Append( OnWebHelp_Event, wxU(_("Online Help")) );
+    help_menu->AppendSeparator();
     help_menu->Append( About_Event, wxU(_("About...")) );
+#ifdef UPDATE_CHECK
     help_menu->AppendSeparator();
     help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
+#endif
 
     /* Append the freshly created menus to the menu bar... */
     wxMenuBar *menubar = new wxMenuBar();
     menubar->Append( file_menu, wxU(_("&File")) );
-    menubar->Append( view_menu, wxU(_("&View")) );
+    menubar->Append( view_menu, wxU(_("V&iew")) );
     menubar->Append( p_settings_menu, wxU(_("&Settings")) );
     menubar->Append( p_audio_menu, wxU(_("&Audio")) );
     menubar->Append( p_video_menu, wxU(_("&Video")) );
@@ -941,9 +958,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
        wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
        wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
        wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
-#ifndef HAVE_SHARED_LIBVLC
        wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
-#endif
 #ifdef __WXMSW__
         wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
 #else
@@ -955,6 +970,16 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
                   wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
 }
 
+void Interface::OnWebLink( wxCommandEvent& WXUNUSED(event) )
+{
+    wxLaunchDefaultBrowser( wxU("http://videolan.org/") );
+}
+
+void Interface::OnWebHelp( wxCommandEvent& WXUNUSED(event) )
+{
+    wxLaunchDefaultBrowser( wxU("http://videolan.org/doc/") );
+}
+
 void Interface::OnShowDialog( wxCommandEvent& event )
 {
     if( p_intf->p_sys->pf_show_dialog )
@@ -1005,12 +1030,16 @@ void Interface::OnShowDialog( wxCommandEvent& event )
         case Bookmarks_Event:
             i_id = INTF_DIALOG_BOOKMARKS;
             break;
+#ifdef UPDATE_CHECK
         case UpdateVLC_Event:
             i_id = INTF_DIALOG_UPDATEVLC;
             break;
+#endif
+#if 0
         case VLM_Event:
             i_id = INTF_DIALOG_VLM;
             break;
+#endif
         default:
             i_id = INTF_DIALOG_FILE;
             break;
@@ -1303,9 +1332,9 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
     {
         char *psz_utf8 = wxDnDFromLocale( filenames[i] );
 
-        playlist_PlaylistAdd( p_playlist, psz_utf8, NULL,
+        playlist_Add( p_playlist, psz_utf8, NULL,
                       PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
-                      PLAYLIST_END );
+                      PLAYLIST_END, VLC_TRUE, VLC_FALSE );
 
         wxDnDLocaleFree( psz_utf8 );
     }
@@ -1447,7 +1476,7 @@ Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
     p_main_interface = _p_main_interface;
     p_intf = _p_intf;
 
-    SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
+    SetIcon( wxIcon( (const char**) vlc16x16_xpm ), wxT("VLC media player") );
     if( !IsOk() || !IsIconInstalled() )
     {
         msg_Warn(p_intf, "cannot set systray icon, weird things may happen");
@@ -1515,7 +1544,7 @@ wxMenu* Systray::CreatePopupMenu()
 
 void Systray::UpdateTooltip( const wxChar* tooltip )
 {
-    SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
+    SetIcon( wxIcon( (const char**) vlc16x16_xpm ), tooltip );
 }
 #endif
 #endif