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

settings: make progressbar_look support 'empty' part of progressbar

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-08-22 16:36:47 +02:00
parent d879a60965
commit a66ab40c25
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/settings.cpp
View File

@@ -343,7 +343,7 @@ void NcmpcppConfig::SetDefaults()
new_header_first_line = "{$b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b}";
new_header_second_line = "{{{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}}";
browser_playlist_prefix << clRed << "(playlist)" << clEnd << ' ';
progressbar = U("=>");
progressbar = U("=>\0");
pattern = "%n - %t";
selected_item_prefix << clMagenta;
selected_item_suffix << clEnd;
@@ -793,9 +793,16 @@ void NcmpcppConfig::Read()
}
else if (cl.find("progressbar_look") != std::string::npos)
{
progressbar = TO_WSTRING(v);
if (progressbar.length() != 2)
FatalError("the length of progressbar_look is not two characters long!");
std::basic_string<my_char_t> pb = TO_WSTRING(v);
if (pb.length() < 2 || pb.length() > 3)
{
std::cerr << "Warning: length of progressbar_look should be either ";
std::cerr << "2 or 3, but it's " << pb.length() << ", discarding.\n";
}
else
progressbar = pb;
// if two characters were specified, add third one as null
progressbar.resize(3);
}
else if (cl.find("default_tag_editor_pattern") != std::string::npos)
{

8
src/status.cpp
View File

@@ -357,11 +357,7 @@ void NcmpcppStatusChanged(MPD::Connection *, MPD::StatusChanges changed, void *)
{
WindowTitle("ncmpc++ ver. "VERSION);
if (!block_progressbar_update)
{
*wFooter << Config.progressbar_color;
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
*wFooter << clEnd;
}
DrawProgressbar(0, 0);
Playlist::ReloadRemaining = 1;
myPlaylist->NowPlaying = -1;
if (Config.new_design)
@@ -659,7 +655,7 @@ void DrawProgressbar(unsigned elapsed, unsigned time)
{
unsigned howlong = time ? wFooter->GetWidth()*elapsed/time : 0;
*wFooter << fmtBold << Config.progressbar_color;
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
mvwhline(wFooter->Raw(), 0, 0, Config.progressbar[2], wFooter->GetWidth());
if (time)
{
unsigned pb_width = std::min(size_t(howlong), wFooter->GetWidth());