]> git.deb.at Git - pkg/abook.git/blobdiff - ui.c
- merge localized boolean question patch (Cedric Duval)
[pkg/abook.git] / ui.c
diff --git a/ui.c b/ui.c
index 023f20667b730f5a25dbae7f3640d71ccf013440..874812d48430bb64a9a9fb99dee73710dc75791e 100644 (file)
--- a/ui.c
+++ b/ui.c
 #include "ui.h"
 #include "edit.h"
 #include "database.h"
+#include "gettext.h"
 #include "list.h"
 #include "misc.h"
 #include "options.h"
 #include "filter.h"
+#include "xmalloc.h"
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#ifdef HAVE_TERMIOS_H
-#      include <termios.h>
-#else
-#      ifdef HAVE_LINUX_TERMIOS_H
-#              include <linux/termios.h>
-#      endif
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 #      include <sys/ioctl.h>
 #endif
 extern int items, curitem;
 extern char *datafile;
 
-extern int alternative_datafile;
+extern bool alternative_datafile;
 
 /*
  * internal variables
  */
 
-bool ui_initialized = FALSE;
+static bool ui_initialized = FALSE;
 
-bool should_resize = FALSE;
-bool can_resize = FALSE;
+static bool should_resize = FALSE;
+static bool can_resize = FALSE;
 
-WINDOW *top = NULL, *bottom = NULL;
+static WINDOW *top = NULL, *bottom = NULL;
 
 
 static void
 init_windows()
 {
        top = newwin(LIST_TOP - 1, COLS, 0, 0);
-
        bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0);
 }
 
@@ -82,13 +76,13 @@ resize_abook()
 #ifdef TIOCGWINSZ
        struct winsize winsz;
 
-       ioctl (0, TIOCGWINSZ, &winsz);
+       ioctl(0, TIOCGWINSZ, &winsz);
 #ifdef DEBUG
        if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
                fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row);
        }
 #endif
-               
+
        if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
 #ifdef HAVE_RESIZETERM
                resizeterm(winsz.ws_row, winsz.ws_col);
@@ -112,10 +106,10 @@ resize_abook()
 static void
 win_changed(int i)
 {
-       if( can_resize )
+       if(can_resize)
                resize_abook();
        else
-               should_resize = TRUE;   
+               should_resize = TRUE;
 }
 #endif /* SIGWINCH */
 
@@ -148,22 +142,22 @@ init_ui()
 #endif
        if( LINES < MIN_LINES || COLS < MIN_COLS ) {
                clear(); refresh(); endwin();
-               fprintf(stderr, "Your terminal size is %dx%d\n", COLS, LINES);
-               fprintf(stderr, "Terminal is too small. Minium terminal size "
+               fprintf(stderr, _("Your terminal size is %dx%d\n"), COLS, LINES);
+               fprintf(stderr, _("Terminal is too small. Minium terminal size "
                                "for abook is "
-                               "%dx%d\n", MIN_COLS, MIN_LINES);
+                               "%dx%d\n"), MIN_COLS, MIN_LINES);
                return 1;
        }
 
-#ifdef SIGWINCH
-       signal(SIGWINCH, win_changed);
-#endif
-
        init_list();
        init_windows();
 
        ui_initialized = TRUE;
 
+#ifdef SIGWINCH
+       signal(SIGWINCH, win_changed);
+#endif
+
        return 0;
 }
 
@@ -181,7 +175,7 @@ close_ui()
 
 
 void
