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

new feature: allow for fixed size columns

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-07-10 19:17:12 +02:00
parent 209f5337ee
commit c20d8694ae
9 changed files with 90 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings.cpp
View File

@@ -230,8 +230,8 @@ void DefaultConfiguration(ncmpcpp_config &conf)
{
conf.mpd_host = "localhost";
conf.empty_tag = "<empty>";
conf.song_list_columns_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t} (30)[red]{b}";
conf.song_list_format = "{%a - }{%t}|{$8%f$9}%r{$3(%l)$9}";
conf.song_columns_list_format = "(7)[green]{l} (25)[cyan]{a} (40)[]{t} (30)[red]{b}";
conf.song_status_format = "{(%l) }{%a - }{%t}|{%f}";
conf.song_window_title_format = "{%a - }{%t}|{%f}";
conf.song_library_format = "{%n - }{%t}|{%f}";
@@ -453,10 +453,7 @@ void ReadConfiguration(ncmpcpp_config &conf)
std::ifstream f(config_file.c_str());
std::string cl, v;
if (!f.is_open())
return;
while (!f.eof())
while (f.is_open() && !f.eof())
{
getline(f, cl);
if (!cl.empty() && cl[0] != '#')
@@ -515,7 +512,7 @@ void ReadConfiguration(ncmpcpp_config &conf)
else if (cl.find("song_columns_list_format") != std::string::npos)
{
if (!v.empty())
conf.song_columns_list_format = v;
conf.song_list_columns_format = v;
}
else if (cl.find("song_status_format") != std::string::npos)
{
@@ -784,6 +781,15 @@ void ReadConfiguration(ncmpcpp_config &conf)
}
}
f.close();
for (std::string width = GetLineValue(conf.song_list_columns_format, '(', ')', 1); !width.empty(); width = GetLineValue(conf.song_list_columns_format, '(', ')', 1))
{
Column col;
col.color = IntoColor(GetLineValue(conf.song_list_columns_format, '[', ']', 1));
col.type = GetLineValue(conf.song_list_columns_format, '{', '}', 1)[0];
col.fixed = *width.rbegin() == 'f';
col.width = StrToInt(width);
conf.columns.push_back(col);
}
}