diff -r 03aa0a6c8dca -r 4708b716d2f4 gui/main_win.cc --- a/gui/main_win.cc Tue Jul 26 20:14:03 2005 +0000 +++ b/gui/main_win.cc Tue Jul 26 21:19:41 2005 +0000 @@ -1,8 +1,12 @@ #include MainWin::MainWin(const std::string& title, Graph & graph, CoordinatesMap & cm, - MapStorage & ms):mapwin("Map Setup", ms, gd_canvas),editwin("Editorial Window", gd_canvas),gd_canvas(graph, cm, ms, &mapwin) + MapStorage & ms):mapwin("Map Setup", ms, gd_canvas),editwin("Editorial Window", gd_canvas),newmapwin("Creating new map",gd_canvas),gd_canvas(graph, cm, ms, &mapwin) { + //Creating a window for setting new maps. +// newmapwin=new NewMapWi("Creating new map",*this); + + set_title (title); set_default_size(WIN_WIDTH,WIN_HEIGHT); add(vbox); @@ -49,10 +53,8 @@ sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 4) ); ag->add( Gtk::Action::create("EditNodeMap", Gtk::Stock::PREFERENCES), sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 5) ); - ag->add( Gtk::Action::create("AddEdgeMap", Gtk::Stock::NEW), - sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::addNewEdgeMap ) ); - ag->add( Gtk::Action::create("AddNodeMap", Gtk::Stock::NEW), - sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::addNewNodeMap ) ); + ag->add( Gtk::Action::create("AddMap", Gtk::Stock::NEW), + sigc::mem_fun ( this->newmapwin, &NewMapWin::show ) ); uim=Gtk::UIManager::create(); uim->insert_action_group(ag); @@ -98,8 +100,7 @@ " " " " " " - " " - " " + " " " " "";