steffen
/
spOSMroute
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adding screens..

Browse Source
master
steffen 13 years ago
parent ec415d7a9f
commit beb62b5b03
5 changed files with 129 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
main/Makefile
Unescape View File

@ -3,7 +3,7 @@ include ../Makefile.rules
OBJBASE = favorites.o main.o OBJBASE = favorites.o main.o
ifeq "$(GTKVERSION)" "1" ifeq "$(GTKVERSION)" "1"
GTK = linux_gps.o gps.o routing.o gui_buttons.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o GTK = linux_gps.o gps.o routing.o gui_selectdir.o gui_config.o gui_buttons.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o
endif endif
ifeq "$(NCURSESVERSION)" "1" ifeq "$(NCURSESVERSION)" "1"
@ -11,15 +11,15 @@ CURSES = ncurses_main.o
endif endif
ifeq "$(WINVERSION)" "1" ifeq "$(WINVERSION)" "1"
WIN = gps.o routing.o gui_buttons.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o WIN = gps.o routing.o gui_buttons.o gui_config.o gui_selectdir.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o
endif endif
ifeq "$(WINCEVERSION)" "1" ifeq "$(WINCEVERSION)" "1"
WIN = gps.o routing.o gui_buttons.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o WIN = gps.o routing.o gui_buttons.o gui_config.o gui_favorites.o gui_selectdir.o gui_mainmenu.o gui_search.o guiw_gpsfile.o
endif endif
ifeq "$(SDLGLVERSION)" "1" ifeq "$(SDLGLVERSION)" "1"
SDLGL = linux_gps.o gps.o routing.o gui_buttons.o gui_favorites.o gui_mainmenu.o gui_search.o guiw_gpsfile.o SDLGL = linux_gps.o gps.o routing.o gui_config.o gui_buttons.o gui_favorites.o gui_selectdir.o gui_mainmenu.o gui_search.o guiw_gpsfile.o
endif endif

44
main/gui_config.c
Unescape View File

