X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foptions.c;h=83ae5ff6a63ab57456ef7568a8432f38b478a859;hb=607bf2d55826f861d12b774884cb201bc683051c;hp=b6a49e3c68204d7cdef42abb9271c5c8d0e73145;hpb=54674384020f5d8019ca71f6c283d18ba32d5171;p=ncmpc.git

diff --git a/src/options.c b/src/options.c
index b6a49e3..83ae5ff 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,20 +1,21 @@
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 #include "options.h"
 #include "config.h"
@@ -22,8 +23,10 @@
 #include "charset.h"
 #include "command.h"
 #include "conf.h"
+#include "i18n.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <glib.h>
 
@@ -55,9 +58,11 @@ options_t options = {
 	.find_wrap = true,
 	.wide_cursor = true,
 	.audible_bell = true,
+	.bell_on_wrap = true,
 #ifndef NCMPC_MINI
 	.scroll = DEFAULT_SCROLL,
 	.welcome_screen_list = true,
+	.display_time = true,
 #endif
 };
 
@@ -158,9 +163,21 @@ handle_option(int c, const char *arg)
 	case 'V': /* --version */
 		puts(PACKAGE " version: " VERSION "\n"
 		     "build options:"
+#ifdef NCMPC_MINI
+		     " mini"
+#endif
 #ifndef NDEBUG
 		     " debug"
 #endif
+#ifdef ENABLE_MULTIBYTE
+		     " multibyte"
+#endif
+#ifdef ENABLE_WIDE
+		     " wide"
+#endif
+#ifdef ENABLE_LOCALE
+		     " locale"
+#endif
 #ifdef ENABLE_NLS
 		     " nls"
 #endif
@@ -169,19 +186,41 @@ handle_option(int c, const char *arg)
 #else
 		     " no-colors"
 #endif
+#ifdef ENABLE_LIRC
+		     " lirc"
+#endif
 #ifdef HAVE_GETMOUSE
 		     " getmouse"
 #endif
 #ifdef ENABLE_ARTIST_SCREEN
 		     " artist-screen"
 #endif
+#ifdef ENABLE_HELP_SCREEN
+		     " help-screen"
+#endif
 #ifdef ENABLE_SEARCH_SCREEN
 		     " search-screen"
 #endif
+#ifdef ENABLE_SONG_SCREEN
+		     " song-screen"
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
 		     " key-screen"
 #endif
+#ifdef ENABLE_LYRICS_SCREEN
+		     " lyrics-screen"
+#endif
+#ifdef ENABLE_OUTPUTS_SCREEN
+		     " outputs-screen"
+#endif
+
 		     "\n");
+#ifndef NCMPC_MINI
+		if (strcmp("translator-credits", _("translator-credits")) != 0)
+			/* To translators: these credits are shown
+			   when ncmpc is started with "--version" */
+			printf("\n%s\n", _("translator-credits"));
+#endif
 		exit(EXIT_SUCCESS);
 	case 'c': /* --colors */
 #ifdef ENABLE_COLORS