Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove enterPressed from remaining screens

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-09-28 06:40:45 +02:00
parent 3c1a888378
commit 9e9e521580
38 changed files with 653 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/actions.h
View File

@@ -28,6 +28,7 @@
#include "interfaces.h"
#include "window.h"
// forward declarations
struct SongList;
namespace Actions {
@@ -37,16 +38,16 @@ enum class Type
MacroUtility = 0,
Dummy, UpdateEnvironment, MouseEvent, ScrollUp, ScrollDown, ScrollUpArtist, ScrollUpAlbum,
ScrollDownArtist, ScrollDownAlbum, PageUp, PageDown, MoveHome, MoveEnd,
ToggleInterface, JumpToParentDirectory, PressEnter, PreviousColumn,
NextColumn, MasterScreen, SlaveScreen, VolumeUp, VolumeDown, AddItemToPlaylist,
ToggleInterface, JumpToParentDirectory, RunAction, PreviousColumn,
NextColumn, MasterScreen, SlaveScreen, VolumeUp, VolumeDown, AddItemToPlaylist, PlayItem,
DeletePlaylistItems, DeleteStoredPlaylist, DeleteBrowserItems, ReplaySong, Previous,
Next, Pause, Stop, ExecuteCommand, SavePlaylist, MoveSortOrderUp, MoveSortOrderDown,
MoveSelectedItemsUp, MoveSelectedItemsDown, MoveSelectedItemsTo, Add, Play,
MoveSelectedItemsUp, MoveSelectedItemsDown, MoveSelectedItemsTo, Add,
SeekForward, SeekBackward, ToggleDisplayMode, ToggleSeparatorsBetweenAlbums,
ToggleLyricsUpdateOnSongChange, ToggleLyricsFetcher, ToggleFetchingLyricsInBackground,
TogglePlayingSongCentering, UpdateDatabase, JumpToPlayingSong, ToggleRepeat, Shuffle,
ToggleRandom, StartSearching, SaveTagChanges, ToggleSingle, ToggleConsume, ToggleCrossfade,
SetCrossfade, SetVolume, EditSong, EditLibraryTag, EditLibraryAlbum, EditDirectoryName,
SetCrossfade, SetVolume, EnterDirectory, EditSong, EditLibraryTag, EditLibraryAlbum, EditDirectoryName,
EditPlaylistName, EditLyrics, JumpToBrowser, JumpToMediaLibrary,
JumpToPlaylistEditor, ToggleScreenLock, JumpToTagEditor, JumpToPositionInSong,
SelectItem, SelectRange, ReverseSelection, RemoveSelection, SelectAlbum, SelectFoundItems,
@@ -266,12 +267,15 @@ private:
virtual void run() OVERRIDE;
};
struct PressEnter: BaseAction
struct RunAction: BaseAction
{
PressEnter(): BaseAction(Type::PressEnter, "press_enter") { }
RunAction(): BaseAction(Type::RunAction, "run_action") { }
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
HasActions *m_ha;
};
struct PreviousColumn: BaseAction
@@ -281,6 +285,8 @@ struct PreviousColumn: BaseAction
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
HasColumns *m_hc;
};
struct NextColumn: BaseAction
@@ -290,6 +296,8 @@ struct NextColumn: BaseAction
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
HasColumns *m_hc;
};
struct MasterScreen: BaseAction
@@ -337,6 +345,17 @@ private:
HasSongs *m_hs;
};
struct PlayItem: BaseAction
{
PlayItem(): BaseAction(Type::PlayItem, "play_item") { }
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
HasSongs *m_hs;
};
struct DeletePlaylistItems: BaseAction
{
DeletePlaylistItems(): BaseAction(Type::DeletePlaylistItems, "delete_playlist_items") { }
@@ -474,15 +493,6 @@ private:
virtual void run() OVERRIDE;
};
struct Play: BaseAction
{
Play(): BaseAction(Type::Play, "play") { }
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
};
struct SeekForward: BaseAction
{
SeekForward(): BaseAction(Type::SeekForward, "seek_forward") { }
@@ -665,6 +675,16 @@ private:
virtual void run() OVERRIDE;
};
struct EnterDirectory: BaseAction
{
EnterDirectory(): BaseAction(Type::EnterDirectory, "enter_directory") { }
private:
virtual bool canBeRun() OVERRIDE;
virtual void run() OVERRIDE;
};
struct EditSong: BaseAction
{
EditSong(): BaseAction(Type::EditSong, "edit_song") { }