@ -0,0 +1,44 @@
/* %Id: Exp $ */
/***************************************************************************
* gui_config.c
*
* Copyright (C) 2013 Steffen Pohle
* steffen@gulpe.de
****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* main.c is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "osmroute.h"
#include "draw.h"
#include "gui.h"
#include "system.h"
void gui_config_close ();
GUIWindow wcfg = {0};
void gui_config_show () {
if (wcfg.screen == NULL) gui_window_new (&wcfg, 220, 240, _("Config"));
wcfg.callback_close = (void*)gui_config_close;
wcfg.screen_changed = 1;
wcfg.style = WGUI_S_VCENTER | WGUI_S_HCENTER;
};
void gui_config_close () {
gui_close ();
};

13
main/gui_favorites.c
Unescape View File

@ -51,7 +51,6 @@ int fl_array_cnt = 0;
static GUIWindow wfav = {0}; static GUIWindow wfav = {0};
void gui_fav_close () { void gui_fav_close () {
gui_close (); gui_close ();
}; };
@ -144,37 +143,37 @@ void gui_fav_show () {
if (favbtn_close == NULL) { if (favbtn_close == NULL) {
favbtn_close = gui_button_new (_("Close"), 5, 210, 60, 20); favbtn_close = gui_button_new (_("Close"), 5, 210, 60, 20);
favbtn_close->callback_clicked = (void*)gui_fav_close; favbtn_close->callback_clicked = (void*)gui_fav_close;
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_close);
} }
if (favbtn_add == NULL) { if (favbtn_add == NULL) {
favbtn_add = gui_button_new (_("Add"), 5, 15, 60, 20); favbtn_add = gui_button_new (_("Add"), 5, 15, 60, 20);
favbtn_add->callback_clicked = (void*)gui_fav_add; favbtn_add->callback_clicked = (void*)gui_fav_add;
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_add);
} }
if (favbtn_del == NULL) { if (favbtn_del == NULL) {
favbtn_del = gui_button_new (_("Del"), 70, 15, 60, 20); favbtn_del = gui_button_new (_("Del"), 70, 15, 60, 20);
favbtn_del->callback_clicked = (void*)gui_fav_ren; favbtn_del->callback_clicked = (void*)gui_fav_ren;
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_del);
} }
if (favbtn_ren == NULL) { if (favbtn_ren == NULL) {
favbtn_ren = gui_button_new (_("Ren"), 135, 15, 60, 20); favbtn_ren = gui_button_new (_("Ren"), 135, 15, 60, 20);
favbtn_ren->callback_clicked = (void*)gui_fav_ren; favbtn_ren->callback_clicked = (void*)gui_fav_ren;
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_ren);
} }
if (favlist == NULL) { if (favlist == NULL) {
favlist = gui_list_new (5, 45, 210, 130); favlist = gui_list_new (5, 45, 210, 130);
favlist->callback_selectitem = (void*)gui_fav_selitem; favlist->callback_selectitem = (void*)gui_fav_selitem;
gui_window_item_add (&wfav, GUI_LIST, favlist);
} }
if (faventry_name == NULL) { if (faventry_name == NULL) {
faventry_name = gui_entry_new (NULL, 5, 180, 210, 20); faventry_name = gui_entry_new (NULL, 5, 180, 210, 20);
gui_window_item_add (&wfav, GUI_ENTRY, faventry_name);
} }
gui_window_item_add (&wfav, GUI_ENTRY, faventry_name);
gui_window_item_add (&wfav, GUI_LIST, favlist);
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_ren);
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_del);
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_add);
gui_window_item_add (&wfav, GUI_BUTTON, favbtn_close);
gui_fav_refresh (); gui_fav_refresh ();
gui_show (&wfav); gui_show (&wfav);

59
main/gui_mainmenu.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: gui_mainmenu.c,v 1.6 2013/02/24 12:42:14 steffen Exp $ */ /* $Id: gui_mainmenu.c,v 1.7 2013/02/24 15:25:57 steffen Exp $ */
/*************************************************************************** /***************************************************************************
* gui_mainmenu.c * gui_mainmenu.c
* *
@ -29,17 +29,17 @@
#include "routing.h" #include "routing.h"
void gui_mainmenu_close (); void gui_mainmenu_close ();
void gui_mainmenu_refresh ();
void gui_mainmenu_refreshidx ();
void gui_mainmenu_search (); void gui_mainmenu_search ();
void gui_mainmenu_quit (); void gui_mainmenu_quit ();
void gui_mainmenu_gps ();
void gui_mainmenu_map ();
void gui_mainmenu_routing (); void gui_mainmenu_routing ();
void gui_mainmenu_config (); void gui_mainmenu_config ();
GUIButton *mbtn_close = NULL; GUIButton *mbtn_close = NULL;
GUIButton *mbtn_quit = NULL; GUIButton *mbtn_quit = NULL;
GUIButton *mbtn_gps = NULL; GUIButton *mbtn_refreshidx = NULL;
GUIButton *mbtn_map= NULL; GUIButton *mbtn_refresh = NULL;
GUIButton *mbtn_search = NULL; GUIButton *mbtn_search = NULL;
GUIButton *mbtn_routing= NULL; GUIButton *mbtn_routing= NULL;
GUIButton *mbtn_config= NULL; GUIButton *mbtn_config= NULL;
@ -53,33 +53,39 @@ void gui_mainmenu_show () {
wmmenu.style = WGUI_S_VCENTER | WGUI_S_HCENTER; wmmenu.style = WGUI_S_VCENTER | WGUI_S_HCENTER;
/* add buttons */ /* add buttons */
if (mbtn_map == NULL) { if (mbtn_refresh == NULL) {
mbtn_map = gui_button_new (_("Map Settings"), 5, 30, 190, 20); mbtn_refresh = gui_button_new (_("Update Map"), 5, 30, 90, 20);
mbtn_map->callback_clicked = (void*)gui_mainmenu_close; mbtn_refresh->callback_clicked = (void*)gui_mainmenu_refresh;
} }
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_map); gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_refresh);
if (mbtn_refreshidx == NULL) {
mbtn_refreshidx = gui_button_new (_("Update Index"), 105, 30, 90, 20);
mbtn_refreshidx->callback_clicked = (void*)gui_mainmenu_refreshidx;
}
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_refreshidx);
if (mbtn_routing == NULL) { if (mbtn_routing == NULL) {
mbtn_routing = gui_button_new (_("Routing"), 5, 60, 190, 20); mbtn_routing = gui_button_new (_("Routing"), 5, 60, 190, 20);
mbtn_routing->callback_clicked = (void*)gui_mainmenu_close; mbtn_routing->callback_clicked = (void*)gui_mainmenu_routing;
} }
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_routing); gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_routing);
if (mbtn_gps == NULL) { if (mbtn_search == NULL) {
mbtn_gps = gui_button_new (_("GPS"), 5, 90, 190, 20); mbtn_search = gui_button_new (_("Search"), 5, 90, 190, 20);
mbtn_gps->callback_clicked = (void*)gui_mainmenu_close; mbtn_search->callback_clicked = (void*)gui_mainmenu_search;
} }
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_gps); gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_search);
if (mbtn_config == NULL) { if (mbtn_config == NULL) {
mbtn_config = gui_button_new (_("Config"), 5, 120, 130, 20); mbtn_config = gui_button_new (_("Config"), 5, 120, 130, 20);
mbtn_config->callback_clicked = (void*)gui_mainmenu_close; mbtn_config->callback_clicked = (void*)gui_mainmenu_config;
} }
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_config); gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_config);
if (mbtn_quit == NULL) { if (mbtn_quit == NULL) {
mbtn_quit = gui_button_new (_("Quit"), 145, 120, 50, 20); mbtn_quit = gui_button_new (_("Quit"), 145, 120, 50, 20);
mbtn_quit->callback_clicked = (void*)gui_mainmenu_close; mbtn_quit->callback_clicked = (void*)gui_mainmenu_quit;
} }
gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_quit); gui_window_item_add (&wmmenu, GUI_BUTTON, mbtn_quit);
@ -98,6 +104,14 @@ void gui_mainmenu_close () {
}; };
void gui_mainmenu_routing () {
};
void gui_mainmenu_config () {
};
void gui_mainmenu_search () { void gui_mainmenu_search () {
gui_close (); gui_close ();
gui_search_show (); gui_search_show ();
@ -124,19 +138,6 @@ void gui_mainmenu_setdest () {
}; };
void gui_mainmenu_gpsconfig () {
gui_close ();
#ifdef HAVE_WINAPI
gps_wince_settings ();
#else
#ifdef HAVE_GTK
gpssetting_wnd_show (main_wnd);
#endif
#endif
config_save ();
};
void gui_mainmenu_gpsstartstop () { void gui_mainmenu_gpsstartstop () {
gui_close (); gui_close ();
if (gps_isrunning () != 0) gps_stop (); if (gps_isrunning () != 0) gps_stop ();

45
main/gui_selectdir.c
Unescape View File

@ -0,0 +1,45 @@
/* %Id: Exp $ */
/***************************************************************************
* gui_selectdir.c
*
* Copyright (C) 2013 Steffen Pohle
* steffen@gulpe.de
****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* main.c is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "osmroute.h"
#include "draw.h"
#include "gui.h"
#include "system.h"
void gui_sdir_close ();
GUIWindow wsdir = {0};
char select_dir[LEN_FILENAME];
void gui_sdir_show () {
if (wsdir.screen == NULL) gui_window_new (&wsdir, 220, 240, _("Select Dir"));
wsdir.callback_close = (void*)gui_sdir_close;
wsdir.screen_changed = 1;
wsdir.style = WGUI_S_VCENTER | WGUI_S_HCENTER;
};
void gui_sdir_close () {
gui_close ();
};
Write Preview
Loading…
Cancel
Save