roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src/gtk roadmap_dialog.c,1.9,1.10

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10700

Modified Files:
	roadmap_dialog.c 
Log Message:
Fix selection from combo box (Paul and I)

Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_dialog.c	18 Aug 2003 06:01:30 -0000	1.9
--- roadmap_dialog.c	3 Dec 2005 03:27:02 -0000	1.10
***************
*** 348,351 ****
--- 348,352 ----
                                  const char *name,
                                  int count,
+                                 int current,
                                  char **labels,
                                  void **values,
***************
*** 385,388 ****
--- 386,390 ----
     }
     gtk_option_menu_set_menu (GTK_OPTION_MENU(w), menu);
+    gtk_option_menu_set_history (GTK_OPTION_MENU(w), current);
  
     if (child->choice != NULL) {

[Roadmap-commit] roadmap/src/gtk2 roadmap_dialog.c,1.14,1.15

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10627

Modified Files:
	roadmap_dialog.c 
Log Message:
Fix selection from combo box (Paul and I)

Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** roadmap_dialog.c	5 Jul 2004 19:14:03 -0000	1.14
--- roadmap_dialog.c	3 Dec 2005 03:26:40 -0000	1.15
***************
*** 410,413 ****
--- 410,414 ----
                                  const char *name,
                                  int count,
+                                 int current,
                                  char **labels,
                                  void **values,
***************
*** 447,450 ****
--- 448,452 ----
     }
     gtk_option_menu_set_menu (GTK_OPTION_MENU(w), menu);
+    gtk_option_menu_set_history (GTK_OPTION_MENU(w), current);
  
     if (child->choice != NULL) {

[Roadmap-commit] roadmap/src/qt roadmap_dialog.cc,1.5,1.6

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10541

Modified Files:
	roadmap_dialog.cc 
Log Message:
Fix selection from combo box (Paul and I)

Index: roadmap_dialog.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_dialog.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_dialog.cc	18 Aug 2003 05:47:54 -0000	1.5
--- roadmap_dialog.cc	3 Dec 2005 03:26:12 -0000	1.6
***************
*** 75,82 ****
  }
  
! void roadmap_dialog_new_choice (const char *frame, const char *name, int count,
! 	char **labels, void **values, RoadMapDialogCallback callback) {
  
! 	currentDialog->addChoiceEntry(frame, name, count, labels, values, callback);
  }
  
--- 75,88 ----
  }
  
! void roadmap_dialog_new_choice (const char *frame,
!                                 const char *name,
!                                 int count,
!                                 int current,
!                                 char **labels,
!                                 void **values,
!                                 RoadMapDialogCallback callback) {
  
! 	currentDialog->addChoiceEntry
!       (frame, name, count, current, labels, values, callback);
  }
  

[Roadmap-commit] roadmap/src/qt qt_dialog.h,1.3,1.4

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10483

Modified Files:
	qt_dialog.h 
Log Message:
Fix selection from combo box (Paul and I)

Index: qt_dialog.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qt_dialog.h	18 Aug 2003 05:47:54 -0000	1.3
--- qt_dialog.h	3 Dec 2005 03:25:48 -0000	1.4
***************
*** 58,61 ****
--- 58,62 ----
  	RoadMapDialogCallback callback;
  	QVector<Item> items;
+    int current;
  	QWidget* widget;
  
***************
*** 72,76 ****
  	Entry(RMapDialog* dialog, int type, QString name);
  	Entry(RMapDialog* dialog, int type, QString name, QVector<Item>& items,
! 		RoadMapDialogCallback callback);
  
  	~Entry();
--- 73,77 ----
  	Entry(RMapDialog* dialog, int type, QString name);
  	Entry(RMapDialog* dialog, int type, QString name, QVector<Item>& items,
! 		int current, RoadMapDialogCallback callback);
  
  	~Entry();
***************
*** 103,108 ****
  	void addLabelEntry(const char* frame, const char* name);
  	void addColorEntry(const char* frame, const char* name);
! 	void addChoiceEntry(const char* frame, const char* name, int count,
! 		char** labels, void** values, RoadMapDialogCallback callback);
  
  	void addListEntry(const char* frame, const char* name);
--- 104,114 ----
  	void addLabelEntry(const char* frame, const char* name);
  	void addColorEntry(const char* frame, const char* name);
! 	void addChoiceEntry(const char* frame,
!                        const char* name,
!                        int count,
!                        int current,
!                        char** labels,
!                        void** values,
!                        RoadMapDialogCallback callback);
  
  	void addListEntry(const char* frame, const char* name);