-headerline(char *str)
+headerline(const char *str)
 {
        werase(top);
 
@@ -198,7 +192,7 @@ void
 refresh_screen()
 {
 #ifdef SIGWINCH
-       if( should_resize ) {
+       if(should_resize) {
                resize_abook();
                return;
        }
@@ -206,7 +200,7 @@ refresh_screen()
        clear();
 
        refresh_statusline();
-       headerline(MAIN_HELPLINE);
+       headerline(gettext(MAIN_HELPLINE));
        list_headerline();
 
        refresh_list();
@@ -214,10 +208,10 @@ refresh_screen()
 
 
 int
-statusline_msg(char *msg)
+statusline_msg(const char *msg)
 {
        int c;
-       
+
        clear_statusline();
        statusline_addstr(msg);
        c = getch();
@@ -230,7 +224,7 @@ statusline_msg(char *msg)
 }
 
 void
-statusline_addstr(char *str)
+statusline_addstr(const char *str)
 {
        mvwaddstr(bottom, 1, 0, str);
        refresh();
@@ -238,7 +232,7 @@ statusline_addstr(char *str)
 }
 
 char *
-ui_readline(char *prompt, char *s, int limit, bool use_completion)
+ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 {
        int y, x;
        char *ret;
@@ -247,7 +241,7 @@ ui_readline(char *prompt, char *s, int limit, bool use_completion)
 
        getyx(bottom, y, x);
 
-       ret = abook_readline(bottom, y, x, s, limit, use_completion);
+       ret = abook_readline(bottom, y, x, s, use_completion);
 
        if(ret)
                strtrim(ret);
@@ -259,30 +253,27 @@ int
 statusline_ask_boolean(char *msg, int def)
 {
        int ret;
-       char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
+       char *msg2 = strconcat(msg,  def ? _(" (Y/n)?") : _(" (y/N)?"), NULL);
+       char ch;
 
        statusline_addstr(msg2);
 
        free(msg2);
 
-       switch( tolower(getch()) ) {
-               case 'n':
-                       ret = FALSE;
-                       break;
-               case 'y':
-                       ret = TRUE;
-                       break;
-               default:
-                       ret = def;
-                       break;
-       }
+       ch = tolower(getch());
+
+       if(ch == *(S_("keybinding for no|n")))
+               ret = FALSE;
+       else if(ch == *(S_("keybinding for yes|y")))
+               ret = TRUE;
+       else
+               ret = def;
 
        clear_statusline();
 
        return ret;
 }
 
-
 void
 refresh_statusline()
 {
@@ -294,7 +285,6 @@ refresh_statusline()
        wrefresh(bottom);
 }
 
-
 char *
 ask_filename(char *prompt)
 {
@@ -341,16 +331,16 @@ display_help(int help)
 
        helpw = newwin(LINES - 5, COLS - 6, 2, 3);
        erase();
-       headerline("help");
+       headerline(_("help"));
 
-       for( i = 0; tbl[i] != NULL; i++) {
-               waddstr(helpw, tbl[i]);
-               if( ( !( (i+1) % (LINES-8) ) ) ||
-                       (tbl[i+1] == NULL) ) {
+       for(i = 0; tbl[i] != NULL; i++) {
+               waddstr(helpw, gettext(tbl[i]));
+               if( (!((i + 1) % (LINES - 8))) ||
+                       (tbl[i + 1] == NULL) ) {
                        refresh();
                        wrefresh(helpw);
                        refresh_statusline();
-                       if(statusline_msg("Press any key to continue...")
+                       if(statusline_msg(_("Press any key to continue..."))
                                        == 'q')
                                break;
                        wclear(helpw);
@@ -375,15 +365,18 @@ get_commands()
 
        for(;;) {
                can_resize = TRUE; /* it's safe to resize now */
-               hide_cursor();
-               if( should_resize )
+               if(!opt_get_bool(BOOL_SHOW_CURSOR))
+                       hide_cursor();
+               if(should_resize)
                        refresh_screen();
                ch = getch();
-               show_cursor();
+               if(!opt_get_bool(BOOL_SHOW_CURSOR))
+                       show_cursor();
                can_resize = FALSE; /* it's not safe to resize anymore */
-               switch( ch ) {
+               switch(ch) {
                        case 'q': return;
-                       case 'Q': print_stderr(selected_items() ?
+                       case 'Q': quit_abook(QUIT_DONTSAVE);    break;
+                       case 'P': print_stderr(selected_items() ?
                                                  -1 : list_current_item());
                                  return;
                        case '?':
@@ -395,6 +388,7 @@ get_commands()
                        case KEY_DC:
                        case 'd':
                        case 'r': ui_remove_items();    break;
+                       case 'D': duplicate_item();     break;
                        case 12: refresh_screen();      break;
 
                        case 'k':
@@ -454,31 +448,30 @@ get_commands()
 
                        case 'p': ui_print_database(); break;
 
-                       case 'u': launch_wwwbrowser(list_current_item());
+                       case 'v': launch_wwwbrowser(list_current_item());
                                  refresh_screen();
                                  break;
                }
        }
 }
 
-
 void
 ui_remove_items()
 {
        if(list_is_empty())
                return;
 
-       if(statusline_ask_boolean("Remove selected item(s)", TRUE))
+       if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE))
                remove_selected_items();
 
-       clear_statusline();     
+       clear_statusline();
        refresh_list();
 }
 
 void
 ui_clear_database()
 {
-       if(statusline_ask_boolean("Clear WHOLE database", FALSE)) {
+       if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) {
                close_database();
                refresh_list();
        }
@@ -487,27 +480,31 @@ ui_clear_database()
 void
 ui_find(int next)
 {
-       int item;
+       int item = -1;
        static char findstr[MAX_FIELD_LEN];
        int search_fields[] = {NAME, EMAIL, NICK, -1};
 
+       clear_statusline();
+
        if(next) {
-               if( !*findstr )
+               if(!*findstr)
                        return;
        } else {
                char *s;
-               clear_statusline();
                s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
                strncpy(findstr, s, MAX_FIELD_LEN);
+               free(s);
                refresh_screen();
        }
 
-       if( (item = find_item(findstr, curitem + !!next,
-                                       search_fields )) >= 0 ) {
+       if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 &&
+                       (item = find_item(findstr, 0, search_fields)) >= 0)
+               statusline_addstr(_("Search hit bottom, continuing at top"));
+
+       if(item >= 0) {
                curitem = item;
                refresh_list();
        }
-
 }
 
 
@@ -525,8 +522,8 @@ void
 ui_read_database()
 {
        if(items > 0)
-               if(!statusline_ask_boolean("Your current data will be lost - "
-                               "Press 'y' to continue", FALSE))
+               if(!statusline_ask_boolean(_("Your current data will be lost - "
+                               "Press 'y' to continue"), FALSE))
                        return;
 
        load_database(datafile);
@@ -541,18 +538,18 @@ ui_print_database()
        char *command = opt_get_str(STR_PRINT_COMMAND);
        int mode;
 
-       if( list_is_empty() )
+       if(list_is_empty())
                return;
 
-       statusline_addstr("Print All/Selected/Cancel (a/s/C)?");
+       statusline_addstr(_("Print All/Selected/Cancel (a/s/C)?"));
 
-       switch( tolower(getch()) ) {
+       switch(tolower(getch())) {
                case 'a':
                        mode = ENUM_ALL;
                        break;
                case 's':
                        if( !selected_items() ) {
-                               statusline_msg("No selected items");
+                               statusline_msg(_("No selected items"));
                                return;
                        }
                        mode = ENUM_SELECTED;
@@ -568,7 +565,7 @@ ui_print_database()
                return;
 
        fexport("text", handle, mode);
-       
+
        pclose(handle);
 }
 
@@ -578,29 +575,29 @@ ui_open_datafile()
 {
        char *filename;
 
-       filename = ask_filename("File to open: ");
+       filename = ask_filename(_("File to open: "));
 
-       if( !filename || ! *filename) {
+       if(!filename || ! *filename) {
                free(filename);
                refresh_screen();
                return;
        }
 
-       if( opt_get_bool(BOOL_AUTOSAVE) )
+       if(opt_get_bool(BOOL_AUTOSAVE))
                save_database();
-       else if(statusline_ask_boolean("Save current database", FALSE))
+       else if(statusline_ask_boolean(_("Save current database"), FALSE))
                save_database();
 
        close_database();
 
        load_database(filename);
 
-       if( items == 0 ) {
-               statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook");
+       if(items == 0) {
+               statusline_msg(_("Sorry, that specified file appears not to be a valid abook addressbook"));
                load_database(datafile);
        } else {
                free(datafile);
-               datafile = strdup(filename);
+               datafile = xstrdup(filename);
        }
 
        refresh_screen();