WordWrap = True\r
end\r
object Label3: TLabel\r
- Left = 38\r
+ Left = 30\r
Top = 80\r
Width = 227\r
Height = 13\r
Height = 49\r
end\r
object Label5: TLabel\r
- Left = 82\r
+ Left = 83\r
Top = 96\r
Width = 121\r
Height = 13\r
vlc_object_find( p_intfGlobal, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );\r
if( p_playlist == NULL )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );\r
+ p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );\r
return false;\r
}\r
\r
{\r
vlc_mutex_unlock( &p_playlist->object_lock );\r
vlc_object_release( p_playlist );\r
- p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );\r
+ p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );\r
}\r
\r
return true;\r
//---------------------------------------------------------------------------\r
void __fastcall TDiscDlg::FormShow( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuOpenDisc->Checked = true;\r
- p_intfGlobal->p_sys->p_window->PopupOpenDisc->Checked = true;\r
+ p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = true;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TDiscDlg::FormHide( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuOpenDisc->Checked = false;\r
- p_intfGlobal->p_sys->p_window->PopupOpenDisc->Checked = false;\r
+ p_intfGlobal->p_sys->p_window->OpenDiscAction->Checked = false;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TDiscDlg::BitBtnCancelClick( TObject *Sender )\r
\r
\r
/*****************************************************************************\r
- * Menu callbacks\r
+ * Main callbacks\r
****************************************************************************/\r
-void __fastcall TMainFrameDlg::MenuOpenFileClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::OpenFileActionExecute( TObject *Sender )\r
{\r
AnsiString FileName;\r
playlist_t * p_playlist;\r
vlc_object_release( p_playlist );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuOpenDiscClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::OpenDiscActionExecute( TObject *Sender )\r
{\r
TDiscDlg *p_disc = p_intfGlobal->p_sys->p_disc;\r
if( p_disc == NULL )\r
p_disc->Show();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuNetworkStreamClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::NetworkStreamActionExecute( TObject *Sender )\r
{\r
TNetworkDlg *p_network = p_intfGlobal->p_sys->p_network;\r
if( p_network == NULL )\r
p_network->Show();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuExitClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::ExitActionExecute( TObject *Sender )\r
{\r
Close();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuHideinterfaceClick( TObject *Sender )\r
-{\r
- this->SendToBack();\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuFullscreenClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::FullscreenActionExecute( TObject *Sender )\r
{\r
vout_thread_t *p_vout;\r
\r
vlc_object_release( p_vout );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuPlaylistClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PlaylistActionExecute( TObject *Sender )\r
{\r
TPlaylistDlg *p_playwin = p_intfGlobal->p_sys->p_playwin;\r
if( p_playwin->Visible )\r
}\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuMessagesClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::MessagesActionExecute( TObject *Sender )\r
{\r
p_intfGlobal->p_sys->p_messages->Show();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuPreferencesClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PreferencesActionExecute( TObject *Sender )\r
{\r
CreatePreferences( "main" );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::MenuAboutClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::AboutActionExecute( TObject *Sender )\r
{\r
p_intfGlobal->p_sys->p_about = new TAboutDlg( this );\r
p_intfGlobal->p_sys->p_about->ShowModal();\r
delete p_intfGlobal->p_sys->p_about;\r
}\r
//---------------------------------------------------------------------------\r
-\r
-\r
-/*****************************************************************************\r
- * Toolbar callbacks\r
- ****************************************************************************/\r
-void __fastcall TMainFrameDlg::ToolButtonFileClick( TObject *Sender )\r
-{\r
- MenuOpenFileClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonDiscClick( TObject *Sender )\r
-{\r
- MenuOpenDiscClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonNetClick( TObject *Sender )\r
-{\r
- MenuNetworkStreamClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonPlaylistClick( TObject *Sender )\r
-{\r
- MenuPlaylistClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonBackClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::BackActionExecute( TObject *Sender )\r
{\r
ControlBack( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonStopClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PlayActionExecute( TObject *Sender )\r
{\r
- ControlStop( Sender );\r
+ ControlPlay( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonPlayClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PauseActionExecute( TObject *Sender )\r
{\r
- ControlPlay( Sender );\r
+ ControlPause( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonPauseClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::StopActionExecute( TObject *Sender )\r
{\r
- ControlPause( Sender );\r
+ ControlStop( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonSlowClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::SlowActionExecute( TObject *Sender )\r
{\r
ControlSlow( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonFastClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::FastActionExecute( TObject *Sender )\r
{\r
ControlFast( Sender );\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonPrevClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PreviousActionExecute(TObject *Sender)\r
{\r
p_intfGlobal->p_sys->p_playwin->Previous();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::NextActionExecute(TObject *Sender)\r
{\r
p_intfGlobal->p_sys->p_playwin->Next();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::EjectActionExecute( TObject *Sender )\r
{\r
AnsiString Device = "";\r
char * psz_current;\r
\r
\r
/*****************************************************************************\r
- * Popup callbacks\r
+ * Menu and popup callbacks\r
****************************************************************************/\r
-void __fastcall TMainFrameDlg::PopupCloseClick( TObject *Sender )\r
-{\r
- /* We do nothing, we just need a click on a menu item\r
- * to close the popup. Don't ask me why... */\r
- return;\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupPlayClick( TObject *Sender )\r
-{\r
- ToolButtonPlayClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupPauseClick( TObject *Sender )\r
-{\r
- ToolButtonPauseClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupStopClick( TObject *Sender )\r
-{\r
- ToolButtonStopClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupBackClick( TObject *Sender )\r
-{\r
- ToolButtonBackClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupSlowClick( TObject *Sender )\r
-{\r
- ToolButtonSlowClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupFastClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::MenuHideinterfaceClick( TObject *Sender )\r
{\r
- ToolButtonFastClick( Sender );\r
+ this->SendToBack();\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TMainFrameDlg::PopupToggleInterfaceClick( TObject *Sender )\r
this->BringToFront();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupFullscreenClick( TObject *Sender )\r
-{\r
- MenuFullscreenClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupNextClick( TObject *Sender )\r
-{\r
- ToolButtonNextClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupPrevClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PopupCloseClick( TObject *Sender )\r
{\r
- ToolButtonPrevClick( Sender );\r
+ /* We do nothing, we just need a click on a menu item\r
+ * to close the popup. Don't ask me why... */\r
+ return;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TMainFrameDlg::PopupJumpClick( TObject *Sender )\r
// TODO\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupPlaylistClick( TObject *Sender )\r
-{\r
- MenuPlaylistClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupPreferencesClick( TObject *Sender )\r
-{\r
- MenuPreferencesClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupExitClick( TObject *Sender )\r
-{\r
- MenuExitClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupOpenFileClick( TObject *Sender )\r
-{\r
- MenuOpenFileClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupOpenDiscClick( TObject *Sender )\r
-{\r
- MenuOpenDiscClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::PopupNetworkStreamClick( TObject *Sender )\r
-{\r
- MenuNetworkStreamClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
\r
\r
/*****************************************************************************\r
* Callbacks for DVD/VCD navigation\r
****************************************************************************/\r
-void __fastcall TMainFrameDlg::ButtonTitlePrevClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PrevTitleActionExecute( TObject *Sender )\r
{\r
intf_thread_t * p_intf;\r
input_area_t * p_area;\r
}\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ButtonTitleNextClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::NextTitleActionExecute( TObject *Sender )\r
{\r
intf_thread_t * p_intf;\r
input_area_t * p_area;\r
}\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ButtonChapterPrevClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::PrevChapterActionExecute( TObject *Sender )\r
{\r
intf_thread_t * p_intf = p_intfGlobal;\r
input_area_t * p_area;\r
}\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ButtonChapterNextClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::NextChapterActionExecute( TObject *Sender )\r
{\r
intf_thread_t * p_intf = p_intfGlobal;\r
input_area_t * p_area;\r
\r
/* set control items */\r
ToolButtonBack->Enabled = false;\r
- ToolButtonStop->Enabled = true;\r
ToolButtonEject->Enabled = !b_control;\r
- ToolButtonPause->Enabled = b_control;\r
- ToolButtonSlow->Enabled = b_control;\r
- ToolButtonFast->Enabled = b_control;\r
+ StopAction->Enabled = true;\r
+ PauseAction->Enabled = b_control;\r
+ SlowAction->Enabled = b_control;\r
+ FastAction->Enabled = b_control;\r
PopupBack->Enabled = false;\r
- PopupPause->Enabled = b_control;\r
- PopupSlow->Enabled = b_control;\r
- PopupFast->Enabled = b_control;\r
}\r
//---------------------------------------------------------------------------\r
\r
object MainFrameDlg: TMainFrameDlg\r
- Left = 314\r
- Top = 198\r
+ Left = 179\r
+ Top = 442\r
Width = 541\r
Height = 306\r
BorderIcons = [biSystemMenu, biMinimize]\r
object ToolButtonFile: TToolButton\r
Left = 0\r
Top = 0\r
- Hint = 'Open a file'\r
- Caption = 'File'\r
- ImageIndex = 0\r
- OnClick = ToolButtonFileClick\r
+ Action = OpenFileAction\r
end\r
object ToolButtonDisc: TToolButton\r
Left = 39\r
Top = 0\r
- Hint = 'Open a DVD or VCD'\r
- Caption = 'Disc'\r
- ImageIndex = 1\r
- OnClick = ToolButtonDiscClick\r
+ Action = OpenDiscAction\r
end\r
object ToolButtonNet: TToolButton\r
Left = 78\r
Top = 0\r
- Hint = 'Open a network stream'\r
- Caption = 'Net'\r
- ImageIndex = 2\r
- OnClick = ToolButtonNetClick\r
+ Action = NetworkStreamAction\r
end\r
object ToolButtonSep1: TToolButton\r
Left = 117\r
object ToolButtonBack: TToolButton\r
Left = 125\r
Top = 0\r
- Caption = 'Back'\r
- Enabled = False\r
- ImageIndex = 3\r
- OnClick = ToolButtonBackClick\r
+ Action = BackAction\r
end\r
object ToolButtonPlay: TToolButton\r
Left = 164\r
Top = 0\r
- Hint = 'Play stream'\r
- Caption = 'Play'\r
- ImageIndex = 5\r
- OnClick = ToolButtonPlayClick\r
+ Action = PlayAction\r
end\r
object ToolButtonPause: TToolButton\r
Left = 203\r
Top = 0\r
- Hint = 'Pause stream'\r
- Caption = 'Pause'\r
- Enabled = False\r
- ImageIndex = 6\r
- OnClick = ToolButtonPauseClick\r
+ Action = PauseAction\r
end\r
object ToolButtonStop: TToolButton\r
Left = 242\r
Top = 0\r
- Hint = 'Stop stream'\r
- Caption = 'Stop'\r
- Enabled = False\r
- ImageIndex = 4\r
- OnClick = ToolButtonStopClick\r
+ Action = StopAction\r
end\r
object ToolButtonEject: TToolButton\r
Left = 281\r
Top = 0\r
- Hint = 'Eject disc'\r
- Caption = 'Eject'\r
- Enabled = False\r
- ImageIndex = 7\r
- OnClick = ToolButtonEjectClick\r
+ Action = EjectAction\r
end\r
object ToolButton1: TToolButton\r
Left = 320\r
object ToolButtonSlow: TToolButton\r
Left = 328\r
Top = 0\r
- Hint = 'Play slower'\r
- Caption = 'Slow'\r
- Enabled = False\r
- ImageIndex = 8\r
- OnClick = ToolButtonSlowClick\r
+ Action = SlowAction\r
end\r
object ToolButtonFast: TToolButton\r
Left = 367\r
Top = 0\r
- Hint = 'Play faster'\r
- Caption = 'Fast'\r
- Enabled = False\r
- ImageIndex = 9\r
- OnClick = ToolButtonFastClick\r
+ Action = FastAction\r
end\r
object ToolButtonSep2: TToolButton\r
Left = 406\r
object ToolButtonPlaylist: TToolButton\r
Left = 414\r
Top = 0\r
- Hint = 'Open playlist'\r
- Caption = 'Playlist'\r
- ImageIndex = 10\r
+ Action = PlaylistAction\r
Style = tbsCheck\r
- OnClick = ToolButtonPlaylistClick\r
end\r
object ToolButtonPrev: TToolButton\r
Left = 453\r
Top = 0\r
- Hint = 'Previous file'\r
- Caption = 'Prev'\r
- ImageIndex = 11\r
- OnClick = ToolButtonPrevClick\r
+ Action = PreviousAction\r
end\r
object ToolButtonNext: TToolButton\r
Left = 492\r
Top = 0\r
- Hint = 'Next file'\r
- Caption = 'Next'\r
- ImageIndex = 12\r
- OnClick = ToolButtonNextClick\r
+ Action = NextAction\r
end\r
end\r
object StatusBar: TStatusBar\r
Top = 8\r
Width = 33\r
Height = 19\r
- Hint = 'Jump to previous title'\r
- Caption = 'Prev'\r
+ Action = PrevTitleAction\r
TabOrder = 0\r
- OnClick = ButtonTitlePrevClick\r
end\r
object ButtonTitleNext: TButton\r
Left = 184\r
Top = 8\r
Width = 33\r
Height = 19\r
- Hint = 'Jump to next title'\r
- Caption = 'Next'\r
+ Action = NextTitleAction\r
TabOrder = 1\r
- OnClick = ButtonTitleNextClick\r
end\r
object ButtonChapterPrev: TButton\r
Left = 368\r
Top = 8\r
Width = 33\r
Height = 19\r
- Hint = 'Jump to previous chapter'\r
- Caption = 'Prev'\r
+ Action = PrevChapterAction\r
TabOrder = 2\r
- OnClick = ButtonChapterPrevClick\r
end\r
object ButtonChapterNext: TButton\r
Left = 400\r
Top = 8\r
Width = 33\r
Height = 19\r
- Hint = 'Jump to next chapter'\r
- Caption = 'Next'\r
+ Action = NextChapterAction\r
TabOrder = 3\r
- OnClick = ButtonChapterNextClick\r
end\r
end\r
object GroupBoxSlider: TGroupBox\r
object MenuFile: TMenuItem\r
Caption = '&File'\r
object MenuOpenFile: TMenuItem\r
- Caption = '&Open file...'\r
- Hint = 'Open a file'\r
- ShortCut = 114\r
- OnClick = MenuOpenFileClick\r
+ Action = OpenFileAction\r
+ Caption = 'Open &file...'\r
end\r
object MenuOpenDisc: TMenuItem\r
+ Action = OpenDiscAction\r
Caption = 'Open &disc...'\r
- Hint = 'Open a DVD or VCD'\r
- ShortCut = 115\r
- OnClick = MenuOpenDiscClick\r
end\r
object MenuNetworkStream: TMenuItem\r
+ Action = NetworkStreamAction\r
Caption = '&Network stream...'\r
- Hint = 'Select a network stream'\r
- ShortCut = 116\r
- OnClick = MenuNetworkStreamClick\r
end\r
object N8: TMenuItem\r
Caption = '-'\r
Visible = False\r
end\r
object MenuEjectDisc: TMenuItem\r
- Caption = '&Eject Disc'\r
- Hint = 'Eject disc'\r
- Visible = False\r
- OnClick = ToolButtonEjectClick\r
+ Action = EjectAction\r
+ Caption = '&Eject disc'\r
end\r
object N1: TMenuItem\r
Caption = '-'\r
end\r
object MenuExit: TMenuItem\r
- Caption = 'E&xit'\r
- Hint = 'Exit the program'\r
- ShortCut = 16465\r
- OnClick = MenuExitClick\r
+ Action = ExitAction\r
end\r
end\r
object MenuView: TMenuItem\r
OnClick = MenuHideinterfaceClick\r
end\r
object MenuFullscreen: TMenuItem\r
- Caption = '&Fullscreen'\r
- Hint = 'Toggle fullscreen'\r
- OnClick = MenuFullscreenClick\r
+ Action = FullscreenAction\r
end\r
object N2: TMenuItem\r
Caption = '-'\r
Caption = '-'\r
end\r
object MenuPlaylist: TMenuItem\r
+ Action = PlaylistAction\r
Caption = '&Playlist...'\r
- Hint = 'Open the playlist window'\r
- OnClick = MenuPlaylistClick\r
- end\r
- object MenuModules: TMenuItem\r
- Caption = '&Modules...'\r
- Enabled = False\r
- Hint = 'Open the modules window'\r
end\r
object MenuMessages: TMenuItem\r
- Caption = 'Me&ssages...'\r
- Hint = 'Open the messages window'\r
- OnClick = MenuMessagesClick\r
+ Action = MessagesAction\r
end\r
end\r
object MenuSettings: TMenuItem\r
Caption = '-'\r
end\r
object MenuPreferences: TMenuItem\r
- Caption = '&Preferences...'\r
- Hint = 'Configure the application'\r
- OnClick = MenuPreferencesClick\r
+ Action = PreferencesAction\r
end\r
end\r
object MenuHelp: TMenuItem\r
Caption = '&Help'\r
object MenuAbout: TMenuItem\r
- Caption = '&About...'\r
- Hint = 'About this application'\r
- OnClick = MenuAboutClick\r
+ Action = AboutAction\r
end\r
end\r
end\r
Caption = '&Close this popup'\r
OnClick = PopupCloseClick\r
end\r
- object N9: TMenuItem\r
- Caption = '-'\r
- end\r
- object PopupPlay: TMenuItem\r
- Caption = '&Play'\r
- OnClick = PopupPlayClick\r
- end\r
- object PopupPause: TMenuItem\r
- Caption = 'Pause'\r
- OnClick = PopupPauseClick\r
- end\r
- object PopupStop: TMenuItem\r
- Caption = 'Stop'\r
- OnClick = PopupStopClick\r
- end\r
- object PopupBack: TMenuItem\r
- Caption = 'Back'\r
- OnClick = PopupBackClick\r
- end\r
- object PopupSlow: TMenuItem\r
- Caption = 'Slow'\r
- OnClick = PopupSlowClick\r
- end\r
- object PopupFast: TMenuItem\r
- Caption = 'Fast'\r
- OnClick = PopupFastClick\r
- end\r
- object N5: TMenuItem\r
- Caption = '-'\r
- end\r
object PopupToggleInterface: TMenuItem\r
- Caption = 'Toggle &Interface'\r
+ Caption = '&Toggle interface'\r
OnClick = PopupToggleInterfaceClick\r
end\r
- object PopupFullscreen: TMenuItem\r
- Caption = '&Fullscreen'\r
- OnClick = PopupFullscreenClick\r
- end\r
- object N6: TMenuItem\r
+ object N9: TMenuItem\r
Caption = '-'\r
end\r
- object PopupNext: TMenuItem\r
- Caption = 'Next'\r
- OnClick = PopupNextClick\r
- end\r
- object PopupPrev: TMenuItem\r
- Caption = 'Prev'\r
- OnClick = PopupPrevClick\r
+ object Control1: TMenuItem\r
+ Caption = 'Control'\r
+ object PopupBack: TMenuItem\r
+ Action = BackAction\r
+ end\r
+ object PopupPlay: TMenuItem\r
+ Action = PlayAction\r
+ end\r
+ object PopupPause: TMenuItem\r
+ Action = PauseAction\r
+ end\r
+ object PopupStop: TMenuItem\r
+ Action = StopAction\r
+ end\r
+ object PopupSlow: TMenuItem\r
+ Action = SlowAction\r
+ end\r
+ object PopupFast: TMenuItem\r
+ Action = FastAction\r
+ end\r
+ object N5: TMenuItem\r
+ Caption = '-'\r
+ end\r
+ object PopupPrev: TMenuItem\r
+ Action = PreviousAction\r
+ end\r
+ object PopupNext: TMenuItem\r
+ Action = NextAction\r
+ end\r
+ object PopupJump: TMenuItem\r
+ Caption = '&Jump...'\r
+ OnClick = PopupJumpClick\r
+ end\r
+ object N6: TMenuItem\r
+ Caption = '-'\r
+ end\r
+ object PopupFullscreen: TMenuItem\r
+ Action = FullscreenAction\r
+ ShortCut = 70\r
+ end\r
end\r
- object PopupJump: TMenuItem\r
- Caption = '&Jump...'\r
- OnClick = PopupJumpClick\r
+ object PopupNavigation: TMenuItem\r
+ Caption = 'Navigation'\r
end\r
object PopupProgram: TMenuItem\r
Caption = 'Program'\r
end\r
- object PopupNavigation: TMenuItem\r
- Caption = 'Navigation'\r
- end\r
object PopupAudio: TMenuItem\r
Caption = 'Audio'\r
end\r
object PopupSubtitles: TMenuItem\r
Caption = 'Subtitles'\r
end\r
+ object N10: TMenuItem\r
+ Caption = '-'\r
+ end\r
+ object PopupPlaylist: TMenuItem\r
+ Action = PlaylistAction\r
+ Caption = 'Playlist...'\r
+ end\r
+ object PopupPreferences: TMenuItem\r
+ Action = PreferencesAction\r
+ end\r
object PopupFile: TMenuItem\r
- Caption = 'File'\r
+ Caption = 'New stream'\r
object PopupOpenFile: TMenuItem\r
+ Action = OpenFileAction\r
Caption = 'Open file...'\r
- OnClick = PopupOpenFileClick\r
end\r
object PopupOpenDisc: TMenuItem\r
+ Action = OpenDiscAction\r
Caption = 'Open disc...'\r
- OnClick = PopupOpenDiscClick\r
end\r
object PopupNetworkStream: TMenuItem\r
+ Action = NetworkStreamAction\r
Caption = 'Network stream...'\r
- OnClick = PopupNetworkStreamClick\r
end\r
end\r
- object PopupPlaylist: TMenuItem\r
- Caption = 'Playlist...'\r
- OnClick = PopupPlaylistClick\r
- end\r
- object PopupPreferences: TMenuItem\r
- Caption = 'Preferences...'\r
- OnClick = PopupPreferencesClick\r
- end\r
object N7: TMenuItem\r
Caption = '-'\r
end\r
object PopupExit: TMenuItem\r
- Caption = 'E&xit'\r
- OnClick = PopupExitClick\r
+ Action = ExitAction\r
end\r
end\r
object TimerManage: TTimer\r
Left = 136\r
Top = 208\r
end\r
+ object ActionList1: TActionList\r
+ Left = 168\r
+ Top = 208\r
+ object OpenFileAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'File'\r
+ Hint = 'Open a file'\r
+ ImageIndex = 0\r
+ ShortCut = 114\r
+ OnExecute = OpenFileActionExecute\r
+ end\r
+ object OpenDiscAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Disc'\r
+ Hint = 'Open a DVD or VCD'\r
+ ImageIndex = 1\r
+ ShortCut = 115\r
+ OnExecute = OpenDiscActionExecute\r
+ end\r
+ object NetworkStreamAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Net'\r
+ Hint = 'Open a network stream'\r
+ ImageIndex = 2\r
+ ShortCut = 116\r
+ OnExecute = NetworkStreamActionExecute\r
+ end\r
+ object BackAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Back'\r
+ Enabled = False\r
+ ImageIndex = 3\r
+ OnExecute = BackActionExecute\r
+ end\r
+ object PlayAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Play'\r
+ Hint = 'Play stream'\r
+ ImageIndex = 5\r
+ OnExecute = PlayActionExecute\r
+ end\r
+ object PauseAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Pause'\r
+ Enabled = False\r
+ Hint = 'Pause stream'\r
+ ImageIndex = 6\r
+ OnExecute = PauseActionExecute\r
+ end\r
+ object StopAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Stop'\r
+ Enabled = False\r
+ Hint = 'Stop stream'\r
+ ImageIndex = 4\r
+ OnExecute = StopActionExecute\r
+ end\r
+ object EjectAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Eject'\r
+ Enabled = False\r
+ Hint = 'Eject disc'\r
+ ImageIndex = 7\r
+ OnExecute = EjectActionExecute\r
+ end\r
+ object SlowAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Slow'\r
+ Enabled = False\r
+ Hint = 'Play slower'\r
+ ImageIndex = 8\r
+ OnExecute = SlowActionExecute\r
+ end\r
+ object FastAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Fast'\r
+ Enabled = False\r
+ Hint = 'Play faster'\r
+ ImageIndex = 9\r
+ OnExecute = FastActionExecute\r
+ end\r
+ object PreviousAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Prev'\r
+ Hint = 'Previous file'\r
+ ImageIndex = 11\r
+ OnExecute = PreviousActionExecute\r
+ end\r
+ object NextAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Next'\r
+ Hint = 'Next file'\r
+ ImageIndex = 12\r
+ OnExecute = NextActionExecute\r
+ end\r
+ object PlaylistAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Playlist'\r
+ Hint = 'Open the playlist window'\r
+ ImageIndex = 10\r
+ ShortCut = 16464\r
+ OnExecute = PlaylistActionExecute\r
+ end\r
+ object ExitAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Exit'\r
+ Hint = 'Exit the program'\r
+ ShortCut = 16465\r
+ OnExecute = ExitActionExecute\r
+ end\r
+ object FullscreenAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Fullscreen'\r
+ Hint = 'Toggle fullscreen'\r
+ OnExecute = FullscreenActionExecute\r
+ end\r
+ object PreferencesAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Preferences...'\r
+ Hint = 'Configure the application'\r
+ OnExecute = PreferencesActionExecute\r
+ end\r
+ object MessagesAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'Messages...'\r
+ Hint = 'Open the messages window'\r
+ ShortCut = 16461\r
+ OnExecute = MessagesActionExecute\r
+ end\r
+ object AboutAction: TAction\r
+ Category = 'Menu'\r
+ Caption = 'About...'\r
+ Hint = 'About this application'\r
+ OnExecute = AboutActionExecute\r
+ end\r
+ object PrevTitleAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Prev'\r
+ Hint = 'Jump to previous title'\r
+ OnExecute = PrevTitleActionExecute\r
+ end\r
+ object NextTitleAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Next'\r
+ Hint = 'Jump to next title'\r
+ OnExecute = NextTitleActionExecute\r
+ end\r
+ object PrevChapterAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Prev'\r
+ Hint = 'Jump to previous chapter'\r
+ OnExecute = PrevChapterActionExecute\r
+ end\r
+ object NextChapterAction: TAction\r
+ Category = 'Control'\r
+ Caption = 'Next'\r
+ Hint = 'Jump to next chapter'\r
+ OnExecute = NextChapterActionExecute\r
+ end\r
+ end\r
end\r
#include <AppEvnts.hpp>\r
#include <ExtCtrls.hpp>\r
#include "CSPIN.h"\r
+#include <ActnList.hpp>\r
//---------------------------------------------------------------------------\r
class TMainFrameDlg : public TForm\r
{\r
TMenuItem *MenuAngle;\r
TMenuItem *N3;\r
TMenuItem *MenuPlaylist;\r
- TMenuItem *MenuModules;\r
TMenuItem *MenuMessages;\r
TMenuItem *MenuSettings;\r
TMenuItem *MenuAudio;\r
TMenuItem *PopupBack;\r
TMenuItem *PopupSlow;\r
TMenuItem *PopupFast;\r
- TMenuItem *N5;\r
TMenuItem *PopupToggleInterface;\r
TMenuItem *PopupFullscreen;\r
- TMenuItem *N6;\r
TMenuItem *PopupNext;\r
TMenuItem *PopupPrev;\r
TMenuItem *PopupJump;\r
TMenuItem *PopupClose;\r
TMenuItem *N9;\r
TCSpinEdit *SpinEditChannel;\r
- TToolButton *ToolButton1;\r
+ TToolButton *ToolButton1;\r
+ TActionList *ActionList1;\r
+ TAction *OpenFileAction;\r
+ TAction *OpenDiscAction;\r
+ TAction *NetworkStreamAction;\r
+ TAction *PlayAction;\r
+ TAction *PauseAction;\r
+ TAction *StopAction;\r
+ TAction *EjectAction;\r
+ TAction *SlowAction;\r
+ TAction *FastAction;\r
+ TAction *PreviousAction;\r
+ TAction *NextAction;\r
+ TAction *BackAction;\r
+ TAction *PlaylistAction;\r
+ TAction *ExitAction;\r
+ TAction *FullscreenAction;\r
+ TAction *PreferencesAction;\r
+ TAction *MessagesAction;\r
+ TAction *AboutAction;\r
+ TMenuItem *Control1;\r
+ TMenuItem *N5;\r
+ TMenuItem *N6;\r
+ TMenuItem *N10;\r
+ TAction *PrevTitleAction;\r
+ TAction *NextTitleAction;\r
+ TAction *PrevChapterAction;\r
+ TAction *NextChapterAction;\r
void __fastcall TimerManageTimer( TObject *Sender );\r
void __fastcall TrackBarChange( TObject *Sender );\r
void __fastcall FormClose( TObject *Sender, TCloseAction &Action );\r
- void __fastcall MenuOpenFileClick( TObject *Sender );\r
- void __fastcall MenuOpenDiscClick( TObject *Sender );\r
- void __fastcall MenuNetworkStreamClick( TObject *Sender );\r
- void __fastcall MenuExitClick( TObject *Sender );\r
void __fastcall MenuHideinterfaceClick( TObject *Sender );\r
- void __fastcall MenuFullscreenClick( TObject *Sender );\r
- void __fastcall MenuPlaylistClick( TObject *Sender );\r
- void __fastcall MenuMessagesClick( TObject *Sender );\r
- void __fastcall MenuPreferencesClick( TObject *Sender );\r
- void __fastcall MenuAboutClick( TObject *Sender );\r
- void __fastcall ToolButtonFileClick( TObject *Sender );\r
- void __fastcall ToolButtonDiscClick( TObject *Sender );\r
- void __fastcall ToolButtonNetClick( TObject *Sender );\r
- void __fastcall ToolButtonPlaylistClick( TObject *Sender );\r
- void __fastcall ToolButtonBackClick( TObject *Sender );\r
- void __fastcall ToolButtonStopClick( TObject *Sender );\r
- void __fastcall ToolButtonPlayClick( TObject *Sender );\r
- void __fastcall ToolButtonPauseClick( TObject *Sender );\r
- void __fastcall ToolButtonSlowClick( TObject *Sender );\r
- void __fastcall ToolButtonFastClick( TObject *Sender );\r
- void __fastcall ToolButtonPrevClick( TObject *Sender );\r
- void __fastcall ToolButtonNextClick( TObject *Sender );\r
- void __fastcall ToolButtonEjectClick( TObject *Sender );\r
void __fastcall PopupCloseClick( TObject *Sender );\r
- void __fastcall PopupPlayClick( TObject *Sender );\r
- void __fastcall PopupPauseClick( TObject *Sender );\r
- void __fastcall PopupStopClick( TObject *Sender );\r
- void __fastcall PopupBackClick( TObject *Sender );\r
- void __fastcall PopupSlowClick( TObject *Sender );\r
- void __fastcall PopupFastClick( TObject *Sender );\r
void __fastcall PopupToggleInterfaceClick( TObject *Sender );\r
- void __fastcall PopupFullscreenClick( TObject *Sender );\r
- void __fastcall PopupNextClick( TObject *Sender );\r
- void __fastcall PopupPrevClick( TObject *Sender );\r
void __fastcall PopupJumpClick( TObject *Sender );\r
- void __fastcall PopupPlaylistClick( TObject *Sender );\r
- void __fastcall PopupPreferencesClick( TObject *Sender );\r
- void __fastcall PopupExitClick( TObject *Sender );\r
- void __fastcall PopupOpenFileClick( TObject *Sender );\r
- void __fastcall PopupOpenDiscClick( TObject *Sender );\r
- void __fastcall PopupNetworkStreamClick( TObject *Sender );\r
- void __fastcall ButtonTitlePrevClick( TObject *Sender );\r
- void __fastcall ButtonTitleNextClick( TObject *Sender );\r
- void __fastcall ButtonChapterPrevClick( TObject *Sender );\r
- void __fastcall ButtonChapterNextClick( TObject *Sender );\r
void __fastcall ButtonGoClick( TObject *Sender );\r
+ void __fastcall OpenFileActionExecute( TObject *Sender );\r
+ void __fastcall OpenDiscActionExecute( TObject *Sender );\r
+ void __fastcall NetworkStreamActionExecute( TObject *Sender );\r
+ void __fastcall BackActionExecute( TObject *Sender );\r
+ void __fastcall PlayActionExecute( TObject *Sender );\r
+ void __fastcall PauseActionExecute( TObject *Sender );\r
+ void __fastcall StopActionExecute( TObject *Sender );\r
+ void __fastcall SlowActionExecute( TObject *Sender );\r
+ void __fastcall FastActionExecute( TObject *Sender );\r
+ void __fastcall PlaylistActionExecute( TObject *Sender );\r
+ void __fastcall ExitActionExecute( TObject *Sender );\r
+ void __fastcall PreviousActionExecute( TObject *Sender );\r
+ void __fastcall NextActionExecute( TObject *Sender );\r
+ void __fastcall FullscreenActionExecute( TObject *Sender );\r
+ void __fastcall PreferencesActionExecute( TObject *Sender );\r
+ void __fastcall MessagesActionExecute( TObject *Sender );\r
+ void __fastcall AboutActionExecute( TObject *Sender );\r
+ void __fastcall EjectActionExecute( TObject *Sender );\r
+ void __fastcall PrevTitleActionExecute( TObject *Sender );\r
+ void __fastcall NextTitleActionExecute( TObject *Sender );\r
+ void __fastcall PrevChapterActionExecute( TObject *Sender );\r
+ void __fastcall NextChapterActionExecute( TObject *Sender );\r
private: // User declarations\r
public: // User declarations\r
TStringList *StringListPref; /* stores config dialogs */\r
//---------------------------------------------------------------------------\r
void __fastcall TMessagesDlg::FormHide( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuMessages->Checked = false;\r
+ p_intfGlobal->p_sys->p_window->MessagesAction->Checked = false;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TMessagesDlg::FormShow( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuMessages->Checked = true;\r
+ p_intfGlobal->p_sys->p_window->MessagesAction->Checked = true;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TMessagesDlg::UpdateLog()\r
RichEditMessages->SelAttributes->Color = clRed;\r
break;\r
case VLC_MSG_WARN:\r
- RichEditMessages->SelAttributes->Color = clBlack;\r
+ RichEditMessages->SelAttributes->Color = clBlue;\r
break;\r
default:\r
- RichEditMessages->SelAttributes->Color = clBlue;\r
+ RichEditMessages->SelAttributes->Color = clBlack;\r
break;\r
}\r
\r
//---------------------------------------------------------------------------\r
void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuNetworkStream->Checked = true;\r
- p_intfGlobal->p_sys->p_window->PopupNetworkStream->Checked = true;\r
+ p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = true;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TNetworkDlg::FormHide( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuNetworkStream->Checked = false;\r
- p_intfGlobal->p_sys->p_window->PopupNetworkStream->Checked = false;\r
+ p_intfGlobal->p_sys->p_window->NetworkStreamAction->Checked = false;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TNetworkDlg::BitBtnCancelClick( TObject *Sender )\r
****************************************************************************/\r
void __fastcall TPlaylistDlg::FormShow( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = true;\r
- p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = true;\r
- p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = true;\r
+ p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = true;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPlaylistDlg::FormHide( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = false;\r
- p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = false;\r
- p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = false;\r
+ p_intfGlobal->p_sys->p_window->PlaylistAction->Checked = false;\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender )\r
Hide();\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::ListViewPlaylistDblClick( TObject *Sender )\r
+void __fastcall TPlaylistDlg::PlayStreamActionExecute( TObject *Sender )\r
{\r
TListItem *Item;\r
TListItem *ItemStart;\r
/* 'suppr' or 'backspace' */\r
if( ( Key == VK_DELETE ) || ( Key == VK_BACK ) )\r
{\r
- MenuDeleteSelectedClick( Sender );\r
+ DeleteSelectionActionExecute( Sender );\r
}\r
\r
/* 'enter' */\r
if( Key == VK_RETURN )\r
{\r
- PopupPlayClick( Sender );\r
+ PlayStreamActionExecute( Sender );\r
}\r
}\r
//---------------------------------------------------------------------------\r
\r
\r
/*****************************************************************************\r
- * Menu callbacks\r
+ * Menu and popup callbacks\r
****************************************************************************/\r
void __fastcall TPlaylistDlg::MenuAddFileClick( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuOpenFileClick( Sender );\r
+ p_intfGlobal->p_sys->p_window->OpenFileActionExecute( Sender );\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPlaylistDlg::MenuAddDiscClick( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuOpenDiscClick( Sender );\r
+ p_intfGlobal->p_sys->p_window->OpenDiscActionExecute( Sender );\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPlaylistDlg::MenuAddNetClick( TObject *Sender )\r
{\r
- p_intfGlobal->p_sys->p_window->MenuNetworkStreamClick( Sender );\r
+ p_intfGlobal->p_sys->p_window->NetworkStreamActionExecute( Sender );\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPlaylistDlg::MenuAddUrlClick( TObject *Sender )\r
/* TODO */\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::MenuDeleteSelectedClick( TObject *Sender )\r
+void __fastcall TPlaylistDlg::DeleteSelectionActionExecute( TObject *Sender )\r
{\r
#if 0 /* PLAYLIST TARASS */\r
/* user wants to delete a file in the queue */\r
#endif\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::MenuDeleteAllClick( TObject *Sender )\r
+void __fastcall TPlaylistDlg::DeleteAllActionExecute( TObject *Sender )\r
{\r
#if 0 /* PLAYLIST TARASS */\r
int i_pos;\r
#endif\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::MenuSelectionInvertClick( TObject *Sender )\r
+void __fastcall TPlaylistDlg::InvertSelectionActionExecute( TObject *Sender )\r
{\r
#if 0 /* PLAYLIST TARASS */\r
#define NOT( var ) ( (var) ? false : true )\r
#endif\r
}\r
//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::MenuSelectionCropClick( TObject *Sender )\r
+void __fastcall TPlaylistDlg::CropSelectionActionExecute( TObject *Sender )\r
{\r
- MenuSelectionInvertClick( Sender );\r
- MenuDeleteSelectedClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-\r
-\r
-/*****************************************************************************\r
- * Popup callbacks\r
- ****************************************************************************/\r
-void __fastcall TPlaylistDlg::PopupPlayClick( TObject *Sender )\r
-{\r
- ListViewPlaylistDblClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::PopupInvertSelectionClick( TObject *Sender )\r
-{\r
- MenuSelectionInvertClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::PopupCropSelectionClick( TObject *Sender )\r
-{\r
- MenuSelectionCropClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::PopupDeleteSelectedClick( TObject *Sender )\r
-{\r
- MenuDeleteSelectedClick( Sender );\r
-}\r
-//---------------------------------------------------------------------------\r
-void __fastcall TPlaylistDlg::PopupDeleteAllClick( TObject *Sender )\r
-{\r
- MenuDeleteAllClick( Sender );\r
+ InvertSelectionActionExecute( Sender );\r
+ DeleteSelectionActionExecute( Sender );\r
}\r
//---------------------------------------------------------------------------\r
\r
object PlaylistDlg: TPlaylistDlg\r
- Left = 447\r
- Top = 197\r
+ Left = 162\r
+ Top = 364\r
Width = 335\r
Height = 436\r
Caption = 'Playlist'\r
TabOrder = 1\r
ViewStyle = vsReport\r
OnCustomDrawItem = ListViewPlaylistCustomDrawItem\r
- OnDblClick = ListViewPlaylistDblClick\r
+ OnDblClick = PlayStreamActionExecute\r
OnKeyDown = ListViewPlaylistKeyDown\r
end\r
object MainMenuPlaylist: TMainMenu\r
- Left = 24\r
+ Left = 8\r
Top = 352\r
object MenuAdd: TMenuItem\r
Caption = '&Add'\r
object MenuDelete: TMenuItem\r
Caption = '&Delete'\r
object MenuDeleteAll: TMenuItem\r
- Caption = '&All'\r
- OnClick = MenuDeleteAllClick\r
+ Action = DeleteAllAction\r
end\r
object MenuDeleteSelected: TMenuItem\r
- Caption = '&Selected'\r
- OnClick = MenuDeleteSelectedClick\r
+ Action = DeleteSelectionAction\r
+ Caption = '&Selection'\r
end\r
end\r
object MenuSelection: TMenuItem\r
Caption = '&Selection'\r
object MenuSelectionCrop: TMenuItem\r
- Caption = '&Crop'\r
- OnClick = MenuSelectionCropClick\r
+ Action = CropSelectionAction\r
end\r
object MenuSelectionInvert: TMenuItem\r
- Caption = '&Invert'\r
- OnClick = MenuSelectionInvertClick\r
+ Action = InvertSelectionAction\r
end\r
end\r
end\r
object PopupMenuPlaylist: TPopupMenu\r
- Left = 272\r
+ Left = 40\r
Top = 352\r
object PopupPlay: TMenuItem\r
- Caption = '&Play'\r
- OnClick = PopupPlayClick\r
+ Action = PlayStreamAction\r
end\r
object N1: TMenuItem\r
Caption = '-'\r
end\r
object PopupInvertSelection: TMenuItem\r
+ Action = InvertSelectionAction\r
Caption = '&Invert selection'\r
- OnClick = PopupInvertSelectionClick\r
end\r
object PopupCropSelection: TMenuItem\r
+ Action = CropSelectionAction\r
Caption = '&Crop selection'\r
- OnClick = PopupCropSelectionClick\r
end\r
object N2: TMenuItem\r
Caption = '-'\r
end\r
object PopupDeleteSelected: TMenuItem\r
- Caption = '&Delete selected'\r
- OnClick = PopupDeleteSelectedClick\r
+ Action = DeleteSelectionAction\r
+ Caption = '&Delete selection'\r
end\r
object PopupDeleteAll: TMenuItem\r
+ Action = DeleteAllAction\r
Caption = 'Delete &all'\r
- OnClick = PopupDeleteAllClick\r
+ end\r
+ end\r
+ object ActionList1: TActionList\r
+ Left = 264\r
+ Top = 352\r
+ object InvertSelectionAction: TAction\r
+ Caption = 'Invert'\r
+ Hint = 'Invert selection'\r
+ OnExecute = InvertSelectionActionExecute\r
+ end\r
+ object CropSelectionAction: TAction\r
+ Caption = 'Crop'\r
+ Hint = 'Crop selection'\r
+ OnExecute = CropSelectionActionExecute\r
+ end\r
+ object DeleteSelectionAction: TAction\r
+ Caption = 'Delete'\r
+ Hint = 'Delete selection'\r
+ OnExecute = DeleteSelectionActionExecute\r
+ end\r
+ object DeleteAllAction: TAction\r
+ Caption = 'All'\r
+ Hint = 'Delete all items'\r
+ OnExecute = DeleteAllActionExecute\r
+ end\r
+ object PlayStreamAction: TAction\r
+ Caption = 'Play'\r
+ Hint = 'Play the selected stream'\r
+ OnExecute = PlayStreamActionExecute\r
end\r
end\r
end\r
#include <Menus.hpp>\r
#include <Grids.hpp>\r
#include <ComCtrls.hpp>\r
+#include <ActnList.hpp>\r
\r
//---------------------------------------------------------------------------\r
class TPlaylistDlg : public TForm\r
TMenuItem *N2;\r
TMenuItem *PopupInvertSelection;\r
TMenuItem *PopupCropSelection;\r
+ TActionList *ActionList1;\r
+ TAction *InvertSelectionAction;\r
+ TAction *CropSelectionAction;\r
+ TAction *DeleteSelectionAction;\r
+ TAction *DeleteAllAction;\r
+ TAction *PlayStreamAction;\r
void __fastcall FormShow( TObject *Sender );\r
void __fastcall FormHide( TObject *Sender );\r
void __fastcall BitBtnOkClick( TObject *Sender );\r
- void __fastcall ListViewPlaylistDblClick( TObject *Sender );\r
void __fastcall ListViewPlaylistKeyDown( TObject *Sender, WORD &Key,\r
TShiftState Shift );\r
void __fastcall ListViewPlaylistCustomDrawItem( TCustomListView *Sender,\r
void __fastcall MenuAddDiscClick( TObject *Sender );\r
void __fastcall MenuAddNetClick( TObject *Sender );\r
void __fastcall MenuAddUrlClick( TObject *Sender );\r
- void __fastcall MenuDeleteSelectedClick( TObject *Sender );\r
- void __fastcall MenuDeleteAllClick( TObject *Sender );\r
- void __fastcall MenuSelectionInvertClick( TObject *Sender );\r
- void __fastcall MenuSelectionCropClick( TObject *Sender );\r
- void __fastcall PopupPlayClick( TObject *Sender );\r
- void __fastcall PopupInvertSelectionClick( TObject *Sender );\r
- void __fastcall PopupCropSelectionClick( TObject *Sender );\r
- void __fastcall PopupDeleteSelectedClick( TObject *Sender );\r
- void __fastcall PopupDeleteAllClick( TObject *Sender );\r
+ void __fastcall InvertSelectionActionExecute( TObject *Sender );\r
+ void __fastcall CropSelectionActionExecute( TObject *Sender );\r
+ void __fastcall DeleteSelectionActionExecute( TObject *Sender );\r
+ void __fastcall DeleteAllActionExecute( TObject *Sender );\r
+ void __fastcall PlayStreamActionExecute( TObject *Sender );\r
private: // User declarations\r
char * __fastcall rindex( char *s, char c );\r
public: // User declarations\r
void __fastcall TPreferencesDlg::FormShow( TObject *Sender )\r
{\r
/*\r
- p_intfGlobal->p_sys->p_window->MenuPreferences->Checked = true;\r
- p_intfGlobal->p_sys->p_window->PopupPreferences->Checked = true;\r
+ p_intfGlobal->p_sys->p_window->PreferencesAction->Checked = true;\r
*/\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TPreferencesDlg::FormHide( TObject *Sender )\r
{\r
/*\r
- p_intfGlobal->p_sys->p_window->MenuPreferences->Checked = false;\r
- p_intfGlobal->p_sys->p_window->PopupPreferences->Checked = false;\r
+ p_intfGlobal->p_sys->p_window->PreferencesAction->Checked = false;\r
*/\r
}\r
\r
projects / vlc / commitdiff