From 3291d2fe36ab2e38af0398adb2b4c0a88dc04062 Mon Sep 17 00:00:00 2001
From: unK <electricityispower@gmail.com>
Date: Sun, 28 Sep 2008 22:44:40 +0200
Subject: [PATCH] change place of storing config files to ~/.ncmpcpp folder

---
 doc/Makefile.am            | 2 +-
 doc/{ncmpcpprc => config}  | 8 ++++----
 doc/{ncmpcpp_keys => keys} | 5 ++---
 src/settings.cpp           | 8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename doc/{ncmpcpprc => config} (93%)
 rename doc/{ncmpcpp_keys => keys} (93%)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f0cffb53..850fafae 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
 docdir = $(prefix)/share/doc/$(PACKAGE)
-doc_DATA = ncmpcpp_keys ncmpcpprc
+doc_DATA = config keys
 EXTRA_DIST = $(doc_DATA)
diff --git a/doc/ncmpcpprc b/doc/config
similarity index 93%
rename from doc/ncmpcpprc
rename to doc/config
index 0146cc95..da1608a7 100644
--- a/doc/ncmpcpprc
+++ b/doc/config
@@ -1,7 +1,7 @@
-#################################################
-## this is example configuration file, copy it ##
-## to ~/.ncmpcpprc and set up your preferences ##
-#################################################
+####################################################
+## this is example configuration file, copy it to ##
+## ~/.ncmpcpp/config and set up your preferences  ##
+####################################################
 #
 ##### connection settings #####
 #
diff --git a/doc/ncmpcpp_keys b/doc/keys
similarity index 93%
rename from doc/ncmpcpp_keys
rename to doc/keys
index 4f5a4e06..e4b8b0e0 100644
--- a/doc/ncmpcpp_keys
+++ b/doc/keys
@@ -1,6 +1,6 @@
 #####################################################
 ## this is example key configuration file, copy it ##
-## to ~/.ncmpcpp_keys and set up your preferences  ##
+## to ~/.ncmpcpp/keys and set up your preferences  ##
 #####################################################
 ##
 ## Tips:
@@ -9,8 +9,7 @@
 ## - a command can be disabled by binding it to 0
 ##
 ## Note: First bind of volume_up/down
-## will be used to switch between columns
-## on media library screen.
+## will be used to switch between columns.
 ##
 #
 #key_up = 259 'k'
diff --git a/src/settings.cpp b/src/settings.cpp
index ec4b4ef8..c11afc5e 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -20,8 +20,8 @@
 
 #include "settings.h"
 
-const string config_file = home_folder + "/.ncmpcpprc";
-const string keys_config_file = home_folder + "/.ncmpcpp_keys";
+const string config_file = home_folder + "/.ncmpcpp/config";
+const string keys_config_file = home_folder + "/.ncmpcpp/keys";
 
 using std::ifstream;
 
@@ -153,8 +153,8 @@ void DefaultKeys(ncmpcpp_keys &keys)
 void DefaultConfiguration(ncmpcpp_config &conf)
 {
 	conf.mpd_music_dir = "/var/lib/mpd/music/";
-	conf.song_list_format = "{[.green](%l)[/green] }{%a - }{%t}|{[.white]%f[/white]}";
-	conf.song_columns_list_format = "(8)[green]{l} (28)[cyan]{a} (28){b} (50)[red]{t}";
+	conf.song_list_format = "{%a - }{%t}|{[.white]%f[/white]}%r{[.green](%l)[/green]}";
+	conf.song_columns_list_format = "(8)[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}";