screen_lyrics: return if fork fails

[ncmpc.git] / src / screen_help.c

diff --git a/src/screen_help.c b/src/screen_help.c
index a501aad045281cf818ab23c6e516c704879354aa..913ab5fa80884521a2da31c0faf29a1777b95cd7 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 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.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_help.h"
 #include "screen_interface.h"
@@ -56,7 +56,7 @@ static const struct help_text_row help_text[] = {
 
        { 0, CMD_SCREEN_PREVIOUS,NULL },
        { 0, CMD_SCREEN_NEXT, NULL },
-    { 0, CMD_SCREEN_SWAP, NULL },
+       { 0, CMD_SCREEN_SWAP, NULL },
        { 0, CMD_SCREEN_HELP, NULL },
        { 0, CMD_SCREEN_PLAY, NULL },
        { 0, CMD_SCREEN_FILE, NULL },
@@ -72,6 +72,9 @@ static const struct help_text_row help_text[] = {
 #ifdef ENABLE_OUTPUTS_SCREEN
        { 0, CMD_SCREEN_OUTPUTS, NULL },
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       { 0, CMD_SCREEN_CHAT, NULL },
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
        { 0, CMD_SCREEN_KEYDEF, NULL },
 #endif
@@ -105,7 +108,9 @@ static const struct help_text_row help_text[] = {
        { 0, CMD_LIST_JUMP, NULL },
        { 0, CMD_TOGGLE_FIND_WRAP, NULL },
        { 0, CMD_LOCATE, NULL },
+#ifdef ENABLE_SONG_SCREEN
        { 0, CMD_SCREEN_SONG, NULL },
+#endif
        { 0, CMD_NONE, NULL },
        { 0, CMD_QUIT, NULL },
 
@@ -160,7 +165,9 @@ static const struct help_text_row help_text[] = {
           from the server */
        { 0, CMD_INTERRUPT, N_("Interrupt retrieval") },
        { 0, CMD_LYRICS_UPDATE, N_("Download lyrics for currently playing song") },
+       { 0, CMD_EDIT, N_("Add or edit lyrics") },
        { 0, CMD_SAVE_PLAYLIST, N_("Save lyrics") },
+       { 0, CMD_DELETE, N_("Delete saved lyrics") },
 #endif
 #ifdef ENABLE_OUTPUTS_SCREEN
        { 0, CMD_NONE, NULL },
@@ -169,6 +176,13 @@ static const struct help_text_row help_text[] = {
        { 2, CMD_NONE, NULL },
        { 0, CMD_PLAY, N_("Enable/disable output") },
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       { 0, CMD_NONE, NULL },
+       { 0, CMD_NONE, NULL },
+       { 1, CMD_NONE, N_("Chat screen") },
+       { 2, CMD_NONE, NULL },
+       { 0, CMD_PLAY, N_("Write a message") },
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
        { 0, CMD_NONE, NULL },
        { 0, CMD_NONE, NULL },
@@ -176,6 +190,7 @@ static const struct help_text_row help_text[] = {
        { 2, CMD_NONE, NULL },
        { 0, CMD_PLAY, N_("Edit keydefs for selected command") },
        { 0, CMD_DELETE, N_("Remove selected keydef") },
+       { 0, CMD_ADD, N_("Add a keydef") },
        { 0, CMD_GO_PARENT_DIRECTORY, N_("Go up a level") },
        { 0, CMD_SAVE_PLAYLIST, N_("Apply and save changes") },
 #endif
@@ -202,7 +217,7 @@ list_callback(unsigned i, G_GNUC_UNUSED void *data)
 static void
 help_init(WINDOW *w, int cols, int rows)
 {
-  lw = list_window_init(w, cols, rows);
+       lw = list_window_init(w, cols, rows);
        lw->hide_cursor = true;
        list_window_set_length(lw, G_N_ELEMENTS(help_text));
 }
@@ -216,7 +231,7 @@ help_resize(int cols, int rows)
 static void
 help_exit(void)
 {
-  list_window_free(lw);
+       list_window_free(lw);
 }
 
 
@@ -242,7 +257,7 @@ screen_help_paint_callback(WINDOW *w, unsigned i,
 
        if (row->command == CMD_NONE) {
                if (row->text != NULL)
-                       mvwaddstr(w, y, 6, row->text);
+                       mvwaddstr(w, y, 6, _(row->text));
                else if (row->highlight == 2)
                        mvwhline(w, y, 3, '-', width - 6);
        } else {