[Roadmap-commit] roadmap/src/qt qt_dialog.cc,1.5,1.6

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10450

Modified Files:
	qt_dialog.cc 
Log Message:
Fix selection from combo box (Paul and I)

Index: qt_dialog.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_dialog.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** qt_dialog.cc	19 Aug 2003 06:58:13 -0000	1.5
--- qt_dialog.cc	3 Dec 2005 03:25:18 -0000	1.6
***************
*** 85,90 ****
  }
  
! void RMapDialog::addChoiceEntry(const char* frameName, const char* name, int count,
! 	char** labels, void** values, RoadMapDialogCallback callback) {
  
  	QList<Entry>* frame = getFrame(frameName);
--- 85,95 ----
  }
  
! void RMapDialog::addChoiceEntry(const char* frameName,
!                                 const char* name,
!                                 int count,
!                                 int current,
!                                 char** labels,
!                                 void** values,
!                                 RoadMapDialogCallback callback) {
  
  	QList<Entry>* frame = getFrame(frameName);
***************
*** 98,102 ****
  	}
  
! 	Entry* entry = new Entry(this, Entry::ChoiceEntry, name, items, callback);
  	frame->append(entry);
  }
--- 103,108 ----
  	}
  
! 	Entry* entry =
!       new Entry(this, Entry::ChoiceEntry, name, items, current, callback);
  	frame->append(entry);
  }
***************
*** 132,136 ****
  void RMapDialog::addButton(char* label, RoadMapDialogCallback callback) {
  	QVector<Item> items;
! 	Entry* entry = new Entry(this, Entry::ButtonEntry, label, items, callback);
  	buttons.append(entry);
  }
--- 138,143 ----
  void RMapDialog::addButton(char* label, RoadMapDialogCallback callback) {
  	QVector<Item> items;
! 	Entry* entry =
!       new Entry(this, Entry::ButtonEntry, label, items, 0, callback);
  	buttons.append(entry);
  }
***************
*** 222,233 ****
  	callback = 0;
  	widget = 0;
  }
  
  Entry::Entry(RMapDialog* dlg, int etype, QString ename, QVector<Item>& eitems,
! 	RoadMapDialogCallback ecallback) {
  
  	dialog = dlg;
  	type = etype;
  	name = ename;
  	callback = ecallback;
  
--- 229,242 ----
  	callback = 0;
  	widget = 0;
+    current = 0;
  }
  
  Entry::Entry(RMapDialog* dlg, int etype, QString ename, QVector<Item>& eitems,
! 	int ecurrent, RoadMapDialogCallback ecallback) {
  
  	dialog = dlg;
  	type = etype;
  	name = ename;
+    current = ecurrent;
  	callback = ecallback;
  
***************
*** 265,268 ****
--- 274,278 ----
  					cb->insertItem(items[i]->label);
  				}
+             cb->setCurrentItem(current);
  
  				connect(cb, SIGNAL(activated(int)), this, SLOT(run()));
***************
*** 340,348 ****
  
  		case ChoiceEntry: 
! 			items[((QComboBox*) widget)->currentItem()]->value = (char *)val;
  			break;
  
  		case ListEntry:
! 			items[((QListBox*) widget)->currentItem()]->value = (char *)val;
  			break;
  
--- 350,368 ----
  
  		case ChoiceEntry: 
!          for (uint i = 0; i < items.count(); ++i) {
!             if (items[i] == val) {
!                ((QComboBox*) widget)->setCurrentItem(i);
!                break;
!             }
!          }
  			break;
  
  		case ListEntry:
!          for (uint i = 0; i < items.count(); ++i) {
!             if (items[i] == val) {
!                ((QListBox*) widget)->setCurrentItem(i);
!                break;
!             }
!          }
  			break;
  

[Roadmap-commit] roadmap/src/win32 roadmap_dialog.c,1.2,1.3

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10164

Modified Files:
	roadmap_dialog.c 
Log Message:
Fix selection from combo box (Paul and I)

Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_dialog.c	4 Sep 2005 22:54:43 -0000	1.2
--- roadmap_dialog.c	3 Dec 2005 03:24:09 -0000	1.3
***************
*** 300,303 ****
--- 300,304 ----
  								const char *name,
  								int count,
+ 								int current,
  								char **labels,
  								void **values,
***************
*** 326,330 ****
  	child->choice = choice;
  	child->callback = callback;
! 	child->value  = choice[0].value;
  }
  
--- 327,331 ----
  	child->choice = choice;
  	child->callback = callback;
