* all: Unified behaviours using "action list" objects

modules/gui/win32/about.dfm

@@ -277,7 +277,7 @@ object AboutDlg: TAboutDlg
     WordWrap = True
   end
   object Label3: TLabel
-    Left = 38
+    Left = 30
     Top = 80
     Width = 227
     Height = 13
@@ -290,7 +290,7 @@ object AboutDlg: TAboutDlg
     Height = 49
   end
   object Label5: TLabel
-    Left = 82
+    Left = 83
     Top = 96
     Width = 121
     Height = 13

modules/gui/win32/control.cpp

@@ -64,7 +64,7 @@ bool ControlPlay( TObject *Sender )
         vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
     if( p_playlist == NULL )
     {
-        p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );
+        p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );
         return false;
     }
 
@@ -79,7 +79,7 @@ bool ControlPlay( TObject *Sender )
     {
         vlc_mutex_unlock( &p_playlist->object_lock );
         vlc_object_release( p_playlist );
-        p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );
+        p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );
     }
 
     return true;

modules/gui/win32/disc.cpp

@@ -46,14 +46,12 @@ __fastcall TDiscDlg::TDiscDlg( TComponent* Owner )
 //---------------------------------------------------------------------------
 void __fastcall TDiscDlg::FormShow( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuOpenDisc->Checked = true;
-    p_intfGlobal->p_sys->p_window->PopupOpenDisc->Checked = true;
+    p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = true;
 }
 //---------------------------------------------------------------------------
 void __fastcall TDiscDlg::FormHide( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuOpenDisc->Checked = false;
-    p_intfGlobal->p_sys->p_window->PopupOpenDisc->Checked = false;
+    p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = false;
 }
 //---------------------------------------------------------------------------
 void __fastcall TDiscDlg::BitBtnCancelClick( TObject *Sender )

modules/gui/win32/mainframe.cpp

