Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Martin S. <mar...@us...> - 2007-10-02 20:36:56
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28158 Modified Files: de.po Log Message: Added missing translation Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** de.po 28 Sep 2007 23:55:03 -0000 1.14 --- de.po 2 Oct 2007 20:33:39 -0000 1.15 *************** *** 515,519 **** #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "Fullscreen" ! msgstr "" #: ../src/gui/gtk/gui_gtk_action.c:206 --- 515,519 ---- #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "Fullscreen" ! msgstr "Vollbild" #: ../src/gui/gtk/gui_gtk_action.c:206 |
|
From: SanzoGhenzo <gh...@us...> - 2007-09-29 11:15:04
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20209 Modified Files: it.po Log Message: Updated italian translation Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** it.po 28 Sep 2007 23:55:03 -0000 1.6 --- it.po 29 Sep 2007 11:15:00 -0000 1.7 *************** *** 39,48 **** #, fuzzy, c-format msgid "%d m" ! msgstr "%d metri" #: ../src/navigation.c:178 #, fuzzy, c-format msgid "in %d m" ! msgstr "tra %d metri" #: ../src/navigation.c:182 --- 39,48 ---- #, fuzzy, c-format msgid "%d m" ! msgstr "%d m" #: ../src/navigation.c:178 #, fuzzy, c-format msgid "in %d m" ! msgstr "tra %d m" #: ../src/navigation.c:182 *************** *** 131,135 **** #, fuzzy msgid "When possible, please turn around" ! msgstr "Appena possibile, svoltare" #: ../src/navigation.c:456 --- 131,135 ---- #, fuzzy msgid "When possible, please turn around" ! msgstr "Appena possibile, invertire il senso di marcia" #: ../src/navigation.c:456 *************** *** 358,362 **** #: ../src/country.c:67 msgid "Palestinia" ! msgstr "Palestinia" #: ../src/country.c:68 --- 358,362 ---- #: ../src/country.c:67 msgid "Palestinia" ! msgstr "Palestina" #: ../src/country.c:68 *************** *** 418,422 **** #: ../src/country.c:82 msgid "Faroe Islands" ! msgstr "Isole Faroe" #: ../src/country.c:83 --- 418,422 ---- #: ../src/country.c:82 msgid "Faroe Islands" ! msgstr "Isole Faer Oer" #: ../src/country.c:83 *************** *** 478,482 **** #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Roadbook" ! msgstr "" #: ../src/gui/gtk/gui_gtk_action.c:185 --- 478,482 ---- #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Roadbook" ! msgstr "Quaderno di viaggio" #: ../src/gui/gtk/gui_gtk_action.c:185 *************** *** 490,494 **** #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "Clear" ! msgstr "" #: ../src/gui/gtk/gui_gtk_action.c:188 --- 490,494 ---- #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "Clear" ! msgstr "Pulisci" #: ../src/gui/gtk/gui_gtk_action.c:188 *************** *** 506,510 **** #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Tracking" ! msgstr "" #: ../src/gui/gtk/gui_gtk_action.c:198 --- 506,510 ---- #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Tracking" ! msgstr "Tracking" #: ../src/gui/gtk/gui_gtk_action.c:198 *************** *** 514,518 **** #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "Fullscreen" ! msgstr "" #: ../src/gui/gtk/gui_gtk_action.c:206 --- 514,518 ---- #: ../src/gui/gtk/gui_gtk_action.c:199 msgid "Fullscreen" ! msgstr "Schermo intero" #: ../src/gui/gtk/gui_gtk_action.c:206 |
|
From: KaZeR <ka...@us...> - 2007-09-28 23:55:04
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18106 Modified Files: de.po es.po fr.po it.po no.po pl.po Added Files: cs.po Log Message: Added Czech translation Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** it.po 23 Aug 2007 19:55:46 -0000 1.5 --- it.po 28 Sep 2007 23:55:03 -0000 1.6 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" [...990 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "BlocchiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "Città Visibili" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "PoligoniVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "StradeVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "PuntiVisibili" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** fr.po 23 Aug 2007 19:55:46 -0000 1.24 --- fr.po 28 Sep 2007 23:55:03 -0000 1.25 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-16 13:54+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-16 13:54+0100\n" [...988 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "VisibleBlocks" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "VisibleTowns" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "VisiblePolys" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "VisibleStreets" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "VisiblePoints" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** de.po 23 Aug 2007 19:55:45 -0000 1.13 --- de.po 28 Sep 2007 23:55:03 -0000 1.14 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" [...992 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "Sichtbare Blöcke" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "Sichtbare Städte" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "Sichtbare Polygone" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "Sichtbare StraÃen" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "Sichtbare Punkte" Index: es.po =================================================================== RCS file: /cvsroot/navit/navit/po/es.po,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** es.po 23 Aug 2007 19:55:45 -0000 1.4 --- es.po 28 Sep 2007 23:55:03 -0000 1.5 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Chris Eubank <cte...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" [...990 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "BloquesDemostrados" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "CuidadosDemostrados" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "PolysDemostrados" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "CallesDemostrados" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "PuntosDemostrados" Index: pl.po =================================================================== RCS file: /cvsroot/navit/navit/po/pl.po,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pl.po 23 Aug 2007 19:55:46 -0000 1.6 --- pl.po 28 Sep 2007 23:55:04 -0000 1.7 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" [...992 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "Widoczne bloki" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "Widoczne miasta" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "Widoczne poly" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "Widoczne ulice" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "Widoczne punkty" Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** no.po 23 Aug 2007 19:55:46 -0000 1.6 --- no.po 28 Sep 2007 23:55:04 -0000 1.7 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-08-03 14:49+0200\n" "PO-Revision-Date: 2007-07-16 15:56+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.2\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-16 15:56+0100\n" [...992 lines suppressed...] ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "VisibleBlocks" msgstr "Synlige blokker" ! #: ../src/gui/gtk/gui_gtk_action.c:208 msgid "VisibleTowns" msgstr "Synlige byer" ! #: ../src/gui/gtk/gui_gtk_action.c:209 msgid "VisiblePolys" msgstr "Synlige polygon" ! #: ../src/gui/gtk/gui_gtk_action.c:210 msgid "VisibleStreets" msgstr "Synlige gater" ! #: ../src/gui/gtk/gui_gtk_action.c:211 msgid "VisiblePoints" msgstr "Synlige punkt" --- NEW FILE: cs.po --- (This appears to be a binary file; contents omitted.) |
|
From: Martin S. <mar...@us...> - 2007-09-18 14:48:25
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21662/src/gui/gtk Modified Files: Makefile.am Log Message: Some minor fixes Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 12 Jul 2007 14:21:06 -0000 1.7 --- Makefile.am 18 Sep 2007 14:48:12 -0000 1.8 *************** *** 1,4 **** include $(top_srcdir)/Makefile.inc ! AM_CPPFLAGS = @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_gtk\" modulegui_LTLIBRARIES = libgui_gtk.la libgui_gtk_la_SOURCES = datawindow.c destination.c gui_gtk_statusbar.c gui_gtk_action.c gui_gtk_window.c gui_gtk.h --- 1,4 ---- include $(top_srcdir)/Makefile.inc ! AM_CPPFLAGS = -I$(top_srcdir)/src @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=\"gui_gtk\" modulegui_LTLIBRARIES = libgui_gtk.la libgui_gtk_la_SOURCES = datawindow.c destination.c gui_gtk_statusbar.c gui_gtk_action.c gui_gtk_window.c gui_gtk.h |
|
From: Martin S. <mar...@us...> - 2007-09-18 14:48:20
|
Update of /cvsroot/navit/navit/src/data/mg In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21662/src/data/mg Modified Files: town.c Log Message: Some minor fixes Index: town.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/mg/town.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** town.c 18 Jul 2007 22:43:08 -0000 1.3 --- town.c 18 Sep 2007 14:48:12 -0000 1.4 *************** *** 103,107 **** twn->postal_code1=get_string(p); twn->order=get_u8(p); /* 1-15 (19) */ ! twn->country=get_u16(p); twn->type=get_u8(p); twn->unknown2=get_u32_unal(p); --- 103,107 ---- twn->postal_code1=get_string(p); twn->order=get_u8(p); /* 1-15 (19) */ ! twn->country=get_u16_unal(p); twn->type=get_u8(p); twn->unknown2=get_u32_unal(p); |
|
From: Martin S. <mar...@us...> - 2007-09-18 14:48:20
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21662 Modified Files: autogen.sh Log Message: Some minor fixes Index: autogen.sh =================================================================== RCS file: /cvsroot/navit/navit/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** autogen.sh 2 Dec 2005 12:32:47 -0000 1.1 --- autogen.sh 18 Sep 2007 14:48:12 -0000 1.2 *************** *** 1,2 **** #!/bin/sh ! autoreconf --force --install -I config -I m4 --- 1,2 ---- #!/bin/sh ! autoreconf --force --install -I m4 |
|
From: KaZeR <ka...@us...> - 2007-09-12 12:36:05
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16608 Modified Files: Makefile.am Log Message: Fixed variables names Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 12 Sep 2007 10:59:25 -0000 1.1 --- Makefile.am 12 Sep 2007 12:35:53 -0000 1.2 *************** *** 17,19 **** CEGUISCHEMES_DATA = schemes/GUIScheme.xsd schemes/Mineque.scheme schemes/TaharezLook.scheme ! EXTRA_DIST = $(CEGUIFONTS_DATA CEGUILAYOUT_DATA CEGUIIMAGESETS_DATA CEGUILOOKNFEEL_DATA CEGUISCHEMES_DATA) \ No newline at end of file --- 17,19 ---- CEGUISCHEMES_DATA = schemes/GUIScheme.xsd schemes/Mineque.scheme schemes/TaharezLook.scheme ! EXTRA_DIST = $(CEGUIFONTS_DATA) $(CEGUILAYOUT_DATA) $(CEGUIIMAGESETS_DATA) $(CEGUILOOKNFEEL_DATA) $(CEGUISCHEMES_DATA) \ No newline at end of file |
|
From: KaZeR <ka...@us...> - 2007-09-12 10:59:26
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22051/src/gui/sdl/datafiles Added Files: Makefile.am Log Message: Fixed CEGUI ressources installation --- NEW FILE: Makefile.am --- # include $(top_srcdir)/Makefile.inc CEGUIFONTSdir=$(pkgdatadir)/datafiles/fonts CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans-18.font fonts/DejaVuSans.ttf fonts/Font.xsd CEGUILAYOUTdir=$(pkgdatadir)/datafiles/layouts CEGUILAYOUT_DATA = layouts/GUILayout.xsd layouts/Mineque.layout layouts/TaharezLook.layout CEGUIIMAGESETSdir=$(pkgdatadir)/datafiles/imagesets CEGUIIMAGESETS_DATA = imagesets/Imageset.xsd imagesets/Mineque-Black.imageset imagesets/navit-skin-black-imageset.tga \ imagesets/TaharezLook.imageset imagesets/TaharezLook.tga CEGUILOOKNFEELdir=$(pkgdatadir)/datafiles/looknfeel CEGUILOOKNFEEL_DATA = looknfeel/Falagard.xsd looknfeel/Mineque.looknfeel looknfeel/TaharezLook.looknfeel CEGUISCHEMESdir=$(pkgdatadir)/datafiles/schemes CEGUISCHEMES_DATA = schemes/GUIScheme.xsd schemes/Mineque.scheme schemes/TaharezLook.scheme EXTRA_DIST = $(CEGUIFONTS_DATA CEGUILAYOUT_DATA CEGUIIMAGESETS_DATA CEGUILOOKNFEEL_DATA CEGUISCHEMES_DATA) |
|
From: KaZeR <ka...@us...> - 2007-09-12 10:36:00
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5970 Modified Files: configure.in Log Message: Fixed CEGUI ressources installation Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** configure.in 29 Aug 2007 18:32:11 -0000 1.28 --- configure.in 12 Sep 2007 10:36:00 -0000 1.29 *************** *** 265,268 **** --- 265,269 ---- src/gui/gtk/Makefile src/gui/sdl/Makefile + src/gui/sdl/datafiles/Makefile src/osd/Makefile src/osd/core/Makefile |
|
From: KaZeR <ka...@us...> - 2007-09-07 12:05:23
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22319/layouts Modified Files: Mineque.layout Log Message: Fixed the labels transparency Index: Mineque.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Mineque.layout 6 Sep 2007 16:22:23 -0000 1.5 --- Mineque.layout 7 Sep 2007 12:05:19 -0000 1.6 *************** *** 14,20 **** <Property Name="ZOrderChangeEnabled" value="False" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> --- 14,20 ---- <Property Name="ZOrderChangeEnabled" value="False" /> </Window> ! <Window Type="NavitGrey/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="Visible" Value="True" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> *************** *** 42,57 **** </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,100},{0,800},{0,130}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,132},{0,800},{0,162}}" /> </Window> <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > <Property Name="PageSize" Value="0" /> --- 42,75 ---- </Window> ! <Window Type="NavitGrey/StaticText" Name="OSD/SpeedoMeterLabel" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="Text" Value="Speed" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,100},{0,800},{0,128}}" /> ! </Window> ! <Window Type="NavitGrey/StaticText" Name="OSD/SpeedoMeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,120},{0,800},{0,150}}" /> </Window> ! <Window Type="NavitGrey/StaticText" Name="OSD/AltimeterLabel" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="Text" Value="Alt." /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,148},{0,800},{0,176}}" /> ! </Window> ! <Window Type="NavitGrey/StaticText" Name="OSD/Altimeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,164},{0,800},{0,194}}" /> </Window> + <Window Type="NavitGrey/StaticText" Name="OSD/Satellites" > + <Property Name="Font" Value="DejaVuSans-12" /> + <Property Name="HorzFormatting" Value="WordWrapCentred" /> + <Property Name="UnifiedAreaRect" Value="{{0,670},{0,196},{0,800},{0,226}}" /> + </Window> + + + <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > <Property Name="PageSize" Value="0" /> *************** *** 61,71 **** <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,750},{0,200},{0,770},{0,350}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,164},{0,800},{0,194}}" /> </Window> --- 79,83 ---- <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,770},{0,300},{0,790},{0,450}}" /> </Window> |
|
From: KaZeR <ka...@us...> - 2007-09-07 12:05:21
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22319/schemes Modified Files: Mineque.scheme Log Message: Fixed the labels transparency Index: Mineque.scheme =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mineque.scheme 4 Sep 2007 17:12:29 -0000 1.3 --- Mineque.scheme 7 Sep 2007 12:05:20 -0000 1.4 *************** *** 8,12 **** <FalagardMapping WindowType="NavitGrey/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="NavitGrey/StaticImage" /> ! <FalagardMapping WindowType="NavitGrey/StaticText" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="NavitGrey/StaticText" /> <FalagardMapping WindowType="NavitGrey/ZoomInButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomInButton" /> --- 8,12 ---- <FalagardMapping WindowType="NavitGrey/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="NavitGrey/StaticImage" /> ! <FalagardMapping WindowType="NavitGrey/StaticText" TargetType="DefaultWindow" Renderer="Falagard/StaticText" LookNFeel="NavitGrey/StaticText" /> <FalagardMapping WindowType="NavitGrey/ZoomInButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomInButton" /> |
|
From: KaZeR <ka...@us...> - 2007-09-07 12:05:21
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22319/looknfeel Modified Files: Mineque.looknfeel Log Message: Fixed the labels transparency Index: Mineque.looknfeel =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mineque.looknfeel 4 Sep 2007 17:12:29 -0000 1.3 --- Mineque.looknfeel 7 Sep 2007 12:05:20 -0000 1.4 *************** *** 155,159 **** </StateImagery> </WidgetLook> - <WidgetLook name="NavitGrey/ViewModeSwitchButton"> --- 155,158 ---- *************** *** 1280,1283 **** --- 1279,1283 ---- </WidgetLook> + <!-- this widget needs cleanup --> <WidgetLook name="NavitGrey/StaticText"> <PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" /> *************** *** 1443,1457 **** <StateImagery name="EnabledFrame"> <Layer> ! <Section look="TaharezLook/StaticShared" section="frame" /> </Layer> </StateImagery> <StateImagery name="DisabledFrame"> <Layer> ! <Section look="TaharezLook/StaticShared" section="frame" /> </Layer> </StateImagery> <StateImagery name="WithFrameEnabledBackground"> <Layer> ! <Section look="TaharezLook/StaticShared" section="background" /> </Layer> </StateImagery> --- 1443,1457 ---- <StateImagery name="EnabledFrame"> <Layer> ! <Section look="NavitGrey/StaticShared" section="frame" /> </Layer> </StateImagery> <StateImagery name="DisabledFrame"> <Layer> ! <Section look="NavitGrey/StaticShared" section="frame" /> </Layer> </StateImagery> <StateImagery name="WithFrameEnabledBackground"> <Layer> ! <Section look="NavitGrey/StaticShared" section="background" /> </Layer> </StateImagery> |
|
From: KaZeR <ka...@us...> - 2007-09-07 12:04:59
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21911 Modified Files: track.c track.h navit.c navit.h Log Message: Added a binding to get the current item attributes Index: track.h =================================================================== RCS file: /cvsroot/navit/navit/src/track.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** track.h 6 Jul 2007 13:02:15 -0000 1.3 --- track.h 7 Sep 2007 12:04:57 -0000 1.4 *************** *** 1,2 **** --- 1,5 ---- + #ifdef __cplusplus + extern "C" { + #endif /* prototypes */ struct coord; *************** *** 9,13 **** int tracking_update(struct tracking *tr, struct coord *c, int angle); struct tracking *tracking_new(struct mapset *ms); ! void tracking_set_mapset(struct tracking *this, struct mapset *ms); void tracking_destroy(struct tracking *tr); /* end of prototypes */ --- 12,20 ---- int tracking_update(struct tracking *tr, struct coord *c, int angle); struct tracking *tracking_new(struct mapset *ms); ! void tracking_set_mapset(struct tracking *this_, struct mapset *ms); ! int tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr); void tracking_destroy(struct tracking *tr); /* end of prototypes */ + #ifdef __cplusplus + } + #endif \ No newline at end of file Index: navit.h =================================================================== RCS file: /cvsroot/navit/navit/src/navit.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** navit.h 3 Sep 2007 07:43:14 -0000 1.15 --- navit.h 7 Sep 2007 12:04:57 -0000 1.16 *************** *** 68,71 **** --- 68,72 ---- void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv); void navit_tracking_add(struct navit *this_, struct tracking *tracking); + struct tracking * navit_get_tracking(struct navit *this_); void navit_route_add(struct navit *this_, struct route *route); void navit_navigation_add(struct navit *this_, struct navigation *navigation); Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** navit.c 29 Aug 2007 18:32:13 -0000 1.26 --- navit.c 7 Sep 2007 12:04:57 -0000 1.27 *************** *** 101,104 **** --- 101,110 ---- } + struct tracking * + navit_get_tracking(struct navit *this_) + { + return this_->tracking; + } + void navit_add_layout(struct navit *this_, struct layout *lay) Index: track.c =================================================================== RCS file: /cvsroot/navit/navit/src/track.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** track.c 28 Aug 2007 17:31:14 -0000 1.11 --- track.c 7 Sep 2007 12:04:57 -0000 1.12 *************** *** 1,8 **** #include <glib.h> #include "track.h" #include "debug.h" #include "transform.h" #include "coord.h" - #include "item.h" #include "route.h" #include "projection.h" --- 1,9 ---- #include <glib.h> + #include "item.h" + #include "attr.h" #include "track.h" #include "debug.h" #include "transform.h" #include "coord.h" #include "route.h" #include "projection.h" *************** *** 87,90 **** --- 88,106 ---- } + int + tracking_get_current_attr(struct tracking *_this, enum attr_type type, struct attr *attr) + { + struct item *item=&_this->curr_line->street->item; + int result=0; + struct map_rect *mr=map_rect_new(item->map,NULL); + item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo); + if (item_attr_get(item, attr_street_name, attr)){ + result=1; + } + map_rect_destroy(mr); + return result; + } + + static void tracking_get_angles(struct tracking_line *tl) |
|
From: KaZeR <ka...@us...> - 2007-09-06 16:22:21
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26150 Modified Files: Mineque.layout Log Message: Fixed roadbook Index: Mineque.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Mineque.layout 5 Sep 2007 14:53:31 -0000 1.4 --- Mineque.layout 6 Sep 2007 16:22:23 -0000 1.5 *************** *** 14,17 **** --- 14,24 ---- <Property Name="ZOrderChangeEnabled" value="False" /> </Window> + <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > + <Property Name="Font" Value="DejaVuSans-14" /> + <Property Name="Visible" Value="False" /> + <Property Name="HorzFormatting" Value="WordWrapCentred" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0,60},{0,565},{0,600},{0,598}}" /> + </Window> <!-- Items for the Right Panel --> *************** *** 114,118 **** <Property Name="UnifiedAreaRect" Value="{{0,767},{0,12},{0,784},{0,44}}" /> </Window> ! <Window Type="NavitGrey/NavitAboutButton" Name="NavitAboutButton"> <Property Name="ZOrderChangeEnabled" value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,361},{0,13},{0,443},{0,38}}" /> --- 121,126 ---- <Property Name="UnifiedAreaRect" Value="{{0,767},{0,12},{0,784},{0,44}}" /> </Window> ! <!-- <Window Type="NavitGrey/NavitAboutButton" Name="NavitAboutButton"> --> ! <Window Type="NavitGrey/NavitAboutButton" Name="OSD/RoadbookButton"> <Property Name="ZOrderChangeEnabled" value="False" /> <Property Name="UnifiedAreaRect" Value="{{0,361},{0,13},{0,443},{0,38}}" /> |
|
From: KaZeR <ka...@us...> - 2007-09-06 16:21:55
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25759 Modified Files: gui_sdl_window.cpp sdl_events.cpp Log Message: Fixed roadbook, minor other things Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** gui_sdl_window.cpp 4 Sep 2007 17:10:10 -0000 1.17 --- gui_sdl_window.cpp 6 Sep 2007 16:21:57 -0000 1.18 *************** *** 93,155 **** sdl_update_roadbook(struct navigation *nav) { - printf("Called\n"); using namespace CEGUI; extern Window* myRoot; ! /* ! if(! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->isVisible()){ ! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); } ! MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("Roadbook")); ! mcl->resetList(); ! */ ! struct navigation_list *list; ! char *str; ! ! list=navigation_list_new(nav); ! ! char *text; ! list=navigation_list_new(nav); ! text=navigation_list_get(list, navigation_mode_speech); ! while ((str=navigation_list_get(list, navigation_mode_short))) { ! ! printf("SDL : %s\n", str); ! ! ! // mcl->addRow(); ! /* ! char from [256]; ! char to [256]; ! ! sprintf(from,"%s %s",param[0].value,param[1].value); ! ListboxTextItem* itemListbox = new ListboxTextItem(from); ! sprintf(to,"%s %s",param[2].value,param[3].value); ! itemListbox = new ListboxTextItem(to); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 1, mcl->getRowCount()-1); ! ! itemListbox = new ListboxTextItem(param[9].value); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 2, mcl->getRowCount()-1); ! ! itemListbox = new ListboxTextItem(param[11].value); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 3, mcl->getRowCount()-1); ! ! itemListbox = new ListboxTextItem(param[10].value); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 4, mcl->getRowCount()-1); ! */ /* ! ListboxTextItem* itemListbox = new ListboxTextItem(str); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); ! */ ! } ! // navigation_list_destroy(list); } --- 93,145 ---- sdl_update_roadbook(struct navigation *nav) { using namespace CEGUI; extern Window* myRoot; ! ! struct navigation_list *list; ! list=navigation_list_new(nav); ! ! // First, update the 'Navigation Tip' on the main window ! ! try { ! WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->setText(navigation_list_get(list, navigation_mode_speech)); ! } ! catch (CEGUI::Exception& e) ! { ! fprintf(stderr,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str()); ! printf("Missing control!...\n"); } ! // Then, update the whole roadbook ! try { ! /* Currently we use the 'Navit' text to display the roadbook, until Mineque design a button for that ! if(! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->isVisible()){ ! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); ! } ! */ ! MultiColumnList* mcl = static_cast<MultiColumnList*>(WindowManager::getSingleton().getWindow("Roadbook")); ! mcl->resetList(); ! char *str; ! list=navigation_list_new(nav); ! while ((str=navigation_list_get(list, navigation_mode_short))) { ! ! // printf("SDL : %s\n", str); ! mcl->addRow(); ! ! ListboxTextItem* itemListbox = new ListboxTextItem(str); ! itemListbox->setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush"); ! mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); ! } ! navigation_list_destroy(list); ! } ! catch (CEGUI::Exception& e) ! { ! fprintf(stderr,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str()); ! printf("Missing control!...\n"); ! } } *************** *** 200,227 **** struct navigation *navig; navig=navit_get_navigation(sdl_gui_navit); - if(navig){ - printf("navig valid, registering callback\n"); - - // callback_new_1(void (*)())sdl_update_roadbook, sdl_gui); - callback_new_0((void (*)())sdl_update_roadbook); - - - /* - this_->roadbook_callback=callback_new_1(callback_cast(navit_window_roadbook_update), this_); ! navigation_register_callback(this_->navigation, ! navigation_mode_long, ! this_->roadbook_callback ! ); ! ! navigation_register_callback(navig, ! navigation_mode_long, ! // callback_new((void (*)())sdl_update_roadbook, 1, (void **)&sdl_gui_navit) ! callback_new_1(callback_cast(sdl_update_roadbook), &sdl_gui_navit) ! ); ! */ ! } else { ! printf("navig unvalid\n"); ! } --- 190,198 ---- struct navigation *navig; navig=navit_get_navigation(sdl_gui_navit); ! navigation_register_callback(navig, ! navigation_mode_long, ! callback_new_0((void (*)())sdl_update_roadbook) ! ); *************** *** 677,685 **** mcl2->setSelectionMode(MultiColumnList::RowSingle) ; ! mcl2->addColumn("From", 0, cegui_absdim(200.0)); ! mcl2->addColumn("To", 1, cegui_absdim(200.0)); ! mcl2->addColumn("Dist", 2, cegui_absdim(80.0)); ! mcl2->addColumn("ETA", 3, cegui_absdim(80.0)); ! mcl2->addColumn("Instruction",4, cegui_absdim(300.0)); BuildKeyboard(); --- 648,652 ---- mcl2->setSelectionMode(MultiColumnList::RowSingle) ; ! mcl2->addColumn("Instructions", 0, cegui_absdim(700.0)); BuildKeyboard(); *************** *** 693,700 **** CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton2")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); - - - - } catch (CEGUI::Exception& e) --- 660,663 ---- *************** *** 739,742 **** --- 702,748 ---- sprintf (buffer, "%.0f m", height); CEGUI::WindowManager::getSingleton().getWindow("OSD/Altimeter")->setText(buffer); + + int sats=*vehicle_sats_get(v); + int sats_used=*vehicle_sats_used_get(v); + // printf(" sats : %i, used %i: \n",sats,sats_used); + // Sat image hardcoded for now. may break the TaharezSkin + // setProperty("Image", CEGUI::PropertyHelper::imageToString( yourImageSet->getImage( "yourImageName" ) ) ); + + try { + if(sats_used>1){ + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar1")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOn"); + } else { + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar1")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOff"); + } + + if(sats_used>3){ + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar2")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOn"); + } else { + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar2")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOff"); + } + + if(sats_used>5){ + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar3")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOn"); + } else { + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar3")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOff"); + } + + if(sats_used>7){ + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar4")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOn"); + } else { + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar4")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOff"); + } + + if(sats_used>8){ + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar5")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOn"); + } else { + CEGUI::WindowManager::getSingleton().getWindow("SateliteStrenghBar5")->setProperty("Image","set:Mineque-Black image:SateliteStrenghBarOff"); + } + } + catch (CEGUI::Exception& e) + { + dbg(1,"Warning : you skin doesn't have the satellitebars. You should use Mineque's skin."); + } + } *************** *** 774,777 **** --- 780,784 ---- //gui_sdl_window.cpp:710: error: invalid conversion from 'void (*)(vehicle*)' to 'void (*)()' struct callback *cb=callback_new_0(callback_cast(vehicle_callback_handler)); + navit_add_vehicle_cb(nav,cb); this_->nav=nav; Index: sdl_events.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sdl_events.cpp 21 Aug 2007 19:53:47 -0000 1.6 --- sdl_events.cpp 6 Sep 2007 16:21:57 -0000 1.7 *************** *** 40,53 **** extern struct navit *sdl_gui_navit; ! WindowManager::getSingleton().getWindow("DestinationWindow")->hide(); ! WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->show(); ! WindowManager::getSingleton().getWindow("Navit/ProgressWindow")->show(); ! // route_set_destination(co->route, &pos); ! // I could have been using search->nav instead of sdl_gui_navit. is it better this way? ! navit_set_destination(sdl_gui_navit, &pos, "FIXME"); ! WindowManager::getSingleton().getWindow("Navit/ProgressWindow")->hide(); ! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); ! WindowManager::getSingleton().getWindow("OSD/ETA")->show(); } --- 40,61 ---- extern struct navit *sdl_gui_navit; ! try { ! WindowManager::getSingleton().getWindow("DestinationWindow")->hide(); ! WindowManager::getSingleton().getWindow("Navit/Routing/Tips")->show(); ! // WindowManager::getSingleton().getWindow("Navit/ProgressWindow")->show(); ! // route_set_destination(co->route, &pos); ! // I could have been using search->nav instead of sdl_gui_navit. is it better this way? ! ! // WindowManager::getSingleton().getWindow("Navit/ProgressWindow")->hide(); ! // WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); ! // WindowManager::getSingleton().getWindow("OSD/ETA")->show(); ! } ! catch (CEGUI::Exception& e) ! { ! fprintf(stderr,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str()); ! printf("Missing control!...\n"); ! } ! navit_set_destination(sdl_gui_navit, &pos, "FIXME"); } *************** *** 72,76 **** if(SDL_dest.current_search==SRCH_COUNTRY){ country_edit->setText(item->getText()); ! // Need to record the country here twn_edit->activate(); SDL_dest.current_search=SRCH_TOWN; --- 80,84 ---- if(SDL_dest.current_search==SRCH_COUNTRY){ country_edit->setText(item->getText()); ! // FIXME Need to record the country here so all searches are made by default in this country twn_edit->activate(); SDL_dest.current_search=SRCH_TOWN; *************** *** 79,86 **** } else if(SDL_dest.current_search==SRCH_TOWN){ twn_edit->setText(item->getText()); - // SDL_dest.town_street_assoc=atoi(item_assoc->getText().c_str()); - // SDL_dest.town=atoi(itemid->getText().c_str()); - // printf(" town %s , id=%lx, assoc=%li\n",item->getText().c_str(),SDL_dest.town_street_assoc,SDL_dest.town_street_assoc); - ListboxItem * itemx = mcl->getItemAtGridReference(MCLGridRef(r,3)); --- 87,90 ---- |
|
From: KaZeR <ka...@us...> - 2007-09-06 16:21:08
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25664 Modified Files: vehicle.c vehicle.h Log Message: Added some gpsd bindings Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** vehicle.c 5 Sep 2007 16:09:46 -0000 1.19 --- vehicle.c 6 Sep 2007 16:21:08 -0000 1.20 *************** *** 43,52 **** int is_pipe; int timer_count; ! int qual; ! int sats; struct coord_geo geo; double height; double dir,speed; double time; struct coord current_pos; struct coord_d curr; --- 43,53 ---- int is_pipe; int timer_count; ! int status; // Do we have a fix? 0=no 1=yes, without DGPS 2=yes, with DGPS ! int sats,sats_used; struct coord_geo geo; double height; double dir,speed; double time; + double pdop; struct coord current_pos; struct coord_d curr; *************** *** 123,130 **** } ! double * ! vehicle_quality_get(struct vehicle *this) { ! return &this->qual; } --- 124,131 ---- } ! int * ! vehicle_status_get(struct vehicle *this) { ! return &this->status; } *************** *** 135,138 **** --- 136,151 ---- } + int * + vehicle_sats_used_get(struct vehicle *this) + { + return &this->sats_used; + } + + double * + vehicle_pdop_get(struct vehicle *this) + { + return &this->pdop; + } + void vehicle_set_position(struct vehicle *this, struct coord *pos) *************** *** 221,225 **** this->geo.lng+=lng/60; ! sscanf(item[6],"%d",&this->qual); sscanf(item[7],"%d",&this->sats); sscanf(item[9],"%lf",&this->height); --- 234,238 ---- this->geo.lng+=lng/60; ! sscanf(item[6],"%d",&this->status); sscanf(item[7],"%d",&this->sats); sscanf(item[9],"%lf",&this->height); *************** *** 338,346 **** this->sats=data->satellites; data->set &= ~SATELLITE_SET; } if (data->set & STATUS_SET) { ! this->qual=data->status; data->set &= ~STATUS_SET; } } #endif --- 351,364 ---- this->sats=data->satellites; data->set &= ~SATELLITE_SET; + /* FIXME : the USED_SET check does not work yet. */ + this->sats_used=data->satellites_used; } if (data->set & STATUS_SET) { ! this->status=data->status; data->set &= ~STATUS_SET; } + if(data->set & PDOP_SET){ + printf("pdop : %d\n",data->pdop); + } } #endif Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** vehicle.h 5 Sep 2007 16:09:46 -0000 1.12 --- vehicle.h 6 Sep 2007 16:21:09 -0000 1.13 *************** *** 12,17 **** double *vehicle_height_get(struct vehicle *this_); double *vehicle_dir_get(struct vehicle *this_); ! double *vehicle_quality_get(struct vehicle *this_); int *vehicle_sats_get(struct vehicle *this_); void vehicle_set_position(struct vehicle *this_, struct coord *pos); struct vehicle *vehicle_new(const char *url); --- 12,19 ---- double *vehicle_height_get(struct vehicle *this_); double *vehicle_dir_get(struct vehicle *this_); ! int *vehicle_status_get(struct vehicle *this_); int *vehicle_sats_get(struct vehicle *this_); + int *vehicle_sats_used_get(struct vehicle *this_); + double *vehicle_pdop_get(struct vehicle *this_); void vehicle_set_position(struct vehicle *this_, struct coord *pos); struct vehicle *vehicle_new(const char *url); |
|
From: KaZeR <ka...@us...> - 2007-09-05 16:09:47
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26537 Modified Files: vehicle.c vehicle.h Log Message: Added a binding to get sats level Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** vehicle.c 3 Sep 2007 16:06:44 -0000 1.18 --- vehicle.c 5 Sep 2007 16:09:46 -0000 1.19 *************** *** 123,126 **** --- 123,138 ---- } + double * + vehicle_quality_get(struct vehicle *this) + { + return &this->qual; + } + + int * + vehicle_sats_get(struct vehicle *this) + { + return &this->sats; + } + void vehicle_set_position(struct vehicle *this, struct coord *pos) Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** vehicle.h 3 Sep 2007 16:06:44 -0000 1.11 --- vehicle.h 5 Sep 2007 16:09:46 -0000 1.12 *************** *** 12,15 **** --- 12,17 ---- double *vehicle_height_get(struct vehicle *this_); double *vehicle_dir_get(struct vehicle *this_); + double *vehicle_quality_get(struct vehicle *this_); + int *vehicle_sats_get(struct vehicle *this_); void vehicle_set_position(struct vehicle *this_, struct coord *pos); struct vehicle *vehicle_new(const char *url); |
|
From: KaZeR <ka...@us...> - 2007-09-05 14:53:51
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19990/layouts Modified Files: TaharezLook.layout Log Message: Worked on Mineque's skin Index: TaharezLook.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/TaharezLook.layout,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TaharezLook.layout 4 Sep 2007 09:47:53 -0000 1.1 --- TaharezLook.layout 5 Sep 2007 14:53:44 -0000 1.2 *************** *** 82,86 **** <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.001,0},{0.77,0},{0.07,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="OSD/DestinationButton" > <Property Name="Text" Value="Destination" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> --- 82,86 ---- <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.001,0},{0.77,0},{0.07,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="DestinationButton" > <Property Name="Text" Value="Destination" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> *************** *** 111,120 **** <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.21,0},{0.99,0},{0.26,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="OSD/ZoomIn" > <Property Name="Text" Value="ZoomIn" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.26,0},{0.99,0},{0.31,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="OSD/ZoomOut" > <Property Name="Text" Value="ZoomOut" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> --- 111,120 ---- <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.21,0},{0.99,0},{0.26,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="ZoomInButton" > <Property Name="Text" Value="ZoomIn" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.26,0},{0.99,0},{0.31,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="ZoomOutButton" > <Property Name="Text" Value="ZoomOut" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> |
|
From: KaZeR <ka...@us...> - 2007-09-05 14:53:33
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19968/layouts Modified Files: Mineque.layout Log Message: Worked on Mineque's skin Index: Mineque.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mineque.layout 4 Sep 2007 17:14:26 -0000 1.3 --- Mineque.layout 5 Sep 2007 14:53:31 -0000 1.4 *************** *** 2,166 **** <GUILayout > <Window Type="DefaultWindow" Name="Navit" > <Property Name="InheritsAlpha" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> - <Property Name="Text" Value="No destination set." /> - <Property Name="Alpha" Value="0.7" /> - <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> - <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.88,0},{0.77,0},{0.98,0}}" /> - </Window> - - </Window> - - <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > - <Property Name="Text" Value="Choose your destination" /> - <Property Name="Visible" Value="False" /> - <Property Name="Alpha" Value="0.7" /> - <Property Name="TitlebarEnabled" Value="True" /> - <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> - <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > - <Property Name="Text" Value="Country :" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > ! <Property Name="Text" Value="Town : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > ! <Property Name="Text" Value="Street : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > ! <Property Name="Text" Value="Pick your choice :" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> </Window> ! <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > ! <Property Name="Text" Value="Keyboard" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > ! <Property Name="Text" Value="Go!" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> </Window> ! </Window> ! ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/CurrentRoadName" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="Alpha" Value="0.7" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.001,0},{0.77,0},{0.07,0}}" /> ! </Window> ! <Window Type="NavitGrey/RouteButton" Name="OSD/DestinationButton" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,50},{0,10},{0,78},{0,40}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.06,0},{0.99,0},{0.11,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.11,0},{0.99,0},{0.16,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.16,0},{0.99,0},{0.21,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Coords" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.21,0},{0.99,0},{0.26,0}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomOutButton" Name="OSD/ZoomOut" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,514},{0,734},{0,600}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomInButton" Name="OSD/ZoomIn" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,800},{0,536}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton" > ! <Property Name="Text" Value="RoadBook" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.36,0},{0.99,0},{0.41,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/ETA" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.41,0},{0.99,0},{0.51,0}}" /> ! </Window> ! ! <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > ! <Property Name="PageSize" Value="0" /> ! <Property Name="OverlapSize" Value="0" /> ! <Property Name="DocumentSize" Value="2000" /> ! <Property Name="ScrollPosition" Value="0" /> ! <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> ! <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.10,0},{0.53,0},{0.15,0},{0.85,0}}" /> ! </Window> ! ! ! <Window Type="NavitGrey/ViewModeSwitchButton" Name="OSD/ViewMode" > ! <Property Name="UnifiedAreaRect" Value="{{0,702},{0,502},{0,800},{0,600}}" /> ! </Window> ! <Window Type="NavitGrey/QuitButton" Name="QuitButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,8},{0,4},{0,37},{0,34}}" /> ! </Window> ! <Window Type="NavitGrey/RouteButton" Name="RouteButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,152},{0,1},{0,188},{0,36}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,470},{0,800},{0,532}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,507},{0,732},{0,600}}" /> ! </Window> ! ! </Window> </GUILayout> --- 2,237 ---- <GUILayout > + <!-- The main window. Everything has to be a child of it. --> <Window Type="DefaultWindow" Name="Navit" > <Property Name="InheritsAlpha" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> + + <!-- Items for the Bottom Panel --> + <Window Type="NavitGrey/StaticImage" Name="BottomPanel" > + <Property Name="Image" Value="set:Mineque-Black image:BottomStreetPanel" /> + <Property Name="UnifiedAreaRect" Value="{{0,1},{0,550},{0,660},{0,600}}" /> + <Property Name="ZOrderChangeEnabled" value="False" /> + </Window> + + <!-- Items for the Right Panel --> + <Window Type="NavitGrey/StaticImage" Name="RightPanel" > + <Property Name="Image" Value="set:Mineque-Black image:RightPanel" /> + <Property Name="UnifiedAreaRect" Value="{{0,635},{0,0},{0,800},{0,600}}" /> + <Property Name="ZOrderChangeEnabled" value="False" /> + </Window> + + <Window Type="NavitGrey/ViewModeSwitchButton" Name="OSD/ViewMode" > + <Property Name="UnifiedAreaRect" Value="{{0,702},{0,502},{0,800},{0,600}}" /> + <Property Name="ZOrderChangeEnabled" value="False" /> + </Window> + <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > + <Property Name="UnifiedAreaRect" Value="{{0,707},{0,469},{0,800},{0,532}}" /> + <Property Name="ZOrderChangeEnabled" value="False" /> + </Window> + <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOutButton" > + <Property Name="UnifiedAreaRect" Value="{{0,669},{0,507},{0,731},{0,600}}" /> + <Property Name="ZOrderChangeEnabled" value="False" /> + </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,100},{0,800},{0,130}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,132},{0,800},{0,162}}" /> </Window> ! <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > ! <Property Name="PageSize" Value="0" /> ! <Property Name="OverlapSize" Value="0" /> ! <Property Name="DocumentSize" Value="2000" /> ! <Property Name="ScrollPosition" Value="0" /> ! <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> ! <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,750},{0,200},{0,770},{0,350}}" /> </Window> ! <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,164},{0,800},{0,194}}" /> </Window> ! ! ! <!-- Items for the Top Panel --> ! <Window Type="NavitGrey/StaticImage" Name="TopPanel" > ! <Property Name="Image" Value="set:Mineque-Black image:TopPanel" /> ! <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,800},{0,64}}" /> ! <Property Name="ZOrderChangeEnabled" value="False" /> </Window> ! <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > ! <Property Name="UnifiedAreaRect" Value="{{0,8},{0,4},{0,37},{0,34}}" /> ! <Property Name="ZOrderChangeEnabled" value="False" /> </Window> ! <Window Type="NavitGrey/RouteButton" Name="DestinationButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,152},{0,1},{0,188},{0,36}}" /> ! <Property Name="ZOrderChangeEnabled" value="False" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteImage" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteImage" /> ! <Property Name="UnifiedAreaRect" Value="{{0,672},{0,7},{0,702},{0,45}}" /> ! <Property Name="ZOrderChangeEnabled" value="False" /> ! </Window> ! ! <Window Type="NavitGrey/OptionsButton" Name="OptionsButton" > ! <Property Name="ZOrderChangeEnabled" value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,79},{0,5},{0,116},{0,30}}" /> ! </Window> ! ! ! <Window Type="NavitGrey/SpeakerButton" Name="SpeakerButton" > ! <Property Name="ZOrderChangeEnabled" value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,632},{0,9},{0,660},{0,45}}" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteStrenghBar1" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteStrenghBarOff" /> ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,12},{0,724},{0,44}}" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteStrenghBar2" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteStrenghBarOff" /> ! <Property Name="UnifiedAreaRect" Value="{{0,722},{0,12},{0,739},{0,44}}" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteStrenghBar3" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteStrenghBarOff" /> ! <Property Name="UnifiedAreaRect" Value="{{0,737},{0,12},{0,754},{0,44}}" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteStrenghBar4" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteStrenghBarOff" /> ! <Property Name="UnifiedAreaRect" Value="{{0,752},{0,12},{0,769},{0,44}}" /> ! </Window> ! <Window Type="NavitGrey/StaticImage" Name="SateliteStrenghBar5" > ! <Property Name="Image" Value="set:Mineque-Black image:SateliteStrenghBarOff" /> ! <Property Name="UnifiedAreaRect" Value="{{0,767},{0,12},{0,784},{0,44}}" /> ! </Window> ! <Window Type="NavitGrey/NavitAboutButton" Name="NavitAboutButton"> ! <Property Name="ZOrderChangeEnabled" value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,361},{0,13},{0,443},{0,38}}" /> ! </Window> ! ! ! <!-- The Destination window and its controls --> ! <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > ! <Property Name="Text" Value="Choose your destination" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="Alpha" Value="0.7" /> ! <Property Name="TitlebarEnabled" Value="True" /> ! <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > ! <Property Name="Text" Value="Country :" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > ! <Property Name="Text" Value="Town : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > ! <Property Name="Text" Value="Street : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > ! <Property Name="Text" Value="Pick your choice :" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> ! </Window> ! <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > ! <Property Name="Text" Value="Keyboard" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > ! <Property Name="Text" Value="Go!" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> ! </Window> ! </Window> ! ! <!-- The RoadBook window, which use the old skin --> ! <Window Type="TaharezLook/FrameWindow" Name="Navit/RoadBook" > ! <Property Name="Alpha" Value="0.85" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="Text" Value="Road Book" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.02,0},{0.99,0},{0.87,0}}" /> ! <Window Type="TaharezLook/MultiColumnList" Name="Roadbook" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.99,0},{0.93,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="RoadBook/ETA" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.94,0},{0.7,0},{0.99,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton2" > ! <Property Name="Text" Value="Close" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.94,0},{0.99,0},{0.99,0}}" /> ! </Window> </Window> ! <Window Type="TaharezLook/FrameWindow" Name="Navit/Keyboard" > ! <Property Name="Alpha" Value="0.85" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.5,0},{0.99,0},{0.87,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="Navit/Keyboard/Input" > ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.80,0},{0.7,0},{0.95,0}}" /> ! </Window> ! </Window> ! ! <!-- These arrows will be used later, to move the map ! <Window Type="NavitGrey/ArrowLeft" Name="ArrowLeft" > ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> </Window> ! <Window Type="NavitGrey/ArrowTop" Name="ArrowTop" > ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> </Window> ! <Window Type="NavitGrey/ArrowRight" Name="ArrowRight" > ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> </Window> ! <Window Type="NavitGrey/ArrowDown" Name="ArrowDown" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> </Window> ! --> ! ! ! </Window> <!-- Navit window --> </GUILayout> |
|
From: KaZeR <ka...@us...> - 2007-09-04 17:14:30
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12824 Modified Files: Mineque.layout Log Message: Worked on Mineque's skin Index: Mineque.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/Mineque.layout,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Mineque.layout 1 Sep 2007 18:29:16 -0000 1.2 --- Mineque.layout 4 Sep 2007 17:14:26 -0000 1.3 *************** *** 2,165 **** <GUILayout > ! <Window Type="DefaultWindow" Name="Navit" > ! <Property Name="InheritsAlpha" Value="False" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> ! ! <Window Type="NavitGrey/RightPanel" Name="RightPanel" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,635},{0,1},{0,165},{0,600}}" /> ! </Window> ! <Window Type="NavitGrey/TopPanel" Name="TopPanel" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,1},{0,1},{0,800},{0,131}}" /> ! </Window> ! <Window Type="NavitGrey/BottomStreetPanel" Name="BottomStreetPanel" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,550},{0,1},{0,800},{0,50}}" /> ! </Window> ! <!-- <Window Type="NavitGrey/ViewModeSwitchButton" Name="OSD/ViewMode" > --> ! <Window Type="TaharezLook/Button" Name="OSD/ViewMode" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,502},{0,702},{0,98},{0,98}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,800},{0,536}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,646},{0,507},{0,62},{0,93}}" /> ! </Window> ! <!-- ! <Window Type="NavitGrey/SpeakerOnButton" Name="SpeakerOnButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,28},{0,36}}" /> ! </Window> ! --> ! <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,29},{0,30}}" /> ! </Window> ! <Window Type="NavitGrey/RouteButton" Name="RouteButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,36},{0,36}}" /> ! </Window> ! <!-- <Window Type="NavitGrey/OptionsButton" Name="OptionsButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,37},{0,25}}" /> ! </Window> ! <Window Type="NavitGrey/SateliteImage" Name="SateliteImage" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,30},{0,38}}" /> ! </Window> ! <Window Type="NavitGrey/SateliteStrenghBarOn" Name="SateliteStrenghBarOn" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,17},{0,32}}" /> ! </Window> ! <Window Type="NavitGrey/SateliteStrenghBarOff" Name="SateliteStrenghBarOff" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,17},{0,32}}" /> ! </Window> ! <Window Type="NavitGrey/NavitAboutButton" Name="NavitAboutButton"> ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,82},{0,25}}" /> ! </Window> ! <Window Type="NavitGrey/ArrowLeft" Name="ArrowLeft" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> ! </Window> ! <Window Type="NavitGrey/ArrowTop" Name="ArrowTop" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> ! </Window> ! <Window Type="NavitGrey/ArrowRight" Name="ArrowRight" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,39},{0,34}}" /> ! </Window> ! <Window Type="NavitGrey/ArrowDown" Name="ArrowDown" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,},{0,0},{0,34},{0,39}}" /> ! </Window>--> ! ! <Window Type="NavitGrey/QuitButton" Name="SpeakerOffButton" > ! <Property Name="TitlebarEnabled" Value="False" /> ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,476},{0,799},{0,536}}" /> ! </Window> ! ! ! <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > ! <Property Name="Text" Value="Choose your destination" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="Alpha" Value="0.7" /> ! <Property Name="TitlebarEnabled" Value="True" /> ! <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > ! <Property Name="Text" Value="Country :" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > ! <Property Name="Text" Value="Town : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > ! <Property Name="Text" Value="Street : " /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> ! </Window> ! <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > ! <Property Name="Text" Value="Pick your choice :" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> ! </Window> ! <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > ! <Property Name="Text" Value="Keyboard" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > ! <Property Name="Text" Value="Go!" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> ! </Window> </Window> ! ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="Text" Value="No destination set." /> ! <Property Name="Alpha" Value="0.7" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.88,0},{0.77,0},{0.98,0}}" /> ! </Window> <Window Type="TaharezLook/StaticText" Name="Navit/Routing/CurrentRoadName" > <Property Name="Font" Value="DejaVuSans-14" /> --- 2,83 ---- <GUILayout > ! <Window Type="DefaultWindow" Name="Navit" > ! <Property Name="InheritsAlpha" Value="False" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > ! <Property Name="Font" Value="DejaVuSans-14" /> ! <Property Name="Text" Value="No destination set." /> ! <Property Name="Alpha" Value="0.7" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.88,0},{0.77,0},{0.98,0}}" /> ! </Window> ! </Window> + <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > + <Property Name="Text" Value="Choose your destination" /> + <Property Name="Visible" Value="False" /> + <Property Name="Alpha" Value="0.7" /> + <Property Name="TitlebarEnabled" Value="True" /> + <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > + <Property Name="Text" Value="Country :" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> + </Window> + <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> + </Window> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > + <Property Name="Text" Value="Town : " /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> + </Window> + <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> + </Window> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > + <Property Name="Text" Value="Street : " /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> + </Window> + <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> + </Window> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > + <Property Name="Text" Value="Pick your choice :" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> + </Window> + <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> + </Window> + <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > + <Property Name="Text" Value="Keyboard" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> + </Window> + <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > + <Property Name="Text" Value="Go!" /> + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> + </Window> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> + </Window> + <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > + <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> + <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> + </Window> </Window> ! <Window Type="TaharezLook/StaticText" Name="Navit/Routing/CurrentRoadName" > <Property Name="Font" Value="DejaVuSans-14" /> *************** *** 228,292 **** </Window> ! <!-- ! <Window Type="NavitGrey/ModeSwitchButton" Name="OSD/ViewMode" > ! <Property Name="Text" Value="3D" /> ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,708},{0,508},{0,799},{0,599}}" /> ! </Window> ! ! <Window Type="NavitGrey/QuitButton" Name="OSD/Quit" > ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0,10},{0,10},{0,38},{0,40}}" /> ! </Window> ! --> ! <Window Type="TaharezLook/FrameWindow" Name="Navit/ProgressWindow" > ! <Property Name="Text" Value="Calculating the route" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="TitlebarFont" Value="Commonwealth-10" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="TitlebarEnabled" Value="True" /> ! <Property Name="UnifiedAreaRect" Value="{{0.137865,0},{0.775,0},{0.729668,0},{0.888333,0}}" /> ! <Window Type="TaharezLook/ProgressBar" Name="Navit/ProgressWindow/Bar" > ! <Property Name="StepSize" Value="0.01" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="CurrentProgress" Value="0" /> ! <Property Name="UnifiedAreaRect" Value="{{0.0920548,0},{0.513128,0},{0.872384,0},{0.921541,0}}" /> ! </Window> ! </Window> ! <Window Type="TaharezLook/FrameWindow" Name="Navit/RoadBook" > ! <Property Name="Alpha" Value="0.85" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="Text" Value="Road Book" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.02,0},{0.99,0},{0.87,0}}" /> ! <Window Type="TaharezLook/MultiColumnList" Name="Roadbook" > ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.99,0},{0.93,0}}" /> ! </Window> ! <Window Type="TaharezLook/StaticText" Name="RoadBook/ETA" > ! <Property Name="Font" Value="DejaVuSans-12" /> ! <Property Name="HorzFormatting" Value="WordWrapCentred" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.94,0},{0.7,0},{0.99,0}}" /> ! </Window> ! <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton2" > ! <Property Name="Text" Value="Close" /> ! <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> ! <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.94,0},{0.99,0},{0.99,0}}" /> ! </Window> ! </Window> ! <Window Type="TaharezLook/FrameWindow" Name="Navit/Keyboard" > ! <Property Name="Alpha" Value="0.85" /> ! <Property Name="Visible" Value="False" /> ! <Property Name="AlwaysOnTop" Value="True" /> ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.5,0},{0.99,0},{0.87,0}}" /> ! <Window Type="TaharezLook/StaticText" Name="Navit/Keyboard/Input" > ! <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.80,0},{0.7,0},{0.95,0}}" /> ! </Window> </Window> - <!-- <Window Type="NavitGrey/SpeakerOffButton" Name="SpeakerOffButton" > --> - </Window> - </GUILayout> --- 146,166 ---- </Window> ! ! <Window Type="NavitGrey/ViewModeSwitchButton" Name="OSD/ViewMode" > ! <Property Name="UnifiedAreaRect" Value="{{0,702},{0,502},{0,800},{0,600}}" /> ! </Window> ! <Window Type="NavitGrey/QuitButton" Name="QuitButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,8},{0,4},{0,37},{0,34}}" /> ! </Window> ! <Window Type="NavitGrey/RouteButton" Name="RouteButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,152},{0,1},{0,188},{0,36}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomInButton" Name="ZoomInButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,707},{0,470},{0,800},{0,532}}" /> ! </Window> ! <Window Type="NavitGrey/ZoomOutButton" Name="ZoomOuButton" > ! <Property Name="UnifiedAreaRect" Value="{{0,670},{0,507},{0,732},{0,600}}" /> ! </Window> ! </Window> </GUILayout> |
|
From: KaZeR <ka...@us...> - 2007-09-04 17:12:28
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11864/schemes Modified Files: Mineque.scheme Log Message: Worked on Mineque's skin Index: Mineque.scheme =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Mineque.scheme 1 Sep 2007 18:29:17 -0000 1.2 --- Mineque.scheme 4 Sep 2007 17:12:29 -0000 1.3 *************** *** 7,18 **** <WindowRendererSet Filename="CEGUIFalagardWRBase" /> ! <FalagardMapping WindowType="NavitGrey/RightPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/RightPanel" /> ! <FalagardMapping WindowType="NavitGrey/TopPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/TopPanel" /> ! <FalagardMapping WindowType="NavitGrey/BottomStreetPanel" TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow" LookNFeel="NavitGrey/BottomStreetPanel" /> <FalagardMapping WindowType="NavitGrey/ZoomInButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomInButton" /> <FalagardMapping WindowType="NavitGrey/ZoomOutButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomOutButton" /> <FalagardMapping WindowType="NavitGrey/SpeakerOffButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/SpeakerOffButton" /> <FalagardMapping WindowType="NavitGrey/RouteButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/RouteButton" /> <FalagardMapping WindowType="NavitGrey/QuitButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/QuitButton" /> --- 7,21 ---- <WindowRendererSet Filename="CEGUIFalagardWRBase" /> ! <FalagardMapping WindowType="NavitGrey/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="NavitGrey/StaticImage" /> ! <FalagardMapping WindowType="NavitGrey/StaticText" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="NavitGrey/StaticText" /> ! <FalagardMapping WindowType="NavitGrey/ZoomInButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomInButton" /> <FalagardMapping WindowType="NavitGrey/ZoomOutButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/ZoomOutButton" /> <FalagardMapping WindowType="NavitGrey/SpeakerOffButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/SpeakerOffButton" /> <FalagardMapping WindowType="NavitGrey/RouteButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/RouteButton" /> + <FalagardMapping WindowType="NavitGrey/OptionsButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/OptionsButton" /> <FalagardMapping WindowType="NavitGrey/QuitButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/QuitButton" /> + <FalagardMapping WindowType="NavitGrey/NavitAboutButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/NavitAboutButton" /> + <FalagardMapping WindowType="NavitGrey/SpeakerButton" TargetType="CEGUI/PushButton" Renderer="Falagard/Button" LookNFeel="NavitGrey/SpeakerButton" /> |
|
From: KaZeR <ka...@us...> - 2007-09-04 17:12:28
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/imagesets In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11864/imagesets Modified Files: Mineque-Black.imageset Log Message: Worked on Mineque's skin Index: Mineque-Black.imageset =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/imagesets/Mineque-Black.imageset,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Mineque-Black.imageset 1 Sep 2007 15:01:46 -0000 1.1 --- Mineque-Black.imageset 4 Sep 2007 17:12:28 -0000 1.2 *************** *** 24,28 **** <Image Name="SateliteStrenghBarOn" XPos="180" YPos="450" Width="17" Height="32" /> <Image Name="SateliteStrenghBarOff" XPos="200" YPos="450" Width="17" Height="32" /> ! <Image Name="TopPanel" XPos="0" YPos="660" Width="800" Height="131" /> <Image Name="NavitAboutButton" XPos="0" YPos="500" Width="82" Height="25" /> <!-- Right panel parts --> --- 24,28 ---- <Image Name="SateliteStrenghBarOn" XPos="180" YPos="450" Width="17" Height="32" /> <Image Name="SateliteStrenghBarOff" XPos="200" YPos="450" Width="17" Height="32" /> ! <Image Name="TopPanel" XPos="0" YPos="53" Width="800" Height="64" /> <Image Name="NavitAboutButton" XPos="0" YPos="500" Width="82" Height="25" /> <!-- Right panel parts --> |
|
From: KaZeR <ka...@us...> - 2007-09-04 17:12:27
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11864/looknfeel Modified Files: Mineque.looknfeel Log Message: Worked on Mineque's skin Index: Mineque.looknfeel =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Mineque.looknfeel 1 Sep 2007 18:29:17 -0000 1.2 --- Mineque.looknfeel 4 Sep 2007 17:12:29 -0000 1.3 *************** *** 2,224 **** <Falagard> ! <WidgetLook name="NavitGrey/RightPanel"> ! <PropertyLinkDefinition name="CaptionColour" widget="__auto_titlebar__" targetProperty="CaptionColour" initialValue="FFFFFFFF" /> ! <Property name="NSSizingCursorImage" value="set:TaharezLook image:MouseNoSoCursor" /> ! <Property name="EWSizingCursorImage" value="set:TaharezLook image:MouseEsWeCursor" /> ! <Property name="NWSESizingCursorImage" value="set:TaharezLook image:MouseNwSeCursor" /> ! <Property name="NESWSizingCursorImage" value="set:TaharezLook image:MouseNeSwCursor" /> ! <NamedArea name="ClientNoTitleWithFrame"> ! <Area> [...1279 lines suppressed...] + </StateImagery> + <StateImagery name="WithFrameDisabledBackground"> + <Layer> + <Section look="TaharezLook/StaticShared" section="background" /> + </Layer> + </StateImagery> + <StateImagery name="NoFrameEnabledBackground"> + <Layer> + <Section look="TaharezLook/StaticShared" section="background_noframe" /> + </Layer> + </StateImagery> + <StateImagery name="NoFrameDisabledBackground"> + <Layer> + <Section look="TaharezLook/StaticShared" section="background_noframe" /> + </Layer> + </StateImagery> + </WidgetLook> + </Falagard> |
|
From: KaZeR <ka...@us...> - 2007-09-04 17:10:15
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10938 Modified Files: gui_sdl_window.cpp Log Message: Improved some minor code Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gui_sdl_window.cpp 4 Sep 2007 09:13:23 -0000 1.16 --- gui_sdl_window.cpp 4 Sep 2007 17:10:10 -0000 1.17 *************** *** 91,100 **** static void ! sdl_update_roadbook(struct navigation *nav, void *data) { using namespace CEGUI; extern Window* myRoot; ! if(! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->isVisible()){ WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); --- 91,101 ---- static void ! sdl_update_roadbook(struct navigation *nav) { + printf("Called\n"); using namespace CEGUI; extern Window* myRoot; ! /* if(! WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->isVisible()){ WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->show(); *************** *** 104,108 **** mcl->resetList(); ! struct navigation_list *list; char *str; --- 105,109 ---- mcl->resetList(); ! */ struct navigation_list *list; char *str; *************** *** 114,124 **** list=navigation_list_new(nav); text=navigation_list_get(list, navigation_mode_speech); - while ((str=navigation_list_get(list, navigation_mode_short))) { ! /* printf("SDL : %s\n", str); ! mcl->addRow(); /* char from [256]; --- 115,124 ---- list=navigation_list_new(nav); text=navigation_list_get(list, navigation_mode_speech); while ((str=navigation_list_get(list, navigation_mode_short))) { ! printf("SDL : %s\n", str); ! // mcl->addRow(); /* char from [256]; *************** *** 150,154 **** mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); */ ! } // navigation_list_destroy(list); --- 150,154 ---- mcl->setItem(itemListbox, 0, mcl->getRowCount()-1); */ ! } // navigation_list_destroy(list); *************** *** 201,205 **** navig=navit_get_navigation(sdl_gui_navit); if(navig){ ! dbg(1,"navig valid, registering callback\n"); /* this_->roadbook_callback=callback_new_1(callback_cast(navit_window_roadbook_update), this_); --- 201,210 ---- navig=navit_get_navigation(sdl_gui_navit); if(navig){ ! printf("navig valid, registering callback\n"); ! ! // callback_new_1(void (*)())sdl_update_roadbook, sdl_gui); ! callback_new_0((void (*)())sdl_update_roadbook); ! ! /* this_->roadbook_callback=callback_new_1(callback_cast(navit_window_roadbook_update), this_); *************** *** 210,214 **** ); - */ navigation_register_callback(navig, navigation_mode_long, --- 215,218 ---- *************** *** 216,221 **** callback_new_1(callback_cast(sdl_update_roadbook), &sdl_gui_navit) ); } else { ! dbg(1,"navig unvalid\n"); } --- 220,226 ---- callback_new_1(callback_cast(sdl_update_roadbook), &sdl_gui_navit) ); + */ } else { ! printf("navig unvalid\n"); } *************** *** 283,287 **** last_time_pulse = SDL_GetTicks(); } ! WindowManager::getSingleton().getWindow("OSD/Satellites")->setText(fps); /* --- 288,292 ---- last_time_pulse = SDL_GetTicks(); } ! WindowManager::getSingleton().getWindow("OSD/Satellites")->setText(fps); /* *************** *** 627,631 **** CEGUI::System::getSingleton().setGUISheet(myRoot); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); --- 632,646 ---- CEGUI::System::getSingleton().setGUISheet(myRoot); ! try { ! ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonQuit)); ! // CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->setText(_("Quit")); ! ! CEGUI::WindowManager::getSingleton().getWindow("ZoomInButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomIn)); ! // CEGUI::WindowManager::getSingleton().getWindow("ZoomInButton")->setText(_("ZoomIn")); ! ! CEGUI::WindowManager::getSingleton().getWindow("ZoomOutButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomOut)); ! // CEGUI::WindowManager::getSingleton().getWindow("ZoomOutButton")->setText(_("ZoomOut")); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventKeyUp, Event::Subscriber(DestinationEntryChange)); CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/CountryEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); *************** *** 635,654 **** CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/DestinationButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(DialogWindowSwitch)); ! ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->setText(_("RoadBook")); ! ! // this one is maybe not needed anymore ! CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton2")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); ! ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomIn")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomIn)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomIn")->setText(_("ZoomIn")); ! ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomOut")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ZoomOut)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ZoomOut")->setText(_("ZoomOut")); ! ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ButtonQuit)); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Quit")->setText(_("Quit")); CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ToggleView)); --- 650,654 ---- CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/StreetEditbox")->subscribeEvent(Window::EventMouseButtonDown, Event::Subscriber(handleMouseEnters)); ! CEGUI::WindowManager::getSingleton().getWindow("DestinationButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(DialogWindowSwitch)); CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(ToggleView)); *************** *** 659,663 **** CEGUI::WindowManager::getSingleton().getWindow("DestinationWindow/Listbox")->subscribeEvent(MultiColumnList::EventSelectionChanged, Event::Subscriber(ItemSelect)); - CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")->subscribeEvent(Scrollbar::EventScrollPositionChanged, Event::Subscriber(MoveCamera)); // Translation for StaticTexts (labels) --- 659,662 ---- *************** *** 685,689 **** --- 684,707 ---- BuildKeyboard(); + + CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")->subscribeEvent(Scrollbar::EventScrollPositionChanged, Event::Subscriber(MoveCamera)); + + CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); + CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->setText(_("RoadBook")); + + // this one is maybe not needed anymore + CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton2")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); + + + + + } + catch (CEGUI::Exception& e) + { + fprintf(stderr,"CEGUI Exception occured: \n%s\n", e.getMessage().c_str()); + printf("Missing control!...\n"); + } + } catch (CEGUI::Exception& e) *************** *** 716,724 **** double speed=*vehicle_speed_get(v); sprintf (buffer, "%02.02f km/h", speed); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/SpeedoMeter")->setText(buffer); double height=*vehicle_height_get(v); sprintf (buffer, "%.0f m", height); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Altimeter")->setText(buffer); } --- 734,742 ---- double speed=*vehicle_speed_get(v); sprintf (buffer, "%02.02f km/h", speed); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/SpeedoMeter")->setText(buffer); double height=*vehicle_height_get(v); sprintf (buffer, "%.0f m", height); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/Altimeter")->setText(buffer); } |
|
From: KaZeR <ka...@us...> - 2007-09-04 09:47:54
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14424 Added Files: TaharezLook.layout Removed Files: navit.layout Log Message: Renamed navit.layout to TaharezLook.layout --- navit.layout DELETED --- --- NEW FILE: TaharezLook.layout --- <?xml version="1.0" encoding="UTF-8"?> <GUILayout > <Window Type="DefaultWindow" Name="Navit" > <Property Name="InheritsAlpha" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> <Window Type="TaharezLook/FrameWindow" Name="DestinationWindow" > <Property Name="Text" Value="Choose your destination" /> <Property Name="Visible" Value="False" /> <Property Name="Alpha" Value="0.7" /> <Property Name="TitlebarEnabled" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.001,0},{0.07,0},{0.8,0},{0.9,0}}" /> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Country" > <Property Name="Text" Value="Country :" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.271871,0},{0.1,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/CountryEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.05,0},{0.9,0},{0.1,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Town" > <Property Name="Text" Value="Town : " /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.11,0},{0.275,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/TownEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.11,0},{0.9,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Street" > <Property Name="Text" Value="Street : " /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.17,0},{0.275,0},{0.22,0}}" /> </Window> <Window Type="TaharezLook/Editbox" Name="DestinationWindow/StreetEditbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.17,0},{0.9,0},{0.22,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Label1" > <Property Name="Text" Value="Pick your choice :" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.23,0},{0.9,0},{0.28,0}}" /> </Window> <Window Type="TaharezLook/MultiColumnList" Name="DestinationWindow/Listbox" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.29,0},{0.945,0},{0.905842,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="DestinationWindow/KB" > <Property Name="Text" Value="Keyboard" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.54,0},{0.92,0},{0.70,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="DestinationWindow/GO" > <Property Name="Text" Value="Go!" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.92,0},{0.97,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_x" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.92,0},{0.12,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="DestinationWindow/Dest_y" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.12,0},{0.92,0},{0.23,0},{0.98,0}}" /> </Window> </Window> <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Text" Value="No destination set." /> <Property Name="Alpha" Value="0.7" /> <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.88,0},{0.77,0},{0.98,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="Navit/Routing/CurrentRoadName" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="Alpha" Value="0.7" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.001,0},{0.77,0},{0.07,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/DestinationButton" > <Property Name="Text" Value="Destination" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.01,0},{0.99,0},{0.06,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.06,0},{0.99,0},{0.11,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" > <Property Name="Font" Value="DejaVuSans-14" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.11,0},{0.99,0},{0.16,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.16,0},{0.99,0},{0.21,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/Coords" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.21,0},{0.99,0},{0.26,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/ZoomIn" > <Property Name="Text" Value="ZoomIn" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.26,0},{0.99,0},{0.31,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/ZoomOut" > <Property Name="Text" Value="ZoomOut" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.31,0},{0.99,0},{0.36,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton" > <Property Name="Text" Value="RoadBook" /> <Property Name="Visible" Value="False" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.36,0},{0.99,0},{0.41,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="OSD/ETA" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="Visible" Value="False" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.41,0},{0.99,0},{0.51,0}}" /> </Window> <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" > <Property Name="PageSize" Value="0" /> <Property Name="OverlapSize" Value="0" /> <Property Name="DocumentSize" Value="2000" /> <Property Name="ScrollPosition" Value="0" /> <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" /> <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.94,0},{0.53,0},{0.99,0},{0.85,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/ViewMode" > <Property Name="Text" Value="3D" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.87,0},{0.99,0},{0.93,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/Quit" > <Property Name="Text" Value="Quit" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.93,0},{0.99,0},{0.99,0}}" /> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/ProgressWindow" > <Property Name="Text" Value="Calculating the route" /> <Property Name="Visible" Value="False" /> <Property Name="TitlebarFont" Value="Commonwealth-10" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="TitlebarEnabled" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.137865,0},{0.775,0},{0.729668,0},{0.888333,0}}" /> <Window Type="TaharezLook/ProgressBar" Name="Navit/ProgressWindow/Bar" > <Property Name="StepSize" Value="0.01" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="CurrentProgress" Value="0" /> <Property Name="UnifiedAreaRect" Value="{{0.0920548,0},{0.513128,0},{0.872384,0},{0.921541,0}}" /> </Window> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/RoadBook" > <Property Name="Alpha" Value="0.85" /> <Property Name="Visible" Value="False" /> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="Text" Value="Road Book" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.02,0},{0.99,0},{0.87,0}}" /> <Window Type="TaharezLook/MultiColumnList" Name="Roadbook" > <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.05,0},{0.99,0},{0.93,0}}" /> </Window> <Window Type="TaharezLook/StaticText" Name="RoadBook/ETA" > <Property Name="Font" Value="DejaVuSans-12" /> <Property Name="HorzFormatting" Value="WordWrapCentred" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.94,0},{0.7,0},{0.99,0}}" /> </Window> <Window Type="TaharezLook/Button" Name="OSD/RoadbookButton2" > <Property Name="Text" Value="Close" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.94,0},{0.99,0},{0.99,0}}" /> </Window> </Window> <Window Type="TaharezLook/FrameWindow" Name="Navit/Keyboard" > <Property Name="Alpha" Value="0.85" /> <Property Name="Visible" Value="False" /> <Property Name="AlwaysOnTop" Value="True" /> <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.5,0},{0.99,0},{0.87,0}}" /> <Window Type="TaharezLook/StaticText" Name="Navit/Keyboard/Input" > <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.80,0},{0.7,0},{0.95,0}}" /> </Window> </Window> </Window> </GUILayout> |
13 messages has been excluded from this view by a project administrator.