! 	child->value  = choice[current].value;
  }
  

[Roadmap-commit] roadmap/src/win32 roadmap_messagebox.c,1.1,1.2

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18958

Modified Files:
	roadmap_messagebox.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_messagebox.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_messagebox.c	11 Jul 2005 09:13:49 -0000	1.1
--- roadmap_messagebox.c	2 Dec 2005 22:55:23 -0000	1.2
***************
*** 32,36 ****
  
  
! void roadmap_messagebox (const char *title, const char *text)
  {
  #ifdef _UNICODE
--- 32,37 ----
  
  
! static void roadmap_messagebox_show (const char *title,
!                                      const char *text, int options)
  {
  #ifdef _UNICODE
***************
*** 38,47 ****
  	u_title = ConvertToUNICODE(title);
  	u_text = ConvertToUNICODE(text);
! 	MessageBox(0, u_text, u_title, MB_OK);
  	free(u_title);
  	free(u_text);
  #else
! 	MessageBox(0, text, title, MB_OK);
  #endif
  }
  
--- 39,58 ----
  	u_title = ConvertToUNICODE(title);
  	u_text = ConvertToUNICODE(text);
! 	MessageBox(0, u_text, u_title, MB_OK|options);
  	free(u_title);
  	free(u_text);
  #else
! 	MessageBox(0, text, title, MB_OK|options);
  #endif
  }
  
+ void roadmap_messagebox (const char *title, const char *text)
+ {
+    roadmap_messagebox_show (title, text, 0);
+ }
+ 
+ void roadmap_messagebox_wait (const char *title, const char *text)
+ {
+    roadmap_messagebox_show (title, text, MB_ICONERROR);
+ }
+ 

[Roadmap-commit] roadmap/src roadmap_start.c,1.87,1.88

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18836

Modified Files:
	roadmap_start.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** roadmap_start.c	2 Dec 2005 21:37:33 -0000	1.87
--- roadmap_start.c	2 Dec 2005 22:54:47 -0000	1.88
***************
*** 684,688 ****
  
  void roadmap_start_fatal (const char *text) {
!    roadmap_messagebox ("Fatal Error", text);
  }
  
--- 684,688 ----
  
  void roadmap_start_fatal (const char *text) {
!    roadmap_messagebox_wait ("Fatal Error", text);
  }
  

[Roadmap-commit] roadmap/src roadgps_start.c,1.15,1.16

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18821

Modified Files:
	roadgps_start.c 
Log Message:
Error messages to be displayed in a message box

Index: roadgps_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadgps_start.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadgps_start.c	2 Dec 2005 21:38:27 -0000	1.15
--- roadgps_start.c	2 Dec 2005 22:54:39 -0000	1.16
***************
*** 115,119 ****
  
  void roadgps_start_fatal (const char *text) {
!    roadmap_messagebox ("Fatal Error", text);
  }
  
--- 115,119 ----
  
  void roadgps_start_fatal (const char *text) {
!    roadmap_messagebox_wait ("Fatal Error", text);
  }
  

[Roadmap-commit] roadmap/src/qt roadmap_messagebox.cc,1.2,1.3

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18747

Modified Files:
	roadmap_messagebox.cc 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_messagebox.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_messagebox.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_messagebox.cc	21 Jun 2003 23:19:21 -0000	1.2
--- roadmap_messagebox.cc	2 Dec 2005 22:54:27 -0000	1.3
***************
*** 35,36 ****
--- 35,40 ----
  	QMessageBox::information(0, roadmap_start_get_title(title), message);
  }
+ 
+ void roadmap_messagebox_wait(const char* title, const char* message) {
+ 	QMessageBox::critical(0, roadmap_start_get_title(title), message);
+ }

[Roadmap-commit] roadmap/src/gtk2 roadmap_messagebox.c,1.6,1.7

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17866

Modified Files:
	roadmap_messagebox.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_messagebox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_messagebox.c	2 Dec 2005 21:40:07 -0000	1.6
