Changeset 82:ee009c0f4bcf in glemon-0.x

Timestamp:

10/21/05 15:32:12 (19 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

MapSelector? widget is able to pop up NewMap? window. At the moment I hope MapSelector? widget is done.

Files:

• main_win.cc (modified) (1 diff)
• main_win.h (modified) (1 diff)
• map_win.cc (modified) (4 diffs)
• map_win.h (modified) (3 diffs)
• mapselector.cc (modified) (2 diffs)
• mapselector.h (modified) (3 diffs)

main_win.cc

@@ -3 +3 @@
 
 MainWin::MainWin() :
-  mapwin("Map Setup", mapstorage, gd_canvas),
-  newmapwin("Creating new map", gd_canvas), gd_canvas(mapstorage, mapwin, (Gtk::Window *)this)
+  newmapwin("Creating new map", gd_canvas),
+  mapwin("Map Setup", mapstorage, gd_canvas, newmapwin),
+  gd_canvas(mapstorage, mapwin, (Gtk::Window *)this)
 {
   set_title ("unsaved file - " + prog_name);

main_win.h

@@ -26 +26 @@
 
 protected:
+  ///We need to store newmapwin, to be able to set the appropriate values for properties of new map.
+  NewMapWin newmapwin;
+
   ///Window of map-showing setup. Its type is \ref MapWin
   MapWin mapwin;
-
-  ///We need to store newmapwin, to be able to set the appropriate values for properties of new map.
-  NewMapWin newmapwin;
 
   ///The graph will be drawn on this \ref GraphDisplayerCanvas

map_win.cc

@@ -11 +11 @@
 }
 
-MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
+MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc, NewMapWin & newmapwin):gdc(grdispc),ms(mapst), nmw(newmapwin)
 {
   set_title(title);
@@ -24 +24 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(gdc, ms, *this, i, true);
+    e_combo_array[i]=new MapSelector(gdc, ms, nmw, i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -41 +41 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(gdc, ms, *this, i, false);
+    n_combo_array[i]=new MapSelector(gdc, ms, nmw, i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -102 +102 @@
   {
     //filling in combo box with choices
-    e_combo_array[i]->append_text((Glib::ustring)newmapname);
+    n_combo_array[i]->append_text((Glib::ustring)newmapname);
   }
   //setting text property for the new map

map_win.h

@@ -9 +9 @@
 #include "graph_displayer_canvas.h"
 #include "mapstorage.h"
+#include "new_map_win.h"
 #include "mapselector.h"
 #include <libgnomecanvasmm.h>
@@ -28 +29 @@
   MapStorage & ms;
 
+  NewMapWin & nmw;
+
   Gtk::Table * table;
   
@@ -38 +41 @@
 public:
   ///Constructor of MapWin creates the widgets shown in MapWin.
-  MapWin(const std::string& title, MapStorage &, GraphDisplayerCanvas &);
+  MapWin(const std::string& title, MapStorage &, GraphDisplayerCanvas &, NewMapWin &);
 
   ///This function is created to set the appropriate maps on the newly created node

mapselector.cc

@@ -1 +1 @@
 #include "mapselector.h"
 
-MapSelector::MapSelector(GraphDisplayerCanvas & grdispc, MapStorage & mapst, MapWin & mapw, int identifier, bool edge):gdc(grdispc),ms(mapst),mw(mapw),id(identifier),itisedge(edge),default_state(true),node_to_update(INVALID),edge_to_update(INVALID)
+MapSelector::MapSelector(GraphDisplayerCanvas & grdispc, MapStorage & mapst, NewMapWin & newmapw, int identifier, bool edge):gdc(grdispc),ms(mapst),nmw(newmapw),id(identifier),itisedge(edge),default_state(true),node_to_update(INVALID),edge_to_update(INVALID)
 {
   update_list();
@@ -34 +34 @@
 
   newbut=new Gtk::Button(Gtk::Stock::NEW);
+
+  newbut->signal_pressed().connect
+    (
+     sigc::mem_fun(nmw, &NewMapWin::show)
+     );
 
   add(*label);

mapselector.h

@@ -8 +8 @@
 #include "all_include.h"
 #include "mapstorage.h"
-#include "map_win.h"
+#include "new_map_win.h"
 #include "graph_displayer_canvas.h"
 #include <libgnomecanvasmm.h>
@@ -19 +19 @@
   ///The \ref MapStorage in which the visualizable maps are stored
   MapStorage & ms;
-  MapWin & mw;
+  NewMapWin & nmw;
 
   int id;
@@ -41 +41 @@
 public:
 
-  MapSelector(GraphDisplayerCanvas &, MapStorage &, MapWin &, int, bool);
+  MapSelector(GraphDisplayerCanvas &, MapStorage &, NewMapWin &, int, bool);
 
   void update_list();