1.1 --- a/main_win.cc Tue Jul 26 18:14:23 2005 +0000
1.2 +++ b/main_win.cc Tue Jul 26 21:19:41 2005 +0000
1.3 @@ -1,8 +1,12 @@
1.4 #include <main_win.h>
1.5
1.6 MainWin::MainWin(const std::string& title, Graph & graph, CoordinatesMap & cm,
1.7 - MapStorage & ms):mapwin("Map Setup", ms, gd_canvas),editwin("Editorial Window", gd_canvas),gd_canvas(graph, cm, ms, &mapwin)
1.8 + 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)
1.9 {
1.10 + //Creating a window for setting new maps.
1.11 +// newmapwin=new NewMapWi("Creating new map",*this);
1.12 +
1.13 +
1.14 set_title (title);
1.15 set_default_size(WIN_WIDTH,WIN_HEIGHT);
1.16 add(vbox);
1.17 @@ -49,10 +53,8 @@
1.18 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 4) );
1.19 ag->add( Gtk::Action::create("EditNodeMap", Gtk::Stock::PREFERENCES),
1.20 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 5) );
1.21 - ag->add( Gtk::Action::create("AddEdgeMap", Gtk::Stock::NEW),
1.22 - sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::addNewEdgeMap ) );
1.23 - ag->add( Gtk::Action::create("AddNodeMap", Gtk::Stock::NEW),
1.24 - sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::addNewNodeMap ) );
1.25 + ag->add( Gtk::Action::create("AddMap", Gtk::Stock::NEW),
1.26 + sigc::mem_fun ( this->newmapwin, &NewMapWin::show ) );
1.27
1.28 uim=Gtk::UIManager::create();
1.29 uim->insert_action_group(ag);
1.30 @@ -98,8 +100,7 @@
1.31 " <toolitem action='MoveItem' />"
1.32 " <toolitem action='EditEdgeMap' />"
1.33 " <toolitem action='EditNodeMap' />"
1.34 - " <toolitem action='AddEdgeMap' />"
1.35 - " <toolitem action='AddNodeMap' />"
1.36 + " <toolitem action='AddMap' />"
1.37 " </toolbar>"
1.38 "</ui>";
1.39