From: <mar...@us...> - 2013-03-24 11:36:11
|
Revision: 5421 http://navit.svn.sourceforge.net/navit/?rev=5421&view=rev Author: martin-s Date: 2013-03-24 11:36:01 +0000 (Sun, 24 Mar 2013) Log Message: ----------- Add:gui_internal:Select cyrillian keyboard for cyrillic languages|Thanks alx Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal_bookmark.c trunk/navit/navit/gui/internal/gui_internal_command.c trunk/navit/navit/gui/internal/gui_internal_html.c trunk/navit/navit/gui/internal/gui_internal_keyboard.c trunk/navit/navit/gui/internal/gui_internal_keyboard.h trunk/navit/navit/gui/internal/gui_internal_poi.c trunk/navit/navit/gui/internal/gui_internal_search.c Modified: trunk/navit/navit/gui/internal/gui_internal_bookmark.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_bookmark.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_bookmark.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -15,7 +15,6 @@ #include "gui_internal_keyboard.h" #include "gui_internal_bookmark.h" - static void gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget) { @@ -103,7 +102,7 @@ wl=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(w, wl); if (this->keyboard) - gui_internal_widget_append(w, gui_internal_keyboard(this,2)); + gui_internal_widget_append(w, gui_internal_keyboard(this,2+gui_internal_keyboard_init_mode())); gui_internal_menu_render(this); } @@ -131,7 +130,7 @@ wl=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(w, wl); if (this->keyboard) - gui_internal_widget_append(w, gui_internal_keyboard(this,2)); + gui_internal_widget_append(w, gui_internal_keyboard(this,2+gui_internal_keyboard_init_mode())); gui_internal_menu_render(this); } @@ -160,7 +159,7 @@ wl=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(w, wl); if (this->keyboard) - gui_internal_widget_append(w, gui_internal_keyboard(this,2)); + gui_internal_widget_append(w, gui_internal_keyboard(this,2+gui_internal_keyboard_init_mode())); gui_internal_menu_render(this); } Modified: trunk/navit/navit/gui/internal/gui_internal_command.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_command.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_command.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -827,7 +827,7 @@ wl=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(w, wl); if (this->keyboard) - gui_internal_widget_append(w, gui_internal_keyboard(this,2)); + gui_internal_widget_append(w, gui_internal_keyboard(this,2+gui_internal_keyboard_init_mode())); gui_internal_menu_render(this); gui_internal_leave(this); } Modified: trunk/navit/navit/gui/internal/gui_internal_html.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_html.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_html.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -486,7 +486,7 @@ g_free(doc); if (this->keyboard_required && this->keyboard) { this->html_container->flags=gravity_center|orientation_vertical|flags_expand|flags_fill; - gui_internal_widget_append(this->html_container, gui_internal_keyboard(this,2)); + gui_internal_widget_append(this->html_container, gui_internal_keyboard(this,2+gui_internal_keyboard_init_mode())); } gui_internal_menu_render(this); graphics_draw_mode(this->gra, draw_mode_end); Modified: trunk/navit/navit/gui/internal/gui_internal_keyboard.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_keyboard.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_keyboard.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -328,3 +328,23 @@ { gui_internal_keyboard_do(this, key->data, key->datai); } +int +gui_internal_keyboard_init_mode(void) +{ +/* + Set cyrillic keyboard for Russia, Ukraine, Belarus, Kazakhstan +*/ + int ret; + char *lang; + lang=getenv("LANG"); + ret=0; + if (strstr(lang,"RU")) + ret = 40; + if (strstr(lang,"UA")) + ret = 40; + if (strstr(lang,"BY")) + ret = 40; + if (strstr(lang,"KZ")) + ret = 40; + return ret; +} Modified: trunk/navit/navit/gui/internal/gui_internal_keyboard.h =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_keyboard.h 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_keyboard.h 2013-03-24 11:36:01 UTC (rev 5421) @@ -3,4 +3,5 @@ struct widget; struct widget *gui_internal_keyboard_do(struct gui_priv *this, struct widget *wkbdb, int mode); struct widget *gui_internal_keyboard(struct gui_priv *this, int mode); +int gui_internal_keyboard_init_mode(void); /* end of prototypes */ Modified: trunk/navit/navit/gui/internal/gui_internal_poi.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_poi.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_poi.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -483,7 +483,8 @@ gui_internal_cmd_pois_filter(struct gui_priv *this, struct widget *wm, void *data) { struct widget *wb, *w, *wr, *wk, *we; - int keyboard_mode=2; + int keyboard_mode; + keyboard_mode=2+gui_internal_keyboard_init_mode(); wb=gui_internal_menu(this,"Filter"); w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(wb, w); Modified: trunk/navit/navit/gui/internal/gui_internal_search.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal_search.c 2013-03-24 00:19:03 UTC (rev 5420) +++ trunk/navit/navit/gui/internal/gui_internal_search.c 2013-03-24 11:36:01 UTC (rev 5421) @@ -478,7 +478,8 @@ { struct widget *wb,*wk,*w,*wr,*we,*wl,*wnext=NULL; char *country; - int keyboard_mode=2; + int keyboard_mode; + keyboard_mode=2+gui_internal_keyboard_init_mode(); gui_internal_search_list_new(this); wb=gui_internal_menu(this, what); w=gui_internal_box_new(this, gravity_center|orientation_vertical|flags_expand|flags_fill); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |