Changeset 95:628c0b383d2f in glemon-0.x for main_win.cc

Timestamp:

11/30/05 14:24:23 (18 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk/gui@2391

Message:

MapWin? is created and disposed from now instead of being show and hide.

File:

• main_win.cc (modified) (7 diffs)

main_win.cc

@@ -2 +2 @@
 #include "icons/guipixbufs.h"
 
-MainWin::MainWin()
-{
-  mapwin=new MapWin("Map Setup", mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
+MainWin::MainWin():mapwinexists(false)
+{
   gd_canvas=new GraphDisplayerCanvas(*this);
 
@@ -106 +105 @@
   ag->add( Gtk::Action::create("ShowMenu", "_Show") );
   ag->add( Gtk::Action::create("ShowMaps", "_Maps"),
-      sigc::mem_fun(*(this->mapwin), &MapWin::show));
+           sigc::mem_fun(*this, &MainWin::createMapWin));
 
   Gtk::RadioAction::Group tool_group;
@@ -213 +212 @@
   mapstorage.modified = false;
   gd_canvas->drawGraph();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title(Glib::filename_display_basename(file) + " - " + prog_name);
 }
@@ -239 +241 @@
   gd_canvas->clear();
   mapstorage.clear();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title("unsaved file - " + prog_name);
 }
@@ -276 +281 @@
       mapstorage.modified = false;
       gd_canvas->drawGraph();
-      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+      if(mapwinexists)
+        {
+          mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+        }
       set_title(Glib::filename_display_basename(filename) + " - " + prog_name);
     }
@@ -333 +341 @@
   gd_canvas->clear();
   mapstorage.clear();
-  mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+    }
   set_title("unsaved file - " + prog_name);
 }
@@ -360 +371 @@
 void MainWin::registerNewEdgeMap(std::string mapname)
 {
-  mapwin->registerNewEdgeMap(mapname);
+  if(mapwinexists)
+    {
+      mapwin->registerNewEdgeMap(mapname);
+    }
 }
 
 void MainWin::registerNewNodeMap(std::string mapname)
 {
-  mapwin->registerNewNodeMap(mapname);
-}
+  if(mapwinexists)
+    {
+      mapwin->registerNewNodeMap(mapname);
+    }
+}
+
+void MainWin::createMapWin()
+{
+  if(!mapwinexists)
+    {
+      mapwin=new MapWin("Map Setup", mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
+      mapwin->show();
+      mapwinexists=true;
+    }
+}
+
+void MainWin::closeMapWin()
+{
+  mapwinexists=false;
+  delete mapwin;
+}