Changeset 1737:dc821d2668c1 in lemon-0.x for gui

Timestamp:

10/24/05 12:15:40 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Newly created map is realized by the property givening by common sense.

Location:

gui

Files:

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

gui/map_win.cc

@@ -93 +93 @@
     e_combo_array[i]->append_text((Glib::ustring)newmapname);
   }
-  //setting text property for the new map
-  e_combo_array[N_TEXT]->set_active_text((Glib::ustring)newmapname);
 }
 
@@ -104 +102 @@
     n_combo_array[i]->append_text((Glib::ustring)newmapname);
   }
-  //setting text property for the new map
-  n_combo_array[N_TEXT]->set_active_text((Glib::ustring)newmapname);
 }

gui/mapselector.cc

@@ -1 +1 @@
 #include "mapselector.h"
 
-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)
+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),set_new_map(false),node_to_update(INVALID),edge_to_update(INVALID)
 {
   update_list();
@@ -37 +37 @@
   newbut->signal_pressed().connect
     (
-     sigc::mem_fun(nmw, &NewMapWin::show)
+     sigc::mem_fun(*this, &MapSelector::new_but_pressed)
      );
 
@@ -46 +46 @@
   add(*defbut);
   add(*newbut);
+}
+
+void MapSelector::new_but_pressed()
+{
+  set_new_map=true;
+  nmw.showByPreChoose(itisedge);
 }
 
@@ -212 +218 @@
 {
   cbt.append_text(text);
-}
+  if(set_new_map)
+    {
+      set_active_text(text);
+      set_new_map=false;
+    }
+}

gui/mapselector.h

@@ -27 +27 @@
   bool default_state;
 
+  bool set_new_map;
+
   Gtk::ComboBoxText cbt;
 
@@ -51 +53 @@
   virtual void comboChanged();
 
+  virtual void new_but_pressed();
+
   virtual void reset();
 

gui/new_map_win.cc

@@ -61 +61 @@
 }
 
+void NewMapWin::showByPreChoose(bool itisedge)
+{
+  if(itisedge)
+    {
+      edge.set_active();
+    }
+  else
+    {
+      node.set_active();
+    }
+  node.hide();
+  edge.hide();
+  show();
+}
+
 void NewMapWin::buttonPressed()
 {
@@ -103 +118 @@
           name.set_text("");
           default_value.set_text("0");
+          edge.show();
+          node.show();
           hide();
         }

gui/new_map_win.h

@@ -33 +33 @@
   virtual void buttonPressed();
 
+  virtual void showByPreChoose(bool);
+
   virtual bool closeIfEscapeIsPressed(GdkEventKey*);