X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fzoneproperties.cpp;h=5f971b920a1596c37a41e854b29cb1859e3969bf;hb=d990c03a06a494ce3596862ce61e2a5684dea7e1;hp=b1380c5d25f779de3ee627ea4225c2843995ae17;hpb=9ee88e5028953444d363047b8aab179b833a3e4a;p=r2c2.git

diff --git a/source/designer/zoneproperties.cpp b/source/designer/zoneproperties.cpp
index b1380c5..5f971b9 100644
--- a/source/designer/zoneproperties.cpp
+++ b/source/designer/zoneproperties.cpp
@@ -44,20 +44,24 @@ ZoneProperties::ZoneProperties(Zone &z):
 
 		add(*(drp_qualifier = new GLtk::Dropdown));
 		GLtk::ListDataStore<string> &data = dynamic_cast<GLtk::ListDataStore<string> &>(drp_qualifier->get_data());
-		const char *qualifiers[] = { "track", "platform", "siding", 0 };
+		const char *qualifiers[] = { "(none)", "track", "platform", "siding", 0 };
 		for(unsigned i=0; qualifiers[i]; ++i)
 		{
 			data.append(qualifiers[i]);
 			if(zone.get_qualifier()==qualifiers[i])
 				drp_qualifier->set_selected_index(i);
 		}
+
+		if(zone.get_qualifier().empty())
+			drp_qualifier->set_selected_index(0);
 	}
 
 	{
 		GLtk::Row row(*layout);
 		add(*(lbl1 = new GLtk::Label("Number")));
 		layout->add_constraint(*lbl1, GLtk::Layout::COPY_WIDTH, *lbl2);
-		add(*(ent_number = new GLtk::Entry(lexical_cast<string>(zone.get_number()))));
+		unsigned n = zone.get_number();
+		add(*(ent_number = new GLtk::Entry(n ? lexical_cast<string>(zone.get_number()) : string())));
 		ent_number->set_edit_size(4, 1);
 	}
 
@@ -117,9 +121,14 @@ void ZoneProperties::on_response(int code)
 	{
 		string qualifier;
 		int sel = drp_qualifier->get_selected_index();
-		if(sel>=0)
+		if(sel>0)
 			qualifier = drp_qualifier->get_data().get_string(sel);
-		unsigned number = lexical_cast<unsigned>(ent_number->get_text());
+
+		unsigned number = 0;
+		string num_str = ent_number->get_text();
+		if(!num_str.empty())
+			number = lexical_cast<unsigned>(ent_number->get_text());
+
 		zone.set_name(ent_group->get_text(), qualifier, number);
 
 		sel = drp_up_direction->get_selected_index();