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

rename Menu::BoldOption() to Menu::Bold()

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-19 02:44:44 +02:00
parent 3bdb798852
commit ad685091bc
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/browser.cpp
View File

@@ -108,7 +108,7 @@ void Browser::EnterPressed()
}
case itSong:
{
w->BoldOption(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 1));
w->Bold(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 1));
break;
}
case itPlaylist:
@@ -167,7 +167,7 @@ void Browser::SpacePressed()
}
case itSong:
{
w->BoldOption(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 0));
w->Bold(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 0));
break;
}
case itPlaylist:
@@ -503,7 +503,7 @@ void Browser::UpdateItemList()
break;
}
}
w->BoldOption(i, bold);
w->Bold(i, bold);
bold = 0;
}
}

2
src/helpers.cpp
View File

@@ -259,7 +259,7 @@ void UpdateSongList(Menu<Song> *menu)
break;
}
}
menu->BoldOption(i, bold);
menu->Bold(i, bold);
bold = 0;
}
menu->Refresh();

2
src/media_library.cpp
View File

@@ -502,7 +502,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
ShowMessage("Adding songs from album \"%s\"", Albums->Current().second.Album.c_str());
}
else if (w == Songs && !Songs->Empty())
Songs->BoldOption(Songs->Choice(), myPlaylist->Add(Songs->Current(), Songs->isBold(), add_n_play));
Songs->Bold(Songs->Choice(), myPlaylist->Add(Songs->Current(), Songs->isBold(), add_n_play));
FreeSongList(list);
if (!add_n_play)
{

8
src/menu.h
View File

@@ -263,7 +263,7 @@ namespace NCurses
/// @param pos position of item to be bolded/unbolded
/// @param state state of bold attribute
///
void BoldOption(int pos, bool state);
void Bold(int pos, bool state);
/// Makes given position static/active.
/// Static positions cannot be highlighted.
@@ -651,7 +651,7 @@ template <typename T> void NCurses::Menu<T>::IntoSeparator(size_t pos)
(*itsOptionsPtr)[pos] = 0;
}
template <typename T> void NCurses::Menu<T>::BoldOption(int pos, bool state)
template <typename T> void NCurses::Menu<T>::Bold(int pos, bool state)
{
if (!itsOptionsPtr->at(pos))
return;
@@ -729,7 +729,7 @@ template <typename T> void NCurses::Menu<T>::Refresh()
continue;
}
if ((*itsOptionsPtr)[i]->isBold)
Bold(1);
Window::Bold(1);
if (highlightEnabled && int(i) == itsHighlight)
{
Reverse(1);
@@ -748,7 +748,7 @@ template <typename T> void NCurses::Menu<T>::Refresh()
Reverse(0);
}
if ((*itsOptionsPtr)[i]->isBold)
Bold(0);
Window::Bold(0);
line++;
}
Window::Refresh();

8
src/ncmpcpp.cpp
View File

@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
for (std::vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
if (*it == size_t(myPlaylist->NowPlaying) && list.front() > 0)
myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0);
myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0);
std::vector<size_t> origs(list);
@@ -844,7 +844,7 @@ int main(int argc, char *argv[])
from = to = myPlaylist->Items->Choice();
// unbold now playing as if song changes during move, this won't be unbolded.
if (to == size_t(myPlaylist->NowPlaying) && to > 0)
myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0);
myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0);
while (Keypressed(input, Key.MvSongUp) && to > 0)
{
TraceMpdStatus();
@@ -927,7 +927,7 @@ int main(int argc, char *argv[])
for (std::vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
if (*it == size_t(myPlaylist->NowPlaying) && list.back() < myPlaylist->Items->Size()-1)
myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0);
myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0);
std::vector<size_t> origs(list);
@@ -958,7 +958,7 @@ int main(int argc, char *argv[])
from = to = myPlaylist->Items->Choice();
// unbold now playing as if song changes during move, this won't be unbolded.
if (to == size_t(myPlaylist->NowPlaying) && to < myPlaylist->Items->Size()-1)
myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0);
myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0);
while (Keypressed(input, Key.MvSongDown) && to < myPlaylist->Items->Size()-1)
{
TraceMpdStatus();

4
src/outputs.cpp
View File

@@ -78,7 +78,7 @@ void Outputs::EnterPressed()
{
ShowMessage("Output \"%s\" disabled", w->Current().first.c_str());
w->Current().second = 0;
w->BoldOption(w->Choice(), 0);
w->Bold(w->Choice(), 0);
}
}
else
@@ -87,7 +87,7 @@ void Outputs::EnterPressed()
{
ShowMessage("Output \"%s\" enabled", w->Current().first.c_str());
w->Current().second = 1;
w->BoldOption(w->Choice(), 1);
w->Bold(w->Choice(), 1);
}
}

2
src/playlist_editor.cpp
View File

@@ -202,7 +202,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play)
ShowMessage("Loading playlist %s...", Playlists->Current().c_str());
}
else if (w == Content && !Content->Empty())
Content->BoldOption(Content->Choice(), myPlaylist->Add(Content->Current(), Content->isBold(), add_n_play));
Content->Bold(Content->Choice(), myPlaylist->Add(Content->Current(), Content->isBold(), add_n_play));
FreeSongList(list);
if (!add_n_play)

6
src/search_engine.cpp
View File

@@ -236,7 +236,7 @@ void SearchEngine::EnterPressed()
}
default:
{
w->BoldOption(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1));
w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1));
break;
}
}
@@ -256,7 +256,7 @@ void SearchEngine::SpacePressed()
return;
}
w->BoldOption(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 0));
w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 0));
w->Scroll(wDown);
}
@@ -321,7 +321,7 @@ void SearchEngine::UpdateFoundList()
break;
}
}
w->BoldOption(i, bold);
w->Bold(i, bold);
bold = 0;
}
}

4
src/status.cpp
View File

@@ -193,12 +193,12 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
myPlaylist->Items->ShowAll();
try
{
myPlaylist->Items->BoldOption(myPlaylist->OldPlaying, 0);
myPlaylist->Items->Bold(myPlaylist->OldPlaying, 0);
}
catch (std::out_of_range) { }
try
{
myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 1);
myPlaylist->Items->Bold(myPlaylist->NowPlaying, 1);
}
catch (std::out_of_range) { }
if (was_filtered)