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

settings: make defaults more pretty

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-08-31 16:33:38 +02:00
parent 2a4c7538b8
commit 3e713d06f6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/config
View File

@@ -173,7 +173,7 @@
# #
#song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9} #song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9}
# #
#song_status_format = {{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f} #song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f}
# #
#song_library_format = {%n - }{%t}|{%f} #song_library_format = {%n - }{%t}|{%f}
# #
@@ -268,7 +268,7 @@
## not available. ## not available.
## ##
# #
#song_columns_list_format = (7f)[green]{l} (25)[cyan]{a} (40)[]{t|f} (30)[red]{b} #song_columns_list_format = (20)[]{a} (6f)[green]{NE} (50)[white]{t|f:Title} (20)[cyan]{b} (7f)[magenta]{l}
# #
##### various settings ##### ##### various settings #####
# #
@@ -290,7 +290,7 @@
## ##
## Note: Possible display modes: classic, columns. ## Note: Possible display modes: classic, columns.
## ##
#playlist_display_mode = classic #playlist_display_mode = columns
# #
#browser_display_mode = classic #browser_display_mode = classic
# #
@@ -485,9 +485,9 @@
# #
#main_window_highlight_color = yellow #main_window_highlight_color = yellow
# #
#progressbar_color = default #progressbar_color = black
# #
#progressbar_elapsed_color = default #progressbar_elapsed_color = green
# #
#statusbar_color = default #statusbar_color = default
# #

8
src/settings.cpp
View File

@@ -314,7 +314,7 @@ bool Configuration::read(const std::string &config_path)
song_window_title_format, "{%a - }{%t}|{%f}", adjust_and_validate_format song_window_title_format, "{%a - }{%t}|{%f}", adjust_and_validate_format
)); ));
p.add("song_columns_list_format", assign_default<std::string>( p.add("song_columns_list_format", assign_default<std::string>(
columns_format, "(7f)[green]{l} (25)[cyan]{a} (40)[]{t|f} (30)[red]{b}", columns_format, "(20)[]{a} (6f)[green]{NE} (50)[white]{t|f:Title} (20)[cyan]{b} (7f)[magenta]{l}",
[this](std::string &&v) { [this](std::string &&v) {
boost::tie(columns, song_in_columns_to_string_format) = generate_columns(v); boost::tie(columns, song_in_columns_to_string_format) = generate_columns(v);
return v; return v;
@@ -332,7 +332,7 @@ bool Configuration::read(const std::string &config_path)
playlist_separate_albums, false playlist_separate_albums, false
)); ));
p.add("playlist_display_mode", assign_default( p.add("playlist_display_mode", assign_default(
playlist_display_mode, DisplayMode::Classic playlist_display_mode, DisplayMode::Columns
)); ));
p.add("browser_display_mode", assign_default( p.add("browser_display_mode", assign_default(
browser_display_mode, DisplayMode::Classic browser_display_mode, DisplayMode::Classic
@@ -598,10 +598,10 @@ bool Configuration::read(const std::string &config_path)
main_highlight_color, NC::Color::Yellow main_highlight_color, NC::Color::Yellow
)); ));
p.add("progressbar_color", assign_default( p.add("progressbar_color", assign_default(
progressbar_color, NC::Color::Default progressbar_color, NC::Color::Black
)); ));
p.add("progressbar_elapsed_color", assign_default( p.add("progressbar_elapsed_color", assign_default(
progressbar_elapsed_color, NC::Color::Default progressbar_elapsed_color, NC::Color::Green
)); ));
p.add("statusbar_color", assign_default( p.add("statusbar_color", assign_default(
statusbar_color, NC::Color::Default statusbar_color, NC::Color::Default