@@ -125,9 +125,9 @@ void __fastcall TMainFrameDlg::FormClose( TObject *Sender,
 
 
 /*****************************************************************************
- * Menu callbacks
+ * Main callbacks
  ****************************************************************************/
-void __fastcall TMainFrameDlg::MenuOpenFileClick( TObject *Sender )
+void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )
 {
     AnsiString      FileName;
     playlist_t *    p_playlist;
@@ -153,7 +153,7 @@ void __fastcall TMainFrameDlg::MenuOpenFileClick( TObject *Sender )
     vlc_object_release( p_playlist );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuOpenDiscClick( TObject *Sender )
+void __fastcall TMainFrameDlg::OpenDiscActionExecute( TObject *Sender )
 {
     TDiscDlg *p_disc = p_intfGlobal->p_sys->p_disc;
     if( p_disc == NULL )
@@ -164,7 +164,7 @@ void __fastcall TMainFrameDlg::MenuOpenDiscClick( TObject *Sender )
     p_disc->Show();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuNetworkStreamClick( TObject *Sender )
+void __fastcall TMainFrameDlg::NetworkStreamActionExecute( TObject *Sender )
 {
     TNetworkDlg *p_network = p_intfGlobal->p_sys->p_network;
     if( p_network == NULL )
@@ -175,17 +175,12 @@ void __fastcall TMainFrameDlg::MenuNetworkStreamClick( TObject *Sender )
     p_network->Show();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuExitClick( TObject *Sender )
+void __fastcall TMainFrameDlg::ExitActionExecute( TObject *Sender )
 {
     Close();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuHideinterfaceClick( TObject *Sender )
-{
-     this->SendToBack();
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuFullscreenClick( TObject *Sender )
+void __fastcall TMainFrameDlg::FullscreenActionExecute( TObject *Sender )
 {
     vout_thread_t *p_vout;
 
@@ -200,7 +195,7 @@ void __fastcall TMainFrameDlg::MenuFullscreenClick( TObject *Sender )
     vlc_object_release( p_vout );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuPlaylistClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PlaylistActionExecute( TObject *Sender )
 {
     TPlaylistDlg *p_playwin = p_intfGlobal->p_sys->p_playwin;
     if( p_playwin->Visible )
@@ -223,89 +218,64 @@ void __fastcall TMainFrameDlg::MenuPlaylistClick( TObject *Sender )
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuMessagesClick( TObject *Sender )
+void __fastcall TMainFrameDlg::MessagesActionExecute( TObject *Sender )
 {
      p_intfGlobal->p_sys->p_messages->Show();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuPreferencesClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PreferencesActionExecute( TObject *Sender )
 {
     CreatePreferences( "main" );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::MenuAboutClick( TObject *Sender )
+void __fastcall TMainFrameDlg::AboutActionExecute( TObject *Sender )
 {
     p_intfGlobal->p_sys->p_about = new TAboutDlg( this );
     p_intfGlobal->p_sys->p_about->ShowModal();
     delete p_intfGlobal->p_sys->p_about;
 }
 //---------------------------------------------------------------------------
-
-
-/*****************************************************************************
- * Toolbar callbacks
- ****************************************************************************/
-void __fastcall TMainFrameDlg::ToolButtonFileClick( TObject *Sender )
-{
-    MenuOpenFileClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonDiscClick( TObject *Sender )
-{
-    MenuOpenDiscClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonNetClick( TObject *Sender )
-{
-    MenuNetworkStreamClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonPlaylistClick( TObject *Sender )
-{
-    MenuPlaylistClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonBackClick( TObject *Sender )
+void __fastcall TMainFrameDlg::BackActionExecute( TObject *Sender )
 {
     ControlBack( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonStopClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PlayActionExecute( TObject *Sender )
 {
-    ControlStop( Sender );
+    ControlPlay( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonPlayClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PauseActionExecute( TObject *Sender )
 {
-    ControlPlay( Sender );
+    ControlPause( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonPauseClick( TObject *Sender )
+void __fastcall TMainFrameDlg::StopActionExecute( TObject *Sender )
 {
-    ControlPause( Sender );
+    ControlStop( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonSlowClick( TObject *Sender )
+void __fastcall TMainFrameDlg::SlowActionExecute( TObject *Sender )
 {
     ControlSlow( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonFastClick( TObject *Sender )
+void __fastcall TMainFrameDlg::FastActionExecute( TObject *Sender )
 {
     ControlFast( Sender );
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonPrevClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PreviousActionExecute(TObject *Sender)
 {
     p_intfGlobal->p_sys->p_playwin->Previous();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender )
+void __fastcall TMainFrameDlg::NextActionExecute(TObject *Sender)
 {
     p_intfGlobal->p_sys->p_playwin->Next();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender )
+void __fastcall TMainFrameDlg::EjectActionExecute( TObject *Sender )
 {
     AnsiString Device = "";
     char * psz_current;
@@ -359,43 +329,11 @@ void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender )
 
 
 /*****************************************************************************
- * Popup callbacks
+ * Menu and popup callbacks
  ****************************************************************************/
-void __fastcall TMainFrameDlg::PopupCloseClick( TObject *Sender )
-{
-    /* We do nothing, we just need a click on a menu item
-     * to close the popup. Don't ask me why... */
-    return;
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupPlayClick( TObject *Sender )
-{
-    ToolButtonPlayClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupPauseClick( TObject *Sender )
-{
-    ToolButtonPauseClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupStopClick( TObject *Sender )
-{
-    ToolButtonStopClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupBackClick( TObject *Sender )
-{
-    ToolButtonBackClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupSlowClick( TObject *Sender )
-{
-    ToolButtonSlowClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupFastClick( TObject *Sender )
+void __fastcall TMainFrameDlg::MenuHideinterfaceClick( TObject *Sender )
 {
-    ToolButtonFastClick( Sender );
+     this->SendToBack();
 }
 //---------------------------------------------------------------------------
 void __fastcall TMainFrameDlg::PopupToggleInterfaceClick( TObject *Sender )
@@ -403,19 +341,11 @@ void __fastcall TMainFrameDlg::PopupToggleInterfaceClick( TObject *Sender )
     this->BringToFront();
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupFullscreenClick( TObject *Sender )
-{
-    MenuFullscreenClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupNextClick( TObject *Sender )
-{
-    ToolButtonNextClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupPrevClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PopupCloseClick( TObject *Sender )
 {
-    ToolButtonPrevClick( Sender );
+    /* We do nothing, we just need a click on a menu item
+     * to close the popup. Don't ask me why... */
+    return;
 }
 //---------------------------------------------------------------------------
 void __fastcall TMainFrameDlg::PopupJumpClick( TObject *Sender )
@@ -423,42 +353,12 @@ void __fastcall TMainFrameDlg::PopupJumpClick( TObject *Sender )
     // TODO
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupPlaylistClick( TObject *Sender )
-{
-    MenuPlaylistClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupPreferencesClick( TObject *Sender )
-{
-    MenuPreferencesClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupExitClick( TObject *Sender )
-{
-    MenuExitClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupOpenFileClick( TObject *Sender )
-{
-    MenuOpenFileClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupOpenDiscClick( TObject *Sender )
-{
-    MenuOpenDiscClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::PopupNetworkStreamClick( TObject *Sender )
-{
-    MenuNetworkStreamClick( Sender );
-}
-//---------------------------------------------------------------------------
 
 
 /*****************************************************************************
  * Callbacks for DVD/VCD navigation
  ****************************************************************************/
-void __fastcall TMainFrameDlg::ButtonTitlePrevClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PrevTitleActionExecute( TObject *Sender )
 {
     intf_thread_t * p_intf;
     input_area_t  * p_area;
@@ -482,7 +382,7 @@ void __fastcall TMainFrameDlg::ButtonTitlePrevClick( TObject *Sender )
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ButtonTitleNextClick( TObject *Sender )
+void __fastcall TMainFrameDlg::NextTitleActionExecute( TObject *Sender )
 {
     intf_thread_t * p_intf;
     input_area_t  * p_area;
@@ -505,7 +405,7 @@ void __fastcall TMainFrameDlg::ButtonTitleNextClick( TObject *Sender )
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ButtonChapterPrevClick( TObject *Sender )
+void __fastcall TMainFrameDlg::PrevChapterActionExecute( TObject *Sender )
 {
     intf_thread_t * p_intf = p_intfGlobal;
     input_area_t  * p_area;
@@ -526,7 +426,7 @@ void __fastcall TMainFrameDlg::ButtonChapterPrevClick( TObject *Sender )
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TMainFrameDlg::ButtonChapterNextClick( TObject *Sender )
+void __fastcall TMainFrameDlg::NextChapterActionExecute( TObject *Sender )
 {
     intf_thread_t * p_intf = p_intfGlobal;
     input_area_t  * p_area;
@@ -685,15 +585,12 @@ void __fastcall TMainFrameDlg::ModeManage()
 
     /* set control items */
     ToolButtonBack->Enabled = false;
-    ToolButtonStop->Enabled = true;
     ToolButtonEject->Enabled = !b_control;
-    ToolButtonPause->Enabled = b_control;
-    ToolButtonSlow->Enabled = b_control;
-    ToolButtonFast->Enabled = b_control;
+    StopAction->Enabled = true;
+    PauseAction->Enabled = b_control;
+    SlowAction->Enabled = b_control;
+    FastAction->Enabled = b_control;
     PopupBack->Enabled = false;
-    PopupPause->Enabled = b_control;
-    PopupSlow->Enabled = b_control;
-    PopupFast->Enabled = b_control;
 }
 //---------------------------------------------------------------------------
 

modules/gui/win32/mainframe.dfm

 object MainFrameDlg: TMainFrameDlg
-  Left = 314
-  Top = 198
+  Left = 179
+  Top = 442
   Width = 541
   Height = 306
   BorderIcons = [biSystemMenu, biMinimize]
@@ -153,26 +153,17 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonFile: TToolButton
       Left = 0
       Top = 0
-      Hint = 'Open a file'
-      Caption = 'File'
-      ImageIndex = 0
-      OnClick = ToolButtonFileClick
+      Action = OpenFileAction
     end
     object ToolButtonDisc: TToolButton
       Left = 39
       Top = 0
-      Hint = 'Open a DVD or VCD'
-      Caption = 'Disc'
-      ImageIndex = 1
-      OnClick = ToolButtonDiscClick
+      Action = OpenDiscAction
     end
     object ToolButtonNet: TToolButton
       Left = 78
       Top = 0
-      Hint = 'Open a network stream'
-      Caption = 'Net'
-      ImageIndex = 2
-      OnClick = ToolButtonNetClick
+      Action = NetworkStreamAction
     end
     object ToolButtonSep1: TToolButton
       Left = 117
@@ -185,45 +176,27 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonBack: TToolButton
       Left = 125
       Top = 0
-      Caption = 'Back'
-      Enabled = False
-      ImageIndex = 3
-      OnClick = ToolButtonBackClick
+      Action = BackAction
     end
     object ToolButtonPlay: TToolButton
       Left = 164
       Top = 0
-      Hint = 'Play stream'
-      Caption = 'Play'
-      ImageIndex = 5
-      OnClick = ToolButtonPlayClick
+      Action = PlayAction
     end
     object ToolButtonPause: TToolButton
       Left = 203
       Top = 0
-      Hint = 'Pause stream'
-      Caption = 'Pause'
-      Enabled = False
-      ImageIndex = 6
-      OnClick = ToolButtonPauseClick
+      Action = PauseAction
     end
     object ToolButtonStop: TToolButton
       Left = 242
       Top = 0
-      Hint = 'Stop stream'
-      Caption = 'Stop'
-      Enabled = False
-      ImageIndex = 4
-      OnClick = ToolButtonStopClick
+      Action = StopAction
     end
     object ToolButtonEject: TToolButton
       Left = 281
       Top = 0
-      Hint = 'Eject disc'
-      Caption = 'Eject'
-      Enabled = False
-      ImageIndex = 7
-      OnClick = ToolButtonEjectClick
+      Action = EjectAction
     end
     object ToolButton1: TToolButton
       Left = 320
@@ -236,20 +209,12 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonSlow: TToolButton
       Left = 328
       Top = 0
-      Hint = 'Play slower'
-      Caption = 'Slow'
-      Enabled = False
-      ImageIndex = 8
-      OnClick = ToolButtonSlowClick
+      Action = SlowAction
     end
     object ToolButtonFast: TToolButton
       Left = 367
       Top = 0
-      Hint = 'Play faster'
-      Caption = 'Fast'
-      Enabled = False
-      ImageIndex = 9
-      OnClick = ToolButtonFastClick
+      Action = FastAction
     end
     object ToolButtonSep2: TToolButton
       Left = 406
@@ -262,27 +227,18 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonPlaylist: TToolButton
       Left = 414
       Top = 0
-      Hint = 'Open playlist'
-      Caption = 'Playlist'
-      ImageIndex = 10
+      Action = PlaylistAction
       Style = tbsCheck
-      OnClick = ToolButtonPlaylistClick
     end
     object ToolButtonPrev: TToolButton
       Left = 453
       Top = 0
-      Hint = 'Previous file'
-      Caption = 'Prev'
-      ImageIndex = 11
-      OnClick = ToolButtonPrevClick
+      Action = PreviousAction
     end
     object ToolButtonNext: TToolButton
       Left = 492
       Top = 0
-      Hint = 'Next file'
-      Caption = 'Next'
-      ImageIndex = 12
-      OnClick = ToolButtonNextClick
+      Action = NextAction
     end
   end
   object StatusBar: TStatusBar
@@ -403,40 +359,32 @@ object MainFrameDlg: TMainFrameDlg
       Top = 8
       Width = 33
       Height = 19
-      Hint = 'Jump to previous title'
-      Caption = 'Prev'
+      Action = PrevTitleAction
       TabOrder = 0
-      OnClick = ButtonTitlePrevClick
     end
     object ButtonTitleNext: TButton
       Left = 184
       Top = 8
       Width = 33
       Height = 19
-      Hint = 'Jump to next title'
-      Caption = 'Next'
+      Action = NextTitleAction
       TabOrder = 1
-      OnClick = ButtonTitleNextClick
     end
     object ButtonChapterPrev: TButton
       Left = 368
       Top = 8
       Width = 33
       Height = 19
-      Hint = 'Jump to previous chapter'
-      Caption = 'Prev'
+      Action = PrevChapterAction
       TabOrder = 2
-      OnClick = ButtonChapterPrevClick
     end
     object ButtonChapterNext: TButton
       Left = 400
       Top = 8
       Width = 33
       Height = 19
-      Hint = 'Jump to next chapter'
-      Caption = 'Next'
+      Action = NextChapterAction
       TabOrder = 3
-      OnClick = ButtonChapterNextClick
     end
   end
   object GroupBoxSlider: TGroupBox
@@ -471,41 +419,30 @@ object MainFrameDlg: TMainFrameDlg
     object MenuFile: TMenuItem
       Caption = '&File'
       object MenuOpenFile: TMenuItem
-        Caption = '&Open file...'
-        Hint = 'Open a file'
-        ShortCut = 114
-        OnClick = MenuOpenFileClick
+        Action = OpenFileAction
+        Caption = 'Open &file...'
       end
       object MenuOpenDisc: TMenuItem
+        Action = OpenDiscAction
         Caption = 'Open &disc...'
-        Hint = 'Open a DVD or VCD'
-        ShortCut = 115
-        OnClick = MenuOpenDiscClick
       end
       object MenuNetworkStream: TMenuItem
+        Action = NetworkStreamAction
         Caption = '&Network stream...'
-        Hint = 'Select a network stream'
-        ShortCut = 116
-        OnClick = MenuNetworkStreamClick
       end
       object N8: TMenuItem
         Caption = '-'
         Visible = False
       end
       object MenuEjectDisc: TMenuItem
-        Caption = '&Eject Disc'
-        Hint = 'Eject disc'
-        Visible = False
-        OnClick = ToolButtonEjectClick
+        Action = EjectAction
+        Caption = '&Eject disc'
       end
       object N1: TMenuItem
         Caption = '-'
       end
       object MenuExit: TMenuItem
-        Caption = 'E&xit'
-        Hint = 'Exit the program'
-        ShortCut = 16465
-        OnClick = MenuExitClick
+        Action = ExitAction
       end
     end
     object MenuView: TMenuItem
@@ -516,9 +453,7 @@ object MainFrameDlg: TMainFrameDlg
         OnClick = MenuHideinterfaceClick
       end
       object MenuFullscreen: TMenuItem
-        Caption = '&Fullscreen'
-        Hint = 'Toggle fullscreen'
-        OnClick = MenuFullscreenClick
+        Action = FullscreenAction
       end
       object N2: TMenuItem
         Caption = '-'
@@ -547,19 +482,11 @@ object MainFrameDlg: TMainFrameDlg
         Caption = '-'
       end
       object MenuPlaylist: TMenuItem
+        Action = PlaylistAction
         Caption = '&Playlist...'
-        Hint = 'Open the playlist window'
-        OnClick = MenuPlaylistClick
-      end
-      object MenuModules: TMenuItem
-        Caption = '&Modules...'
-        Enabled = False
-        Hint = 'Open the modules window'
       end
       object MenuMessages: TMenuItem
-        Caption = 'Me&ssages...'
-        Hint = 'Open the messages window'
-        OnClick = MenuMessagesClick
+        Action = MessagesAction
       end
     end
     object MenuSettings: TMenuItem
@@ -578,17 +505,13 @@ object MainFrameDlg: TMainFrameDlg
         Caption = '-'
       end
       object MenuPreferences: TMenuItem
-        Caption = '&Preferences...'
-        Hint = 'Configure the application'
-        OnClick = MenuPreferencesClick
+        Action = PreferencesAction
       end
     end
     object MenuHelp: TMenuItem
       Caption = '&Help'
       object MenuAbout: TMenuItem
-        Caption = '&About...'
-        Hint = 'About this application'
-        OnClick = MenuAboutClick
+        Action = AboutAction
       end
     end
   end
@@ -2334,100 +2257,96 @@ object MainFrameDlg: TMainFrameDlg
       Caption = '&Close this popup'
       OnClick = PopupCloseClick
     end
-    object N9: TMenuItem
-      Caption = '-'
-    end
-    object PopupPlay: TMenuItem
-      Caption = '&Play'
-      OnClick = PopupPlayClick
-    end
-    object PopupPause: TMenuItem
-      Caption = 'Pause'
-      OnClick = PopupPauseClick
-    end
-    object PopupStop: TMenuItem
-      Caption = 'Stop'
-      OnClick = PopupStopClick
-    end
-    object PopupBack: TMenuItem
-      Caption = 'Back'
-      OnClick = PopupBackClick
-    end
-    object PopupSlow: TMenuItem
-      Caption = 'Slow'
-      OnClick = PopupSlowClick
-    end
-    object PopupFast: TMenuItem
-      Caption = 'Fast'
-      OnClick = PopupFastClick
-    end
-    object N5: TMenuItem
-      Caption = '-'
-    end
     object PopupToggleInterface: TMenuItem
-      Caption = 'Toggle &Interface'
+      Caption = '&Toggle interface'
       OnClick = PopupToggleInterfaceClick
     end
-    object PopupFullscreen: TMenuItem
-      Caption = '&Fullscreen'
-      OnClick = PopupFullscreenClick
-    end
-    object N6: TMenuItem
+    object N9: TMenuItem
       Caption = '-'
     end
-    object PopupNext: TMenuItem
-      Caption = 'Next'
-      OnClick = PopupNextClick
-    end
-    object PopupPrev: TMenuItem
-      Caption = 'Prev'
-      OnClick = PopupPrevClick
+    object Control1: TMenuItem
+      Caption = 'Control'
+      object PopupBack: TMenuItem
+        Action = BackAction
+      end
+      object PopupPlay: TMenuItem
+        Action = PlayAction
+      end
+      object PopupPause: TMenuItem
+        Action = PauseAction
+      end
+      object PopupStop: TMenuItem
+        Action = StopAction
+      end
+      object PopupSlow: TMenuItem
+        Action = SlowAction
+      end
+      object PopupFast: TMenuItem
+        Action = FastAction
+      end
+      object N5: TMenuItem
+        Caption = '-'
+      end
+      object PopupPrev: TMenuItem
+        Action = PreviousAction
+      end
+      object PopupNext: TMenuItem
+        Action = NextAction
+      end
+      object PopupJump: TMenuItem
+        Caption = '&Jump...'
+        OnClick = PopupJumpClick
+      end
+      object N6: TMenuItem
+        Caption = '-'
+      end
+      object PopupFullscreen: TMenuItem
+        Action = FullscreenAction
+        ShortCut = 70
+      end
     end
-    object PopupJump: TMenuItem
-      Caption = '&Jump...'
-      OnClick = PopupJumpClick
+    object PopupNavigation: TMenuItem
+      Caption = 'Navigation'
     end
     object PopupProgram: TMenuItem
       Caption = 'Program'
     end
-    object PopupNavigation: TMenuItem
-      Caption = 'Navigation'
-    end
     object PopupAudio: TMenuItem
       Caption = 'Audio'
     end
     object PopupSubtitles: TMenuItem
       Caption = 'Subtitles'
     end
+    object N10: TMenuItem
+      Caption = '-'
+    end
+    object PopupPlaylist: TMenuItem
+      Action = PlaylistAction
+      Caption = 'Playlist...'
+    end
+    object PopupPreferences: TMenuItem
+      Action = PreferencesAction
+    end
     object PopupFile: TMenuItem
-      Caption = 'File'
+      Caption = 'New stream'
       object PopupOpenFile: TMenuItem
+        Action = OpenFileAction
         Caption = 'Open file...'
-        OnClick = PopupOpenFileClick
       end
       object PopupOpenDisc: TMenuItem
+        Action = OpenDiscAction
         Caption = 'Open disc...'
-        OnClick = PopupOpenDiscClick
       end
       object PopupNetworkStream: TMenuItem
+        Action = NetworkStreamAction
         Caption = 'Network stream...'
-        OnClick = PopupNetworkStreamClick
       end
     end
-    object PopupPlaylist: TMenuItem
-      Caption = 'Playlist...'
-      OnClick = PopupPlaylistClick
-    end
-    object PopupPreferences: TMenuItem
-      Caption = 'Preferences...'
-      OnClick = PopupPreferencesClick
-    end
     object N7: TMenuItem
       Caption = '-'
     end
     object PopupExit: TMenuItem
-      Caption = 'E&xit'
-      OnClick = PopupExitClick
+      Action = ExitAction
     end
   end
   object TimerManage: TTimer
@@ -2435,4 +2354,164 @@ object MainFrameDlg: TMainFrameDlg
     Left = 136
     Top = 208
   end
+  object ActionList1: TActionList
+    Left = 168
+    Top = 208
+    object OpenFileAction: TAction
+      Category = 'Menu'
+      Caption = 'File'
+      Hint = 'Open a file'
+      ImageIndex = 0
+      ShortCut = 114
+      OnExecute = OpenFileActionExecute
+    end
+    object OpenDiscAction: TAction
+      Category = 'Menu'
+      Caption = 'Disc'
+      Hint = 'Open a DVD or VCD'
+      ImageIndex = 1
+      ShortCut = 115
+      OnExecute = OpenDiscActionExecute
+    end
+    object NetworkStreamAction: TAction
+      Category = 'Menu'
+      Caption = 'Net'
+      Hint = 'Open a network stream'
+      ImageIndex = 2
+      ShortCut = 116
+      OnExecute = NetworkStreamActionExecute
+    end
+    object BackAction: TAction
+      Category = 'Control'
+      Caption = 'Back'
+      Enabled = False
+      ImageIndex = 3
+      OnExecute = BackActionExecute
+    end
+    object PlayAction: TAction
+      Category = 'Control'
+      Caption = 'Play'
+      Hint = 'Play stream'
+      ImageIndex = 5
+      OnExecute = PlayActionExecute
+    end
+    object PauseAction: TAction
+      Category = 'Control'
+      Caption = 'Pause'
+      Enabled = False
+      Hint = 'Pause stream'
+      ImageIndex = 6
+      OnExecute = PauseActionExecute
+    end
+    object StopAction: TAction
+      Category = 'Control'
+      Caption = 'Stop'
+      Enabled = False
+      Hint = 'Stop stream'
+      ImageIndex = 4
+      OnExecute = StopActionExecute
+    end
+    object EjectAction: TAction
+      Category = 'Control'
+      Caption = 'Eject'
+      Enabled = False
+      Hint = 'Eject disc'
+      ImageIndex = 7
+      OnExecute = EjectActionExecute
+    end
+    object SlowAction: TAction
+      Category = 'Control'
+      Caption = 'Slow'
+      Enabled = False
+      Hint = 'Play slower'
+      ImageIndex = 8
+      OnExecute = SlowActionExecute
+    end
+    object FastAction: TAction
+      Category = 'Control'
+      Caption = 'Fast'
+      Enabled = False
+      Hint = 'Play faster'
+      ImageIndex = 9
+      OnExecute = FastActionExecute
+    end
+    object PreviousAction: TAction
+      Category = 'Control'
+      Caption = 'Prev'
+      Hint = 'Previous file'
+      ImageIndex = 11
+      OnExecute = PreviousActionExecute
+    end
+    object NextAction: TAction
+      Category = 'Control'
+      Caption = 'Next'
+      Hint = 'Next file'
+      ImageIndex = 12
+      OnExecute = NextActionExecute
+    end
+    object PlaylistAction: TAction
+      Category = 'Menu'
+      Caption = 'Playlist'
+      Hint = 'Open the playlist window'
+      ImageIndex = 10
+      ShortCut = 16464
+      OnExecute = PlaylistActionExecute
+    end
+    object ExitAction: TAction
+      Category = 'Menu'
+      Caption = 'Exit'
+      Hint = 'Exit the program'
+      ShortCut = 16465
+      OnExecute = ExitActionExecute
+    end
+    object FullscreenAction: TAction
+      Category = 'Control'
+      Caption = 'Fullscreen'
+      Hint = 'Toggle fullscreen'
+      OnExecute = FullscreenActionExecute
+    end
+    object PreferencesAction: TAction
+      Category = 'Menu'
+      Caption = 'Preferences...'
+      Hint = 'Configure the application'
+      OnExecute = PreferencesActionExecute
+    end
+    object MessagesAction: TAction
+      Category = 'Menu'
+      Caption = 'Messages...'
+      Hint = 'Open the messages window'
+      ShortCut = 16461
+      OnExecute = MessagesActionExecute
+    end
+    object AboutAction: TAction
+      Category = 'Menu'
+      Caption = 'About...'
+      Hint = 'About this application'
+      OnExecute = AboutActionExecute
+    end
+    object PrevTitleAction: TAction
+      Category = 'Control'
+      Caption = 'Prev'
+      Hint = 'Jump to previous title'
+      OnExecute = PrevTitleActionExecute
+    end
+    object NextTitleAction: TAction
+      Category = 'Control'
+      Caption = 'Next'
+      Hint = 'Jump to next title'
+      OnExecute = NextTitleActionExecute
+    end
+    object PrevChapterAction: TAction
+      Category = 'Control'
+      Caption = 'Prev'
+      Hint = 'Jump to previous chapter'
+      OnExecute = PrevChapterActionExecute
+    end
+    object NextChapterAction: TAction
+      Category = 'Control'
+      Caption = 'Next'
+      Hint = 'Jump to next chapter'
+      OnExecute = NextChapterActionExecute
+    end
+  end
 end

modules/gui/win32/mainframe.h

@@ -36,6 +36,7 @@
 #include <AppEvnts.hpp>
 #include <ExtCtrls.hpp>
 #include "CSPIN.h"
+#include <ActnList.hpp>
 //---------------------------------------------------------------------------
 class TMainFrameDlg : public TForm
 {
@@ -72,7 +73,6 @@ __published:	// IDE-managed Components
     TMenuItem *MenuAngle;
     TMenuItem *N3;
     TMenuItem *MenuPlaylist;
-    TMenuItem *MenuModules;
     TMenuItem *MenuMessages;
     TMenuItem *MenuSettings;
     TMenuItem *MenuAudio;
@@ -90,10 +90,8 @@ __published:	// IDE-managed Components
     TMenuItem *PopupBack;
     TMenuItem *PopupSlow;
     TMenuItem *PopupFast;
-    TMenuItem *N5;
     TMenuItem *PopupToggleInterface;
     TMenuItem *PopupFullscreen;
-    TMenuItem *N6;
     TMenuItem *PopupNext;
     TMenuItem *PopupPrev;
     TMenuItem *PopupJump;
@@ -135,56 +133,64 @@ __published:	// IDE-managed Components
     TMenuItem *PopupClose;
     TMenuItem *N9;
     TCSpinEdit *SpinEditChannel;
-        TToolButton *ToolButton1;
+    TToolButton *ToolButton1;
+    TActionList *ActionList1;
+    TAction *OpenFileAction;
+    TAction *OpenDiscAction;
+    TAction *NetworkStreamAction;
+    TAction *PlayAction;
+    TAction *PauseAction;
+    TAction *StopAction;
+    TAction *EjectAction;
+    TAction *SlowAction;
+    TAction *FastAction;
+    TAction *PreviousAction;
+    TAction *NextAction;
+    TAction *BackAction;
+    TAction *PlaylistAction;
+    TAction *ExitAction;
+    TAction *FullscreenAction;
+    TAction *PreferencesAction;
+    TAction *MessagesAction;
+    TAction *AboutAction;
+    TMenuItem *Control1;
+    TMenuItem *N5;
+    TMenuItem *N6;
+    TMenuItem *N10;
+    TAction *PrevTitleAction;
+    TAction *NextTitleAction;
+    TAction *PrevChapterAction;
+    TAction *NextChapterAction;
     void __fastcall TimerManageTimer( TObject *Sender );
     void __fastcall TrackBarChange( TObject *Sender );
     void __fastcall FormClose( TObject *Sender, TCloseAction &Action );
-    void __fastcall MenuOpenFileClick( TObject *Sender );
-    void __fastcall MenuOpenDiscClick( TObject *Sender );
-    void __fastcall MenuNetworkStreamClick( TObject *Sender );
-    void __fastcall MenuExitClick( TObject *Sender );
     void __fastcall MenuHideinterfaceClick( TObject *Sender );
-    void __fastcall MenuFullscreenClick( TObject *Sender );
-    void __fastcall MenuPlaylistClick( TObject *Sender );
-    void __fastcall MenuMessagesClick( TObject *Sender );
-    void __fastcall MenuPreferencesClick( TObject *Sender );
-    void __fastcall MenuAboutClick( TObject *Sender );
-    void __fastcall ToolButtonFileClick( TObject *Sender );
-    void __fastcall ToolButtonDiscClick( TObject *Sender );
-    void __fastcall ToolButtonNetClick( TObject *Sender );
-    void __fastcall ToolButtonPlaylistClick( TObject *Sender );
-    void __fastcall ToolButtonBackClick( TObject *Sender );
-    void __fastcall ToolButtonStopClick( TObject *Sender );
-    void __fastcall ToolButtonPlayClick( TObject *Sender );
-    void __fastcall ToolButtonPauseClick( TObject *Sender );
-    void __fastcall ToolButtonSlowClick( TObject *Sender );
-    void __fastcall ToolButtonFastClick( TObject *Sender );
-    void __fastcall ToolButtonPrevClick( TObject *Sender );
-    void __fastcall ToolButtonNextClick( TObject *Sender );
-    void __fastcall ToolButtonEjectClick( TObject *Sender );
     void __fastcall PopupCloseClick( TObject *Sender );
-    void __fastcall PopupPlayClick( TObject *Sender );
-    void __fastcall PopupPauseClick( TObject *Sender );
-    void __fastcall PopupStopClick( TObject *Sender );
-    void __fastcall PopupBackClick( TObject *Sender );
-    void __fastcall PopupSlowClick( TObject *Sender );
-    void __fastcall PopupFastClick( TObject *Sender );
     void __fastcall PopupToggleInterfaceClick( TObject *Sender );
-    void __fastcall PopupFullscreenClick( TObject *Sender );
-    void __fastcall PopupNextClick( TObject *Sender );
-    void __fastcall PopupPrevClick( TObject *Sender );
     void __fastcall PopupJumpClick( TObject *Sender );
-    void __fastcall PopupPlaylistClick( TObject *Sender );
-    void __fastcall PopupPreferencesClick( TObject *Sender );
-    void __fastcall PopupExitClick( TObject *Sender );
-    void __fastcall PopupOpenFileClick( TObject *Sender );
-    void __fastcall PopupOpenDiscClick( TObject *Sender );
-    void __fastcall PopupNetworkStreamClick( TObject *Sender );
-    void __fastcall ButtonTitlePrevClick( TObject *Sender );
-    void __fastcall ButtonTitleNextClick( TObject *Sender );
-    void __fastcall ButtonChapterPrevClick( TObject *Sender );
-    void __fastcall ButtonChapterNextClick( TObject *Sender );
     void __fastcall ButtonGoClick( TObject *Sender );
+    void __fastcall OpenFileActionExecute( TObject *Sender );
+    void __fastcall OpenDiscActionExecute( TObject *Sender );
+    void __fastcall NetworkStreamActionExecute( TObject *Sender );
+    void __fastcall BackActionExecute( TObject *Sender );
+    void __fastcall PlayActionExecute( TObject *Sender );
+    void __fastcall PauseActionExecute( TObject *Sender );
+    void __fastcall StopActionExecute( TObject *Sender );
+    void __fastcall SlowActionExecute( TObject *Sender );
+    void __fastcall FastActionExecute( TObject *Sender );
+    void __fastcall PlaylistActionExecute( TObject *Sender );
+    void __fastcall ExitActionExecute( TObject *Sender );
+    void __fastcall PreviousActionExecute( TObject *Sender );
+    void __fastcall NextActionExecute( TObject *Sender );
+    void __fastcall FullscreenActionExecute( TObject *Sender );
+    void __fastcall PreferencesActionExecute( TObject *Sender );
+    void __fastcall MessagesActionExecute( TObject *Sender );
+    void __fastcall AboutActionExecute( TObject *Sender );
+    void __fastcall EjectActionExecute( TObject *Sender );
+    void __fastcall PrevTitleActionExecute( TObject *Sender );
+    void __fastcall NextTitleActionExecute( TObject *Sender );
+    void __fastcall PrevChapterActionExecute( TObject *Sender );
+    void __fastcall NextChapterActionExecute( TObject *Sender );
 private:	// User declarations
 public:		// User declarations
     TStringList *StringListPref;                   /* stores config dialogs */

modules/gui/win32/messages.cpp

@@ -49,12 +49,12 @@ void __fastcall TMessagesDlg::ButtonOKClick( TObject *Sender )
 //---------------------------------------------------------------------------
 void __fastcall TMessagesDlg::FormHide( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuMessages->Checked = false;
+    p_intfGlobal->p_sys->p_window->MessagesAction->Checked = false;
 }
 //---------------------------------------------------------------------------
 void __fastcall TMessagesDlg::FormShow( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuMessages->Checked = true;
+    p_intfGlobal->p_sys->p_window->MessagesAction->Checked = true;
 }
 //---------------------------------------------------------------------------
 void __fastcall TMessagesDlg::UpdateLog()
@@ -80,10 +80,10 @@ void __fastcall TMessagesDlg::UpdateLog()
                 RichEditMessages->SelAttributes->Color = clRed;
                 break;
             case VLC_MSG_WARN:
-                RichEditMessages->SelAttributes->Color = clBlack;
+                RichEditMessages->SelAttributes->Color = clBlue;
                 break;
             default:
-                RichEditMessages->SelAttributes->Color = clBlue;
+                RichEditMessages->SelAttributes->Color = clBlack;
                 break;
             }
 

modules/gui/win32/network.cpp

@@ -69,14 +69,12 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
 //---------------------------------------------------------------------------
 void __fastcall TNetworkDlg::FormShow( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuNetworkStream->Checked = true;
-    p_intfGlobal->p_sys->p_window->PopupNetworkStream->Checked = true;
+    p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = true;
 }
 //---------------------------------------------------------------------------
 void __fastcall TNetworkDlg::FormHide( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuNetworkStream->Checked = false;
-    p_intfGlobal->p_sys->p_window->PopupNetworkStream->Checked = false;
+    p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = false;
 }
 //---------------------------------------------------------------------------
 void __fastcall TNetworkDlg::BitBtnCancelClick( TObject *Sender )

modules/gui/win32/playlist.cpp

@@ -68,16 +68,12 @@ char * __fastcall TPlaylistDlg::rindex( char *s, char c )
  ****************************************************************************/
 void __fastcall TPlaylistDlg::FormShow( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = true;
-    p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = true;
-    p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = true;
+    p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = true;
 }
 //---------------------------------------------------------------------------
 void __fastcall TPlaylistDlg::FormHide( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = false;
-    p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = false;
-    p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = false;
+    p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = false;
 }
 //---------------------------------------------------------------------------
 void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender )
@@ -85,7 +81,7 @@ void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender )
     Hide();
 }
 //---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::ListViewPlaylistDblClick( TObject *Sender )
+void __fastcall TPlaylistDlg::PlayStreamActionExecute( TObject *Sender )
 {
     TListItem *Item;
     TListItem *ItemStart;
@@ -125,13 +121,13 @@ void __fastcall TPlaylistDlg::ListViewPlaylistKeyDown( TObject *Sender,
     /* 'suppr' or 'backspace' */
     if( ( Key == VK_DELETE ) || ( Key == VK_BACK ) )
     {
-        MenuDeleteSelectedClick( Sender );
+        DeleteSelectionActionExecute( Sender );
     }
 
     /* 'enter' */
     if( Key == VK_RETURN )
     {
-        PopupPlayClick( Sender );
+        PlayStreamActionExecute( Sender );
     }
 }
 //---------------------------------------------------------------------------
@@ -157,21 +153,21 @@ void __fastcall TPlaylistDlg::ListViewPlaylistCustomDrawItem(
 
 
 /*****************************************************************************
- * Menu callbacks
+ * Menu and popup callbacks
  ****************************************************************************/
 void __fastcall TPlaylistDlg::MenuAddFileClick( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );
+    p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );
 }
 //---------------------------------------------------------------------------
 void __fastcall TPlaylistDlg::MenuAddDiscClick( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuOpenDiscClick( Sender );
+    p_intfGlobal->p_sys->p_window->OpenDiscActionExecute( Sender );
 }
 //---------------------------------------------------------------------------
 void __fastcall TPlaylistDlg::MenuAddNetClick( TObject *Sender )
 {
-    p_intfGlobal->p_sys->p_window->MenuNetworkStreamClick( Sender );
+    p_intfGlobal->p_sys->p_window->NetworkStreamActionExecute( Sender );
 }
 //---------------------------------------------------------------------------
 void __fastcall TPlaylistDlg::MenuAddUrlClick( TObject *Sender )
@@ -179,7 +175,7 @@ void __fastcall TPlaylistDlg::MenuAddUrlClick( TObject *Sender )
     /* TODO */
 }
 //---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::MenuDeleteSelectedClick( TObject *Sender )
+void __fastcall TPlaylistDlg::DeleteSelectionActionExecute( TObject *Sender )
 {
 #if 0 /* PLAYLIST TARASS */
     /* user wants to delete a file in the queue */
@@ -205,7 +201,7 @@ void __fastcall TPlaylistDlg::MenuDeleteSelectedClick( TObject *Sender )
 #endif
 }
 //---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::MenuDeleteAllClick( TObject *Sender )
+void __fastcall TPlaylistDlg::DeleteAllActionExecute( TObject *Sender )
 {
 #if 0 /* PLAYLIST TARASS */
     int         i_pos;
@@ -227,7 +223,7 @@ void __fastcall TPlaylistDlg::MenuDeleteAllClick( TObject *Sender )
 #endif
 }
 //---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::MenuSelectionInvertClick( TObject *Sender )
+void __fastcall TPlaylistDlg::InvertSelectionActionExecute( TObject *Sender )
 {
 #if 0 /* PLAYLIST TARASS */
 #define NOT( var ) ( (var) ? false : true )
@@ -244,40 +240,10 @@ void __fastcall TPlaylistDlg::MenuSelectionInvertClick( TObject *Sender )
 #endif
 }
 //---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::MenuSelectionCropClick( TObject *Sender )
+void __fastcall TPlaylistDlg::CropSelectionActionExecute( TObject *Sender )
 {
-    MenuSelectionInvertClick( Sender );
-    MenuDeleteSelectedClick( Sender );
-}
-//---------------------------------------------------------------------------
-
-
-/*****************************************************************************
- * Popup callbacks
- ****************************************************************************/
-void __fastcall TPlaylistDlg::PopupPlayClick( TObject *Sender )
-{
-    ListViewPlaylistDblClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::PopupInvertSelectionClick( TObject *Sender )
-{
-    MenuSelectionInvertClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::PopupCropSelectionClick( TObject *Sender )
-{
-    MenuSelectionCropClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::PopupDeleteSelectedClick( TObject *Sender )
-{
-    MenuDeleteSelectedClick( Sender );
-}
-//---------------------------------------------------------------------------
-void __fastcall TPlaylistDlg::PopupDeleteAllClick( TObject *Sender )
-{
-    MenuDeleteAllClick( Sender );
+    InvertSelectionActionExecute( Sender );
+    DeleteSelectionActionExecute( Sender );
 }
 //---------------------------------------------------------------------------
 

modules/gui/win32/playlist.dfm

 object PlaylistDlg: TPlaylistDlg
-  Left = 447
-  Top = 197
+  Left = 162
+  Top = 364
   Width = 335
   Height = 436
   Caption = 'Playlist'
@@ -51,11 +51,11 @@ object PlaylistDlg: TPlaylistDlg
     TabOrder = 1
     ViewStyle = vsReport
     OnCustomDrawItem = ListViewPlaylistCustomDrawItem
-    OnDblClick = ListViewPlaylistDblClick
+    OnDblClick = PlayStreamActionExecute
     OnKeyDown = ListViewPlaylistKeyDown
   end
   object MainMenuPlaylist: TMainMenu
-    Left = 24
+    Left = 8
     Top = 352
     object MenuAdd: TMenuItem
       Caption = '&Add'
@@ -80,54 +80,79 @@ object PlaylistDlg: TPlaylistDlg
     object MenuDelete: TMenuItem
       Caption = '&Delete'
       object MenuDeleteAll: TMenuItem
-        Caption = '&All'
-        OnClick = MenuDeleteAllClick
+        Action = DeleteAllAction
       end
       object MenuDeleteSelected: TMenuItem
-        Caption = '&Selected'
-        OnClick = MenuDeleteSelectedClick
+        Action = DeleteSelectionAction
+        Caption = '&Selection'
       end
     end
     object MenuSelection: TMenuItem
       Caption = '&Selection'
       object MenuSelectionCrop: TMenuItem
-        Caption = '&Crop'
-        OnClick = MenuSelectionCropClick
+        Action = CropSelectionAction
       end
       object MenuSelectionInvert: TMenuItem
-        Caption = '&Invert'
-        OnClick = MenuSelectionInvertClick
+        Action = InvertSelectionAction
       end
     end
   end
   object PopupMenuPlaylist: TPopupMenu
-    Left = 272
+    Left = 40
     Top = 352
     object PopupPlay: TMenuItem
-      Caption = '&Play'
-      OnClick = PopupPlayClick
+      Action = PlayStreamAction
     end
     object N1: TMenuItem
       Caption = '-'
     end
     object PopupInvertSelection: TMenuItem
+      Action = InvertSelectionAction
       Caption = '&Invert selection'
-      OnClick = PopupInvertSelectionClick
     end
     object PopupCropSelection: TMenuItem
+      Action = CropSelectionAction
       Caption = '&Crop selection'
-      OnClick = PopupCropSelectionClick
     end
     object N2: TMenuItem
       Caption = '-'
     end
     object PopupDeleteSelected: TMenuItem
-      Caption = '&Delete selected'
-      OnClick = PopupDeleteSelectedClick
+      Action = DeleteSelectionAction
+      Caption = '&Delete selection'
     end
     object PopupDeleteAll: TMenuItem
+      Action = DeleteAllAction
       Caption = 'Delete &all'
-      OnClick = PopupDeleteAllClick
+    end
+  end
+  object ActionList1: TActionList
+    Left = 264
+    Top = 352
+    object InvertSelectionAction: TAction
+      Caption = 'Invert'
+      Hint = 'Invert selection'
+      OnExecute = InvertSelectionActionExecute
+    end
+    object CropSelectionAction: TAction
+      Caption = 'Crop'
+      Hint = 'Crop selection'
+      OnExecute = CropSelectionActionExecute
+    end
+    object DeleteSelectionAction: TAction
+      Caption = 'Delete'
+      Hint = 'Delete selection'
+      OnExecute = DeleteSelectionActionExecute
+    end
+    object DeleteAllAction: TAction
+      Caption = 'All'
+      Hint = 'Delete all items'
+      OnExecute = DeleteAllActionExecute
+    end
+    object PlayStreamAction: TAction
+      Caption = 'Play'
+      Hint = 'Play the selected stream'
+      OnExecute = PlayStreamActionExecute
     end
   end
 end

modules/gui/win32/playlist.h

@@ -31,6 +31,7 @@
 #include <Menus.hpp>
 #include <Grids.hpp>
 #include <ComCtrls.hpp>
+#include <ActnList.hpp>
 
 //---------------------------------------------------------------------------
 class TPlaylistDlg : public TForm
@@ -58,10 +59,15 @@ __published:	// IDE-managed Components
     TMenuItem *N2;
     TMenuItem *PopupInvertSelection;
     TMenuItem *PopupCropSelection;
+    TActionList *ActionList1;
+    TAction *InvertSelectionAction;
+    TAction *CropSelectionAction;
+    TAction *DeleteSelectionAction;
+    TAction *DeleteAllAction;
+    TAction *PlayStreamAction;
     void __fastcall FormShow( TObject *Sender );
     void __fastcall FormHide( TObject *Sender );
     void __fastcall BitBtnOkClick( TObject *Sender );
-    void __fastcall ListViewPlaylistDblClick( TObject *Sender );
     void __fastcall ListViewPlaylistKeyDown( TObject *Sender, WORD &Key,
             TShiftState Shift );
     void __fastcall ListViewPlaylistCustomDrawItem( TCustomListView *Sender,
@@ -70,15 +76,11 @@ __published:	// IDE-managed Components
     void __fastcall MenuAddDiscClick( TObject *Sender );
     void __fastcall MenuAddNetClick( TObject *Sender );
     void __fastcall MenuAddUrlClick( TObject *Sender );
-    void __fastcall MenuDeleteSelectedClick( TObject *Sender );
-    void __fastcall MenuDeleteAllClick( TObject *Sender );
-    void __fastcall MenuSelectionInvertClick( TObject *Sender );
-    void __fastcall MenuSelectionCropClick( TObject *Sender );
-    void __fastcall PopupPlayClick( TObject *Sender );
-    void __fastcall PopupInvertSelectionClick( TObject *Sender );
-    void __fastcall PopupCropSelectionClick( TObject *Sender );
-    void __fastcall PopupDeleteSelectedClick( TObject *Sender );
-    void __fastcall PopupDeleteAllClick( TObject *Sender );
+    void __fastcall InvertSelectionActionExecute( TObject *Sender );
+    void __fastcall CropSelectionActionExecute( TObject *Sender );
+    void __fastcall DeleteSelectionActionExecute( TObject *Sender );
+    void __fastcall DeleteAllActionExecute( TObject *Sender );
+    void __fastcall PlayStreamActionExecute( TObject *Sender );
 private:	// User declarations
     char * __fastcall rindex( char *s, char c );
 public:		// User declarations

modules/gui/win32/preferences.cpp

@@ -334,16 +334,14 @@ void __fastcall TPreferencesDlg::FormClose( TObject *Sender,
 void __fastcall TPreferencesDlg::FormShow( TObject *Sender )
 {
 /*
-    p_intfGlobal->p_sys->p_window->MenuPreferences->Checked = true;
-    p_intfGlobal->p_sys->p_window->PopupPreferences->Checked = true;
+    p_intfGlobal->p_sys->p_window->PreferencesAction->Checked = true;
 */
 }
 //---------------------------------------------------------------------------
 void __fastcall TPreferencesDlg::FormHide( TObject *Sender )
 {
 /*
-    p_intfGlobal->p_sys->p_window->MenuPreferences->Checked = false;
-    p_intfGlobal->p_sys->p_window->PopupPreferences->Checked = false;
+    p_intfGlobal->p_sys->p_window->PreferencesAction->Checked = false;
 */
 }