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

add interface HasColumns and its appropriate implementations

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-13 18:24:57 +02:00
parent 31b06470d1
commit cfe738b2f7
10 changed files with 230 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/actions.cpp
View File

@@ -668,46 +668,24 @@ void PressSpace::Run()
bool PreviousColumn::canBeRun() const
{
return (myScreen == myLibrary && myLibrary->isPrevColumnAvailable())
|| (myScreen == myPlaylistEditor && myPlaylistEditor->isPrevColumnAvailable())
# ifdef HAVE_TAGLIB_H
|| (myScreen == myTagEditor && myTagEditor->isPrevColumnAvailable())
# endif // HAVE_TAGLIB_H
;
auto hc = hasColumns(myScreen);
return hc && hc->previousColumnAvailable();
}
void PreviousColumn::Run()
{
if (myScreen == myLibrary)
myLibrary->PrevColumn();
else if (myScreen == myPlaylistEditor)
myPlaylistEditor->PrevColumn();
# ifdef HAVE_TAGLIB_H
else if (myScreen == myTagEditor)
myTagEditor->PrevColumn();
# endif // HAVE_TAGLIB_H
hasColumns(myScreen)->previousColumn();
}
bool NextColumn::canBeRun() const
{
return (myScreen == myLibrary && myLibrary->isNextColumnAvailable())
|| (myScreen == myPlaylistEditor && myPlaylistEditor->isNextColumnAvailable())
# ifdef HAVE_TAGLIB_H
|| (myScreen == myTagEditor && myTagEditor->isNextColumnAvailable())
# endif // HAVE_TAGLIB_H
;
auto hc = hasColumns(myScreen);
return hc && hc->nextColumnAvailable();
}
void NextColumn::Run()
{
if (myScreen == myLibrary)
myLibrary->NextColumn();
else if (myScreen == myPlaylistEditor)
myPlaylistEditor->NextColumn();
# ifdef HAVE_TAGLIB_H
else if (myScreen == myTagEditor)
myTagEditor->NextColumn();
# endif // HAVE_TAGLIB_H
hasColumns(myScreen)->nextColumn();
}
bool MasterScreen::canBeRun() const