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

remember active columns

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-06 17:13:55 +01:00
parent d68824f0f2
commit b607617193
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/ncmpcpp.cpp
View File

@@ -98,11 +98,13 @@ Menu<Song> *mPlaylist;
Menu<Item> *mBrowser; Menu<Item> *mBrowser;
Menu< std::pair<Buffer *, Song *> > *mSearcher; Menu< std::pair<Buffer *, Song *> > *mSearcher;
Window *wLibActiveCol;
Menu<string> *mLibArtists; Menu<string> *mLibArtists;
Menu<StringPair> *mLibAlbums; Menu<StringPair> *mLibAlbums;
Menu<Song> *mLibSongs; Menu<Song> *mLibSongs;
#ifdef HAVE_TAGLIB_H #ifdef HAVE_TAGLIB_H
Window *wTagEditorActiveCol;
Menu<Buffer> *mTagEditor; Menu<Buffer> *mTagEditor;
Menu<StringPair> *mEditorAlbums; Menu<StringPair> *mEditorAlbums;
Menu<StringPair> *mEditorDirs; Menu<StringPair> *mEditorDirs;
@@ -112,6 +114,7 @@ Menu<StringPair> *mEditorLeftCol;
Menu<string> *mEditorTagTypes; Menu<string> *mEditorTagTypes;
Menu<Song> *mEditorTags; Menu<Song> *mEditorTags;
Window *wPlaylistEditorActiveCol;
Menu<string> *mPlaylistList; Menu<string> *mPlaylistList;
Menu<Song> *mPlaylistEditor; Menu<Song> *mPlaylistEditor;
@@ -247,7 +250,7 @@ int main(int argc, char *argv[])
size_t right_col_startx = left_col_width+middle_col_width+2; size_t right_col_startx = left_col_width+middle_col_width+2;
mLibArtists = new Menu<string>(0, main_start_y, left_col_width, main_height, IntoStr(Config.media_lib_primary_tag) + "s", Config.main_color, brNone); mLibArtists = new Menu<string>(0, main_start_y, left_col_width, main_height, IntoStr(Config.media_lib_primary_tag) + "s", Config.main_color, brNone);
mLibArtists->HighlightColor(Config.main_highlight_color); mLibArtists->HighlightColor(Config.active_column_color);
mLibArtists->SetTimeout(ncmpcpp_window_timeout); mLibArtists->SetTimeout(ncmpcpp_window_timeout);
mLibArtists->SetItemDisplayer(GenericDisplayer); mLibArtists->SetItemDisplayer(GenericDisplayer);
@@ -277,12 +280,12 @@ int main(int argc, char *argv[])
size_t tagedit_right_col_startx = tagedit_left_col_width+tagedit_middle_col_width+2; size_t tagedit_right_col_startx = tagedit_left_col_width+tagedit_middle_col_width+2;
mEditorAlbums = new Menu<StringPair>(0, main_start_y, tagedit_left_col_width, main_height, "Albums", Config.main_color, brNone); mEditorAlbums = new Menu<StringPair>(0, main_start_y, tagedit_left_col_width, main_height, "Albums", Config.main_color, brNone);
mEditorAlbums->HighlightColor(Config.main_highlight_color); mEditorAlbums->HighlightColor(Config.active_column_color);
mEditorAlbums->SetTimeout(ncmpcpp_window_timeout); mEditorAlbums->SetTimeout(ncmpcpp_window_timeout);
mEditorAlbums->SetItemDisplayer(DisplayStringPair); mEditorAlbums->SetItemDisplayer(DisplayStringPair);
mEditorDirs = new Menu<StringPair>(0, main_start_y, tagedit_left_col_width, main_height, "Directories", Config.main_color, brNone); mEditorDirs = new Menu<StringPair>(0, main_start_y, tagedit_left_col_width, main_height, "Directories", Config.main_color, brNone);
mEditorDirs->HighlightColor(Config.main_highlight_color); mEditorDirs->HighlightColor(Config.active_column_color);
mEditorDirs->SetTimeout(ncmpcpp_window_timeout); mEditorDirs->SetTimeout(ncmpcpp_window_timeout);
mEditorDirs->SetItemDisplayer(DisplayStringPair); mEditorDirs->SetItemDisplayer(DisplayStringPair);
mEditorLeftCol = Config.albums_in_tag_editor ? mEditorAlbums : mEditorDirs; mEditorLeftCol = Config.albums_in_tag_editor ? mEditorAlbums : mEditorDirs;
@@ -302,7 +305,7 @@ int main(int argc, char *argv[])
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
mPlaylistList = new Menu<string>(0, main_start_y, left_col_width, main_height, "Playlists", Config.main_color, brNone); mPlaylistList = new Menu<string>(0, main_start_y, left_col_width, main_height, "Playlists", Config.main_color, brNone);
mPlaylistList->HighlightColor(Config.main_highlight_color); mPlaylistList->HighlightColor(Config.active_column_color);
mPlaylistList->SetTimeout(ncmpcpp_window_timeout); mPlaylistList->SetTimeout(ncmpcpp_window_timeout);
mPlaylistList->SetItemDisplayer(GenericDisplayer); mPlaylistList->SetItemDisplayer(GenericDisplayer);
@@ -314,6 +317,13 @@ int main(int argc, char *argv[])
mPlaylistEditor->SetItemDisplayer(DisplaySong); mPlaylistEditor->SetItemDisplayer(DisplaySong);
mPlaylistEditor->SetItemDisplayerUserData(&Config.song_list_format); mPlaylistEditor->SetItemDisplayerUserData(&Config.song_list_format);
// set default active columns
wLibActiveCol = mLibArtists;
wPlaylistEditorActiveCol = mPlaylistList;
# ifdef HAVE_TAGLIB_H
wTagEditorActiveCol = mEditorLeftCol;
# endif // HAVE_TAGLIB_H
# ifdef ENABLE_CLOCK # ifdef ENABLE_CLOCK
size_t clock_width = Config.clock_display_seconds ? 60 : 40; size_t clock_width = Config.clock_display_seconds ? 60 : 40;
size_t clock_height = 8; size_t clock_height = 8;
@@ -574,7 +584,7 @@ int main(int argc, char *argv[])
{ {
mLibAlbums->HighlightColor(Config.main_highlight_color); mLibAlbums->HighlightColor(Config.main_highlight_color);
mLibArtists->HighlightColor(Config.active_column_color); mLibArtists->HighlightColor(Config.active_column_color);
wCurrent = mLibArtists; wCurrent = wLibActiveCol = mLibArtists;
} }
if (!mLibArtists->Empty() && mLibSongs->Empty()) if (!mLibArtists->Empty() && mLibSongs->Empty())
@@ -667,7 +677,7 @@ int main(int argc, char *argv[])
{ {
mPlaylistEditor->HighlightColor(Config.main_highlight_color); mPlaylistEditor->HighlightColor(Config.main_highlight_color);
mPlaylistList->HighlightColor(Config.active_column_color); mPlaylistList->HighlightColor(Config.active_column_color);
wCurrent = mPlaylistList; wCurrent = wPlaylistEditorActiveCol = mPlaylistList;
} }
if (mPlaylistEditor->Empty()) if (mPlaylistEditor->Empty())
@@ -1959,8 +1969,7 @@ int main(int argc, char *argv[])
else if (wCurrent == mEditorLeftCol) else if (wCurrent == mEditorLeftCol)
{ {
Config.albums_in_tag_editor = !Config.albums_in_tag_editor; Config.albums_in_tag_editor = !Config.albums_in_tag_editor;
mEditorLeftCol = Config.albums_in_tag_editor ? mEditorAlbums : mEditorDirs; wCurrent = wTagEditorActiveCol = mEditorLeftCol = Config.albums_in_tag_editor ? mEditorAlbums : mEditorDirs;
wCurrent = mEditorLeftCol;
ShowMessage("Switched to %s view", Config.albums_in_tag_editor ? "albums" : "directories"); ShowMessage("Switched to %s view", Config.albums_in_tag_editor ? "albums" : "directories");
mEditorLeftCol->Display(); mEditorLeftCol->Display();
mEditorTags->Clear(0); mEditorTags->Clear(0);
@@ -1985,7 +1994,7 @@ int main(int argc, char *argv[])
continue; continue;
mLibArtists->HighlightColor(Config.main_highlight_color); mLibArtists->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mLibAlbums; wCurrent = wLibActiveCol = mLibAlbums;
mLibAlbums->HighlightColor(Config.active_column_color); mLibAlbums->HighlightColor(Config.active_column_color);
if (!mLibAlbums->Empty()) if (!mLibAlbums->Empty())
continue; continue;
@@ -1994,7 +2003,7 @@ int main(int argc, char *argv[])
{ {
mLibAlbums->HighlightColor(Config.main_highlight_color); mLibAlbums->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mLibSongs; wCurrent = wLibActiveCol = mLibSongs;
mLibSongs->HighlightColor(Config.active_column_color); mLibSongs->HighlightColor(Config.active_column_color);
} }
} }
@@ -2005,7 +2014,7 @@ int main(int argc, char *argv[])
CLEAR_FIND_HISTORY; CLEAR_FIND_HISTORY;
mPlaylistList->HighlightColor(Config.main_highlight_color); mPlaylistList->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mPlaylistEditor; wCurrent = wPlaylistEditorActiveCol = mPlaylistEditor;
mPlaylistEditor->HighlightColor(Config.active_column_color); mPlaylistEditor->HighlightColor(Config.active_column_color);
} }
} }
@@ -2017,14 +2026,14 @@ int main(int argc, char *argv[])
{ {
mEditorLeftCol->HighlightColor(Config.main_highlight_color); mEditorLeftCol->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mEditorTagTypes; wCurrent = wTagEditorActiveCol = mEditorTagTypes;
mEditorTagTypes->HighlightColor(Config.active_column_color); mEditorTagTypes->HighlightColor(Config.active_column_color);
} }
else if (wCurrent == mEditorTagTypes && mEditorTagTypes->Choice() < 12 && !mEditorTags->Empty()) else if (wCurrent == mEditorTagTypes && mEditorTagTypes->Choice() < 12 && !mEditorTags->Empty())
{ {
mEditorTagTypes->HighlightColor(Config.main_highlight_color); mEditorTagTypes->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mEditorTags; wCurrent = wTagEditorActiveCol = mEditorTags;
mEditorTags->HighlightColor(Config.active_column_color); mEditorTags->HighlightColor(Config.active_column_color);
} }
} }
@@ -2041,7 +2050,7 @@ int main(int argc, char *argv[])
{ {
mLibSongs->HighlightColor(Config.main_highlight_color); mLibSongs->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mLibAlbums; wCurrent = wLibActiveCol = mLibAlbums;
mLibAlbums->HighlightColor(Config.active_column_color); mLibAlbums->HighlightColor(Config.active_column_color);
if (!mLibAlbums->Empty()) if (!mLibAlbums->Empty())
continue; continue;
@@ -2050,7 +2059,7 @@ int main(int argc, char *argv[])
{ {
mLibAlbums->HighlightColor(Config.main_highlight_color); mLibAlbums->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mLibArtists; wCurrent = wLibActiveCol = mLibArtists;
mLibArtists->HighlightColor(Config.active_column_color); mLibArtists->HighlightColor(Config.active_column_color);
} }
} }
@@ -2061,7 +2070,7 @@ int main(int argc, char *argv[])
CLEAR_FIND_HISTORY; CLEAR_FIND_HISTORY;
mPlaylistEditor->HighlightColor(Config.main_highlight_color); mPlaylistEditor->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mPlaylistList; wCurrent = wPlaylistEditorActiveCol = mPlaylistList;
mPlaylistList->HighlightColor(Config.active_column_color); mPlaylistList->HighlightColor(Config.active_column_color);
} }
} }
@@ -2073,14 +2082,14 @@ int main(int argc, char *argv[])
{ {
mEditorTags->HighlightColor(Config.main_highlight_color); mEditorTags->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mEditorTagTypes; wCurrent = wTagEditorActiveCol = mEditorTagTypes;
mEditorTagTypes->HighlightColor(Config.active_column_color); mEditorTagTypes->HighlightColor(Config.active_column_color);
} }
else if (wCurrent == mEditorTagTypes) else if (wCurrent == mEditorTagTypes)
{ {
mEditorTagTypes->HighlightColor(Config.main_highlight_color); mEditorTagTypes->HighlightColor(Config.main_highlight_color);
wCurrent->Refresh(); wCurrent->Refresh();
wCurrent = mEditorLeftCol; wCurrent = wTagEditorActiveCol = mEditorLeftCol;
mEditorLeftCol->HighlightColor(Config.active_column_color); mEditorLeftCol->HighlightColor(Config.active_column_color);
} }
} }
@@ -3737,17 +3746,13 @@ int main(int argc, char *argv[])
{ {
CLEAR_FIND_HISTORY; CLEAR_FIND_HISTORY;
mLibArtists->HighlightColor(Config.active_column_color);
mLibAlbums->HighlightColor(Config.main_highlight_color);
mLibSongs->HighlightColor(Config.main_highlight_color);
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
// redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
REFRESH_MEDIA_LIBRARY_SCREEN; REFRESH_MEDIA_LIBRARY_SCREEN;
wCurrent = mLibArtists; wCurrent = wLibActiveCol;
current_screen = csLibrary; current_screen = csLibrary;
UpdateSongList(mLibSongs); UpdateSongList(mLibSongs);
@@ -3759,16 +3764,13 @@ int main(int argc, char *argv[])
{ {
CLEAR_FIND_HISTORY; CLEAR_FIND_HISTORY;
mPlaylistList->HighlightColor(Config.active_column_color);
mPlaylistEditor->HighlightColor(Config.main_highlight_color);
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
// redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
REFRESH_PLAYLIST_EDITOR_SCREEN; REFRESH_PLAYLIST_EDITOR_SCREEN;
wCurrent = mPlaylistList; wCurrent = wPlaylistEditorActiveCol;
current_screen = csPlaylistEditor; current_screen = csPlaylistEditor;
UpdateSongList(mPlaylistEditor); UpdateSongList(mPlaylistEditor);
@@ -3782,11 +3784,6 @@ int main(int argc, char *argv[])
{ {
CLEAR_FIND_HISTORY; CLEAR_FIND_HISTORY;
mEditorAlbums->HighlightColor(Config.active_column_color);
mEditorDirs->HighlightColor(Config.active_column_color);
mEditorTagTypes->HighlightColor(Config.main_highlight_color);
mEditorTags->HighlightColor(Config.main_highlight_color);
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
// redraw_screen = 1; // redraw_screen = 1;
@@ -3817,7 +3814,7 @@ int main(int argc, char *argv[])
mEditorTagTypes->AddOption("lower all letters"); mEditorTagTypes->AddOption("lower all letters");
} }
wCurrent = mEditorLeftCol; wCurrent = wTagEditorActiveCol;
current_screen = csTagEditor; current_screen = csTagEditor;
} }
} }