Changeset e34daedfae3bc4f23ddef242c3d3a41eb3655c29

Timestamp:

07/24/05 23:03:20 (3 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1122239000 +0000

git-parent:

[5bbb474823d50199337b9b090b62e69d048be8f7]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1122239000 +0000

Message:

VLC update checker in the wxWidgets interface (in help menu)

xml files used for the updates are located at http://update.videolan.org

extensive testing ... code cleaning ... would be greatly appreciated

Files:

• include/vlc_interface.h (modified) (1 diff)
• modules/gui/wxwindows/Modules.am (modified) (1 diff)
• modules/gui/wxwindows/dialogs.cpp (modified) (6 diffs)
• modules/gui/wxwindows/interface.cpp (modified) (4 diffs)
• modules/gui/wxwindows/updatevlc.cpp (added)
• modules/gui/wxwindows/wxwindows.h (modified) (2 diffs)

include/vlc_interface.h

@@ -158 +158 @@
-#define INTF_DIALOG_FILE_GENERIC 30
-
+#define INTF_DIALOG_UPDATEVLC   90
+
-#define INTF_DIALOG_EXIT       99
-

modules/gui/wxwindows/Modules.am

@@ -18 +18 @@
-    timer.cpp \
-    fileinfo.cpp \
+    updatevlc.cpp \
-    subtitles.cpp \
-    bookmarks.cpp \

modules/gui/wxwindows/dialogs.cpp

@@ -51 +51 @@
-
-    /* Event handlers (these functions should _not_ be virtual) */
+    void OnUpdateVLC( wxCommandEvent& event );
-    void OnExit( wxCommandEvent& event );
-    void OnPlaylist( wxCommandEvent& event );
@@ -90 +91 @@
-    wxWindow            *p_bookmarks_dialog;
-    wxFileDialog        *p_file_generic_dialog;
+    UpdateVLC           *p_updatevlc_dialog;
-};
-
@@ -127 +129 @@
-    EVT_COMMAND(INTF_DIALOG_EXIT, wxEVT_DIALOG,
-                DialogsProvider::OnExitThread)
+    EVT_COMMAND(INTF_DIALOG_UPDATEVLC, wxEVT_DIALOG,
+                DialogsProvider::OnUpdateVLC)
-END_EVENT_TABLE()
-
@@ -152 +156 @@
-    p_bookmarks_dialog = NULL;
-    p_dir_dialog = NULL;
+    p_updatevlc_dialog = NULL;
-
-    /* Give our interface a nice little icon */
@@ -220 +225 @@
-    if( p_wizard_dialog ) delete p_wizard_dialog;
-    if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
+    if( p_updatevlc_dialog ) delete p_updatevlc_dialog;
-
-
@@ -480 +486 @@
-    wxTheApp->ExitMainLoop();
-}
+
+void DialogsProvider::OnUpdateVLC( wxCommandEvent& WXUNUSED(event) )
+{
+    /* Show/hide the file info window */
+    if( !p_updatevlc_dialog )
+        p_updatevlc_dialog = new UpdateVLC( p_intf, this );
+
+    if( p_updatevlc_dialog )
+    {
+        p_updatevlc_dialog->Show( !p_updatevlc_dialog->IsShown() );
+    }
+}

modules/gui/wxwindows/interface.cpp

@@ -157 +157 @@
-     * (where it is special and put into the "Apple" menu) */
-    About_Event = wxID_ABOUT,
+    UpdateVLC_Event,
-
-    Iconize_Event
@@ -165 +166 @@
-    EVT_MENU(Exit_Event, Interface::OnExit)
-    EVT_MENU(About_Event, Interface::OnAbout)
+    EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
-
-    EVT_MENU(Playlist_Event, Interface::OnShowDialog)
@@ -433 +435 @@
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append( About_Event, wxU(_("About VLC media player")) );
+    help_menu->AppendSeparator();
+    help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates ...")) );
-
-    /* Append the freshly created menus to the menu bar... */
@@ -914 +918 @@
-            i_id = INTF_DIALOG_BOOKMARKS;
-            break;
+        case UpdateVLC_Event:
+            i_id = INTF_DIALOG_UPDATEVLC;
+            break;
-        default:
-            i_id = INTF_DIALOG_FILE;

modules/gui/wxwindows/wxwindows.h

@@ -30 +30 @@
-#define WXINTL_NO_GETTEXT_MACRO
-
+#include <list>
+
-#include <wx/wxprec.h>
-#include <wx/wx.h>
@@ -1048 +1050 @@
-};
-
+/* Update VLC */
+class UpdateVLC: public wxFrame
+{
+public:
+    /* Constructor */
+    UpdateVLC( intf_thread_t *p_intf, wxWindow *p_parent );
+    virtual ~UpdateVLC();
+
+private:
+    void OnButtonClose( wxCommandEvent& event );
+    void OnClose( wxCloseEvent& WXUNUSED(event) );
+    void GetData();
+    void OnCheckForUpdate( wxCommandEvent& event );
+    void OnMirrorChoice( wxCommandEvent& event );
+    void UpdateUpdatesTree();
+    void UpdateMirrorsChoice();
+    void OnUpdatesTreeActivate( wxTreeEvent& event );
+    void DownloadFile( wxString url, wxString dst );
+
+    DECLARE_EVENT_TABLE();
+
+    intf_thread_t *p_intf;
+    wxTreeCtrl *updates_tree;
+    wxTreeItemId updates_root;
+
+    wxChoice *mirrors_choice;
+
+    wxString release_type; /* could be "stable", "test", "nightly" ... */
+
+    struct update_file_t
+    {
+        wxString type;
+        wxString md5;
+        wxString size;
+        wxString url;
+        wxString description;
+    };
+
+    struct update_version_t
+    {
+        wxString type;
+        wxString major;
+        wxString minor;
+        wxString revision;
+        wxString extra;
+        std::list<update_file_t> m_files;
+    };
+
+    std::list<update_version_t> m_versions;
+
+    struct update_mirror_t
+    {
+        wxString name;
+        wxString location;
+        wxString type;
+        wxString base_url;
+    };
+
+    std::list<update_mirror_t> m_mirrors;
+};
+
-#if wxUSE_DRAG_AND_DROP
-/* Drag and Drop class */