--- roadmap_messagebox.c	2 Dec 2005 22:50:49 -0000	1.7
***************
*** 1,3 ****
! /* roadmap_messageboc.c - manage the roadmap dialogs used for user info.
   *
   * LICENSE:
--- 1,3 ----
! /* roadmap_messagebox.c - manage the roadmap dialogs used for user info.
   *
   * LICENSE:
***************
*** 48,52 ****
  }
  
! void roadmap_messagebox (const char *title, const char *text) {
  
     GtkWidget *ok;
--- 48,62 ----
  }
  
! static gint roadmap_messagebox_ok_modal (GtkWidget *w, gpointer data) {
! 
!    GtkWidget *dialog = (GtkWidget *) data;
! 
!    gtk_dialog_response (GTK_DIALOG(dialog), 1);
! 
!    return FALSE;
! }
! 
! static void roadmap_messagebox_show (const char *title,
!                                      const char *text, int modal) {
  
     GtkWidget *ok;
***************
*** 78,82 ****
        (GTK_CONTAINER(GTK_BOX(GTK_DIALOG(dialog)->vbox)), 4);
  
!    g_signal_connect (ok, "clicked", (GCallback) roadmap_messagebox_ok, dialog);
  
     gtk_widget_grab_default (ok);
--- 88,95 ----
        (GTK_CONTAINER(GTK_BOX(GTK_DIALOG(dialog)->vbox)), 4);
  
!    g_signal_connect (ok, "clicked",
!                      modal ? (GCallback) roadmap_messagebox_ok_modal :
!                              (GCallback) roadmap_messagebox_ok,
!                      dialog);
  
     gtk_widget_grab_default (ok);
***************
*** 85,88 ****
--- 98,117 ----
  
     gtk_widget_show_all (GTK_WIDGET(dialog));
+ 
+    if (modal) {
+       gtk_dialog_run (GTK_DIALOG(dialog));
+ 
+       gtk_grab_remove (dialog);
+       gtk_widget_destroy (dialog);
+    }
+ }
+ 
+ 
+ void roadmap_messagebox (const char *title, const char *message) {
+    roadmap_messagebox_show (title, message, 0);
+ }
+ 
+ void roadmap_messagebox_wait (const char *title, const char *message) {
+    roadmap_messagebox_show (title, message, 1);
  }
  

[Roadmap-commit] roadmap/src/gtk roadmap_messagebox.c,1.3,1.4

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17602

Modified Files:
	roadmap_messagebox.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_messagebox.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_messagebox.c	2 Dec 2005 21:40:43 -0000	1.3
--- roadmap_messagebox.c	2 Dec 2005 22:49:59 -0000	1.4
***************
*** 81,82 ****
--- 81,92 ----
  }
  
+ 
+ void roadmap_messagebox_wait (const char *title, const char *text) {
+ 
+    /* gtk_window_set_modal does not seem to do the trick (i.e.
+     * halt the application on its course), so we default to
+     * the normal message box.
+     */
+    roadmap_messagebox (title, text);
+ }
+ 

[Roadmap-commit] roadmap/src roadmap_messagebox.h,1.1.1.1,1.2

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16978

Modified Files:
	roadmap_messagebox.h 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_messagebox.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_messagebox.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_messagebox.h	21 Feb 2003 20:07:40 -0000	1.1.1.1
--- roadmap_messagebox.h	2 Dec 2005 22:46:23 -0000	1.2
***************
*** 25,29 ****
  #define INCLUDE__ROADMAP_MESSAGEBOX__H
  
! void roadmap_messagebox (const char *title, const char *message);
  
  #endif // INCLUDE__ROADMAP_MESSAGEBOX__H
--- 25,30 ----
  #define INCLUDE__ROADMAP_MESSAGEBOX__H
  
! void roadmap_messagebox      (const char *title, const char *message);
! void roadmap_messagebox_wait (const char *title, const char *message);
  
  #endif // INCLUDE__ROADMAP_MESSAGEBOX__H

[Roadmap-commit] roadmap/src/gtk roadmap_messagebox.c,1.2,1.3

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4212

Modified Files:
	roadmap_messagebox.c 
