Changeset 201:879e47e5b731 in glemon-0.x for mapselector.h

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3431

Message:

Merge branches/akos to trunk.

File:

• mapselector.h (modified) (6 diffs)

mapselector.h

@@ -23 +23 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
+#include "map_value.h"
 
 ///A widget by which node and edgemaps can be selected, deselected and created.
@@ -81 +82 @@
   ///By pressing it
   ///\ref NewMapWin wilol pop-up
-  Gtk::Button * newbut;
+  Gtk::Button newbut;
 
   ///Reset button.
@@ -89 +90 @@
   ///
   ///It is visible only if \ref def is true.
-  Gtk::Button * defbut;
-
-  ///Container in which GUI elements are packed.
-  Gtk::HBox hbox;
+  Gtk::Button defbut;
 
   ///Shows purpose of \ref MapSelector piece.
-  Gtk::Label * label;
+  Gtk::Label label;
+
+  /// Which types of maps (integer, string, ...) to display.
+  MapType map_type;
 
  public:
@@ -102 +103 @@
 
   ///Creates the layout and binds signal to the correct place.
-  ///\param optionlist list of names to place in \ref cbt
+  ///\param mapstorage Pointer to the \ref MapStorage to get the map list from.
   ///\param act preselected option
   ///\param purpose text of label indicating purpose of \ref MapStorage
   ///\param itisedge do \ref MapSelector contains edgemap names or nodemapnames.
   ///\param def do we need 'Default' option. See \ref def.
-  MapSelector(std::vector<std::string> optionlist, std::string act, std::string purpose, bool itisedge, bool def=true);
+  ///\param type Specifies which types of maps to display.
+  MapSelector(std::vector<std::string> n_ml,
+      std::vector<std::string> s_ml, std::string act, std::string labeltext,
+      bool edge, bool d = true, MapType type = ALL);
 
   ///Returns signal emitted if the user has changed the selection. (\ref signal_cbt)
@@ -120 +124 @@
   ///into account that the previously selected option
   ///has to be set back after the operation.
-  void update_list( std::vector<std::string> );
+  void update_list(std::vector<std::string> n_ml,
+      std::vector<std::string> s_ml);
 
   ///Handles changement in \ref cbt.
@@ -169 +174 @@
   ///this function  will set \ref cbt to the new option.
   ///\param new_option new option to append
-  void append_text(Glib::ustring new_option);
+  void append_text(Glib::ustring new_option, MapValue::Type);
 };
 #endif //MAPSELECTOR_H