Log Message:
Pretty useless cleanup :-)

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_messagebox.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_messagebox.c	21 Jun 2003 23:21:40 -0000	1.2
--- roadmap_messagebox.c	2 Dec 2005 21:40:43 -0000	1.3
***************
*** 1,3 ****
! /* roadmap_dialog.c - manage the roadmap dialogs used for user input.
   *
   * LICENSE:
--- 1,3 ----
! /* roadmap_messagebox.c - manage the roadmap dialogs used for user info.
   *
   * LICENSE:

[Roadmap-commit] roadmap/src/gtk2 roadmap_messagebox.c,1.5,1.6

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4057

Modified Files:
	roadmap_messagebox.c 
Log Message:
Pretty useless cleanup :-)

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_messagebox.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_messagebox.c	26 Oct 2003 04:38:21 -0000	1.5
--- roadmap_messagebox.c	2 Dec 2005 21:40:07 -0000	1.6
***************
*** 1,3 ****
! /* roadmap_dialog.c - manage the roadmap dialogs used for user input.
   *
   * LICENSE:
--- 1,3 ----
! /* roadmap_messageboc.c - manage the roadmap dialogs used for user info.
   *
   * LICENSE:

[Roadmap-commit] roadmap/src roadgps_start.c,1.14,1.15

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3674

Modified Files:
	roadgps_start.c 
Log Message:
Error messages to be displayed in a message box

Index: roadgps_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadgps_start.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** roadgps_start.c	16 Jul 2005 02:28:42 -0000	1.14
--- roadgps_start.c	2 Dec 2005 21:38:27 -0000	1.15
***************
*** 40,43 ****
--- 40,44 ----
  #include "roadmap_math.h"
  #include "roadmap_main.h"
+ #include "roadmap_messagebox.h"
  
  #include "roadgps_logger.h"
***************
*** 109,112 ****
--- 110,122 ----
  
  
+ void roadgps_start_error (const char *text) {
+    roadmap_messagebox ("Error", text);
+ }
+ 
+ void roadgps_start_fatal (const char *text) {
+    roadmap_messagebox ("Fatal Error", text);
+ }
+ 
+ 
  static void roadgps_start_add_gps (RoadMapIO *io) {
  
***************
*** 219,222 ****
--- 229,235 ----
  #endif
  
+    roadmap_log_redirect (ROADMAP_MESSAGE_ERROR, roadgps_start_error);
+    roadmap_log_redirect (ROADMAP_MESSAGE_FATAL, roadgps_start_fatal);
+ 
     roadmap_config_declare_enumeration
        ("preferences", &RoadMapConfigGeneralToolbar, "yes", "no", NULL);

[Roadmap-commit] roadmap/src roadmap_start.c,1.86,1.87

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3446

Modified Files:
	roadmap_start.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** roadmap_start.c	14 Nov 2005 07:17:02 -0000	1.86
--- roadmap_start.c	2 Dec 2005 21:37:33 -0000	1.87
***************
*** 679,682 ****
--- 679,691 ----
  
  
+ void roadmap_start_error (const char *text) {
+    roadmap_messagebox ("Error", text);
+ }
+ 
+ void roadmap_start_fatal (const char *text) {
+    roadmap_messagebox ("Fatal Error", text);
+ }
+ 
+ 
  static void roadmap_start_periodic (void) {
  
***************
*** 842,845 ****
--- 851,857 ----
  #endif
  
+    roadmap_log_redirect (ROADMAP_MESSAGE_ERROR, roadmap_start_error);
+    roadmap_log_redirect (ROADMAP_MESSAGE_FATAL, roadmap_start_fatal);
+ 
     roadmap_config_initialize ();
  

[Roadmap-commit] roadmap/src roadmap.h,1.17,1.18

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3306

Modified Files:
	roadmap.h 
Log Message:
Error messages to be displayed in a message box

Index: roadmap.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** roadmap.h	4 Nov 2005 18:55:28 -0000	1.17
--- roadmap.h	2 Dec 2005 21:36:47 -0000	1.18
***************
*** 58,61 ****
--- 58,67 ----
              roadmap_check_allocated_with_source_line(__FILE__,__LINE__,p)
  
+ typedef void (* RoadMapLogRedirect) (const char *message);
+ 
+ RoadMapLogRedirect roadmap_log_redirect (int level,
+                                          RoadMapLogRedirect redirect);
+ 
+ 
  #define ROADMAP_SHOW_AREA        1
  #define ROADMAP_SHOW_SQUARE      2

[Roadmap-commit] roadmap/src roadmap_log.c,1.12,1.13

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193

Modified Files:
	roadmap_log.c 
Log Message:
Error messages to be displayed in a message box

Index: roadmap_log.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_log.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** roadmap_log.c	4 Nov 2005 18:54:59 -0000	1.12
--- roadmap_log.c	2 Dec 2005 21:36:16 -0000	1.13
***************
*** 34,37 ****
--- 34,38 ----
  
  #include <stdio.h>
+ #include <ctype.h>
  #include <stdlib.h>
  #include <string.h>
***************
*** 49,52 ****
--- 50,54 ----
  
  static struct roadmap_message_descriptor {
+ 
     int   level;
     int   show_stack;
***************
*** 54,67 ****
     int   do_exit;
     char *prefix;
  } RoadMapMessageHead [] = {
!    {ROADMAP_MESSAGE_DEBUG,   0, 0, 0, "++"},
!    {ROADMAP_MESSAGE_INFO,    0, 0, 0, "--"},
!    {ROADMAP_MESSAGE_WARNING, 0, 0, 0, "=="},
!    {ROADMAP_MESSAGE_ERROR,   1, 1, 0, "**"},
!    {ROADMAP_MESSAGE_FATAL,   1, 1, 1, "##"},
!    {0,                       1, 1, 1, "??"}
  };
  
  
  void roadmap_log_push (const char *description) {
  
--- 56,86 ----
     int   do_exit;
     char *prefix;
+ 
+    RoadMapLogRedirect redirect;
+ 
  } RoadMapMessageHead [] = {
!    {ROADMAP_MESSAGE_DEBUG,   0, 0, 0, "++", NULL},
!    {ROADMAP_MESSAGE_INFO,    0, 0, 0, "--", NULL},
!    {ROADMAP_MESSAGE_WARNING, 0, 0, 0, "==", NULL},
!    {ROADMAP_MESSAGE_ERROR,   1, 1, 0, "**", NULL},
!    {ROADMAP_MESSAGE_FATAL,   1, 1, 1, "##", NULL},
!    {0,                       1, 1, 1, "??", NULL}
  };
  
  
+ static void roadmap_log_noredirect (const char *message) {}
+ 
+ 
+ static struct roadmap_message_descriptor *roadmap_log_find (int level) {
+ 
+    struct roadmap_message_descriptor *category;
+ 
+    for (category = RoadMapMessageHead; category->level != 0; ++category) {
+       if (category->level == level) break;
+    }
+    return category;
+ }
+ 
+ 
  void roadmap_log_push (const char *description) {
  
***************
*** 137,140 ****
--- 156,175 ----
  }
  
+ static void roadmap_redirect_one (struct roadmap_message_descriptor *category,
+                                   char *format,
+                                   va_list ap) {
+ 
+    char message[1024];
+ 
+    if (category->redirect != NULL) {
+ 
+       vsnprintf(message, sizeof(message)-1, format, ap);
+       message[0] = toupper(message[0]);
+ 
+       category->redirect (message);
+    }
+ }
+ 
+ 
  void roadmap_log (int level, char *source, int line, char *format, ...) {
  
***************
*** 161,167 ****
     }
  
!    for (category = RoadMapMessageHead; category->level != 0; ++category) {
!       if (category->level == level) break;
!    }
  
     va_start(ap, format);
--- 196,200 ----
     }
  
!    category = roadmap_log_find (level);
  
     va_start(ap, format);
***************
*** 186,189 ****
--- 219,223 ----
  
     roadmap_log_one (category, stderr, saved, source, line, format, ap);
+    roadmap_redirect_one (category, format, ap);
  
     va_end(ap);
***************
*** 206,207 ****
--- 240,260 ----
      }
  }
+ 
+ 
+ RoadMapLogRedirect roadmap_log_redirect (int level,
+                                          RoadMapLogRedirect redirect) {
+ 
+    RoadMapLogRedirect old;
+    struct roadmap_message_descriptor *category;
+ 
+ 
+    category = roadmap_log_find (level);
+ 
+    old = category->redirect;
+    category->redirect = redirect;
+ 
+    if (old == NULL) old = roadmap_log_noredirect;
+ 
+    return old;
+ }
+ 

[Roadmap-commit] roadmap/src/default All,NONE,1.1

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25748

Added Files:
	All 
Log Message:
Checking in preliminary changes for the new map format

--- NEW FILE: All ---
Class.Name: All
Class.Lines: Freeways Ramps Highways Streets Trails Rivers Shore
Class.Polygons: Lakes Sea Parks Hospitals Airports Stations Malls
Freeways.Color: black
Freeways.Color1: IndianRed
Freeways.Delta1: -2
Freeways.Color2: black
Freeways.Delta2: 1
Freeways.Declutter: 2147483647
Freeways.Thickness: 6
Ramps.Color: black
Ramps.Color1: red
Ramps.Delta1: -2
Ramps.Declutter: 160
Ramps.Thickness: 3
Highways.Color: black
Highways.Color1: yellow
Highways.Delta1: -2
Highways.Declutter: 1300
Highways.Thickness: 3
Streets.Color: black
Streets.Color1: white
Streets.Delta1: -2
Streets.Declutter: 160
Streets.Thickness: 2
Trails.Color: DarkGrey
Trails.Declutter: 160
Trails.Thickness: 1
Rivers.Color: LightBlue
Rivers.Declutter: 300
Rivers.Thickness: 3
Shore.Color: LightSlateBlue
Shore.Declutter: 2147483647
Shore.Thickness: 2
Hospitals.Color: red
Hospitals.Declutter: 4096
Hospitals.Thickness: 1
Malls.Color: yellow
Malls.Declutter: 4096
Malls.Thickness: 1
Airports.Color: grey
Airports.Declutter: 4096
Airports.Thickness: 1
Stations.Color: grey
Stations.Declutter: 4096
Stations.Thickness: 1
Lakes.Color: LightBlue
Lakes.Declutter: 1300
Lakes.Thickness: 1
Parks.Color: green
Parks.Declutter: 4096
Parks.Thickness: 1
Sea.Color: SlateBlue
Sea.Declutter: 2147483647
Sea.Thickness: 1

[Roadmap-commit] roadmap/src/default - New directory

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25225/default

Log Message:
Directory /cvsroot/roadmap/roadmap/src/default added to the repository

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libroadmap libroadmap.vcp,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4531

Modified Files:
	libroadmap.vcp 
Log Message:
Added some files.

Index: libroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** libroadmap.vcp	28 Nov 2005 19:36:35 -0000	1.2
--- libroadmap.vcp	1 Dec 2005 16:53:07 -0000	1.3
***************
*** 105,109 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../wince_os/" /I "../../" /I "l:\shared\roadmap_merged\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 105,109 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../wince_os/" /I "../../" /I "l:\shared\roadmap_editor\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
[...1189 lines suppressed...]
*** 6223,6226 ****
--- 6430,6434 ----
  	"..\..\..\roadmap_locator.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_shape.h"\
  	"..\..\..\roadmap_square.h"\
***************
*** 6229,6238 ****
  	"..\..\roadmap_win32.h"\
  	
- NODEP_CPP_ROADMAP_ST=\
- 	"..\..\..\editor\editor_dictionary.h"\
- 	"..\..\..\editor\editor_line.h"\
- 	"..\..\..\editor\editor_override.h"\
- 	"..\..\..\editor\editor_street.h"\
- 	
  
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
--- 6437,6440 ----

[Roadmap-commit] roadmap_editor/src/win32 session,NONE,1.1 install.inf,1.3,1.4 preferences,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4096

Modified Files:
	install.inf preferences 
Added Files:
	session 
Log Message:
Update installation package.

Index: install.inf
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/install.inf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install.inf	28 Nov 2005 19:36:35 -0000	1.3
--- install.inf	1 Dec 2005 16:51:38 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
  drivers = 1
  preferences = 5
+ session = 5
  roadmap.toolbar = 5
  schema = 1
***************
*** 56,59 ****
--- 57,61 ----
  drivers,,,0x00000010
  preferences,,,0x00000010
+ session,,,0x00000010
  roadmap.toolbar,,,0x00000010
  schema,,,0x00000010

--- NEW FILE: session ---
Voice.Mute: no
Navigation.Enable: yes
Delta.Rotate: 0
Delta.Y: 44
Delta.X: 20
Focus.Rotate: 1
Focus.Name: Hold
Trip.Name: default
Hold.Direction: 0
Hold.Position: 34794810,32106010
Selection.Position: 34794810, 32106010
Address.Position: 34794810, 32106010
GPS.Direction: 0
GPS.Position: 34794810, 32106010
General.Zoom: 19378

Index: preferences
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/preferences,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** preferences	28 Nov 2005 19:36:35 -0000	1.3
--- preferences	1 Dec 2005 16:51:38 -0000	1.4
***************
*** 1,24 ****
! Destination.Color: red
! Download.Destination: \Storage Card\Roadmap\maps
! Map.Cache: 8
! Map.Background: LightYellow
! General.Default Zoom: 20
! General.Keyboard: no
! General.Icons: yes
! General.Toolbar: yes
! General.Unit: imperial
! GPS.Background: LightYellow
! GPS.Baud Rate: 4800
! GPS.Color: red
! GPS.Foreground: black
! GPS.Source: com1:
! GPS.Timeout: 10
! Help.Arguments: %s
! Help.Browser: \windows\iexplore
! Highlight.Background: yellow
! Highlight.Duration: 10
! Highlight.Thickness: 4
! Location.Color: red
! Polygons.Declutter: 1300
! Shapes.Declutter: 1300
! Display.Rotate: yes
--- 1,68 ----
! Style.Use Pretty Lines: yes
! Shapes.Declutter: 1300
! Polygons.Declutter: 1300
! Location.Color: red
! Highlight.Thickness: 4
! Highlight.Duration: 10
! Highlight.Background: yellow
! Help.Browser: \windows\iexplore
! Help.Arguments: %s
! GPS.Foreground: black
! GPS.Color: red
! GPS.Background: LightYellow
! Destination.Color: red
! Drivers.Trace: Disabled
! Drivers.Kismet: Disabled
! Drivers.Friends: Disabled
! Drivers.Ghost2: Disabled
! Drivers.Ghost1: Disabled
! Drivers.Port: 2007
! Map.GPS map offset longitude: 0
! Map.GPS map offset latitude: 0
! Download.Destination: \Storage Card\Roadmap\maps
! Download.Source: /usr/local/share/roadmap/usc%05d.rdm
! History.Depth: 100
! GPS.Timeout: 10
! GPS.Baud Rate: 4800
! GPS.Source: com1:
! Accuracy.GPS Position: 30
! Accuracy.GPS Speed: 4
! Voice.Selected Street: flite -t 'Selected %T'
! Voice.Next Intersection: flite -t 'Next intersection: %T'
! Voice.Current Street: 
! Voice.Approach: flite -t 'Approaching %T'
! Error.Foreground: white
! Error.Background: red
! Info.Foreground: black
! Info.Background: yellow
! Selected Street.Foreground: black
! Selected Street.Background: yellow
! Selected Street.Text: %F
! Approach.Foreground: white
! Approach.Background: DarkSeaGreen4
! Approach.Text: מתקרב ל-%N, %C|מתקרב ל- %N
! Current Street.Foreground: white
! Current Street.Background: DarkSeaGreen4
! Current Street.Text: %N, %C|%N
! Console.Foreground: black
! Console.Background: yellow
! Display.Top Right: ETA: %A|%T
! Display.Bottom Left: %S
! Display.Bottom Right: %D (%W)|%D
! Display.Duration: 10
! Accuracy.Confidence: 250
! Accuracy.Street: 35
! Style.Show Objects when Dragging: yes
! Style.Pretty Lines when Dragging: yes
! Map.Refresh: normal
! Map.Signs: yes
! Map.Background: LightYellow
! Accuracy.Mouse: 20
! Display.Rotate: yes
! General.Default Zoom: 20
! Map.Cache: 8
! General.Icons: yes
! General.Toolbar: yes
! Geometry.Main: 800x600
! General.Keyboard: no
! General.Unit: metric

[Roadmap-commit] roadmap_editor/src roadmap_start.c,1.5,1.6

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3872

Modified Files:
	roadmap_start.c 
Log Message:
Add plugin version details in About box.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_start.c	1 Dec 2005 12:29:26 -0000	1.5
--- roadmap_start.c	1 Dec 2005 16:50:37 -0000	1.6
***************
*** 149,153 ****
                         "<pas...@in...>\n"
                         "A Street navigation system\n"
!                        "for Linux & UNIX");
  }
  
--- 149,156 ----
                         "<pas...@in...>\n"
                         "A Street navigation system\n"
!                        "for Linux & UNIX"
! 		       "\n\nEditor Plugin 0.2\n"
! 		       "Ehud Shabtai\n"
! 		       "esh...@gm...");
  }
  

[Roadmap-commit] roadmap_editor/src roadmap_metadata.c,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3699

Modified Files:
	roadmap_metadata.c 
Log Message:
Check for NULL pointer.

Index: roadmap_metadata.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_metadata.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_metadata.c	1 Dec 2005 12:24:15 -0000	1.1
--- roadmap_metadata.c	1 Dec 2005 16:50:03 -0000	1.2
***************
*** 138,147 ****
                                              const char *name) {
  
!    int i;
!    RoadMapString coded_category =
        roadmap_dictionary_locate
           (RoadMapMetadataActive->RoadMapAttributeStrings, category);
  
!    RoadMapString coded_name =
        roadmap_dictionary_locate
           (RoadMapMetadataActive->RoadMapAttributeStrings, name);
--- 138,153 ----
                                              const char *name) {
  
!    int i;
! 
!    RoadMapString coded_category;
!    RoadMapString coded_name;
! 
!    if (RoadMapMetadataActive == NULL) return "";
! 
!    coded_category =
        roadmap_dictionary_locate
           (RoadMapMetadataActive->RoadMapAttributeStrings, category);
  
!    coded_name =
        roadmap_dictionary_locate
           (RoadMapMetadataActive->RoadMapAttributeStrings, name);