X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainpanel.cpp;h=75024dcac300f1a7abc65e65ff7e8e0562c4104a;hb=1f9af43b6ab300693c044b431e95b25422b36507;hp=08af8cc0c2cccca519d8050c465d58addd52dd89;hpb=77f8c0e033b9b5e7085de5d22a62128a996a5b2a;p=r2c2.git

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 08af8cc..75024dc 100644
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -26,44 +26,44 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	engineer(e),
 	train(t)
 {
-	set_size(200, 170);
+	set_size(200, 175);
 
 	train.signal_control_changed.connect(sigc::mem_fun(this, &TrainPanel::train_control_changed));
 
 	add(*(lbl_addr=new GLtk::Label(res, format("%2d", train.get_address()))));
 	lbl_addr->set_style("digital");
-	lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-34, 35, 24));
+	lbl_addr->set_geometry(GLtk::Geometry(10, geom.h-30, 35, 20));
 
 	add(*(lbl_name=new GLtk::Label(res, train.get_name())));
 	lbl_name->set_style("digital");
-	lbl_name->set_geometry(GLtk::Geometry(45, geom.h-34, geom.w-55, 24));
+	lbl_name->set_geometry(GLtk::Geometry(50, geom.h-30, geom.w-55, 20));
 	train.signal_name_changed.connect(sigc::mem_fun(lbl_name, &GLtk::Label::set_text));
 
 	add(*(lbl_speed=new GLtk::Label(res, "  0")));
 	lbl_speed->set_style("digital");
-	lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-58, 35, 24));
+	lbl_speed->set_geometry(GLtk::Geometry(10, geom.h-55, 35, 20));
 
 	add(*(sld_speed=new GLtk::HSlider(res)));
-	sld_speed->set_geometry(GLtk::Geometry(50, geom.h-51, geom.w-80, 10));
+	sld_speed->set_geometry(GLtk::Geometry(50, geom.h-50, geom.w-80, 10));
 	sld_speed->set_range(0, 200);
 	sld_speed->set_step(5);
 	sld_speed->signal_value_changed.connect(sigc::mem_fun(this, &TrainPanel::speed_slider_changed));
 
 	add(*(tgl_forward=new GLtk::Toggle(res)));
 	tgl_forward->set_text("Fwd");
-	tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-59, 20, 27));
+	tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-58, 20, 27));
 	tgl_forward->set_value(true);
 	tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled));
 
 	const Route *route = train.get_route();
 	add(*(lbl_route=new GLtk::Label(res, (route ? route->get_name() : "Free run"))));
 	lbl_route->set_style("digital");
-	lbl_route->set_geometry(GLtk::Geometry(10, 58, geom.w-20, 24));
+	lbl_route->set_geometry(GLtk::Geometry(10, 65, geom.w-20, 20));
 	train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
 
 	add(*(lbl_status=new GLtk::Label(res, train.get_status())));
 	lbl_status->set_style("digital");
-	lbl_status->set_geometry(GLtk::Geometry(10, 34, geom.w-20, 24));
+	lbl_status->set_geometry(GLtk::Geometry(10, 40, geom.w-20, 20));
 	train.signal_status_changed.connect(sigc::mem_fun(this, &TrainPanel::train_status_changed));
 
 	const map<unsigned, string> &funcs = train.get_locomotive_type().get_functions();
@@ -75,7 +75,7 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 		GLtk::Toggle *tgl;
 		add(*(tgl=new GLtk::Toggle(res)));
 		tgl->set_text(fname);
-		tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 36, 27));
+		tgl->set_geometry(GLtk::Geometry(x, geom.h-87, 36, 27));
 		tgl->set_value(train.get_function(i->first));
 		tgl->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::func_toggled), i->first));
 
@@ -86,23 +86,23 @@ TrainPanel::TrainPanel(Engineer &e, const GLtk::Resources &r, Train &t):
 	GLtk::Button *btn;
 
 	add(*(btn=new GLtk::Button(res, "Edit")));
-	btn->set_geometry(GLtk::Geometry(geom.w-46, 10, 36, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-46, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::edit_clicked));
 
 	add(*(btn=new GLtk::Button(res, "Place")));
-	btn->set_geometry(GLtk::Geometry(geom.w-82, 10, 36, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-82, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::place_clicked));
 
 	add(*(btn=new GLtk::Button(res, "GoTo")));
-	btn->set_geometry(GLtk::Geometry(geom.w-118, 10, 36, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-118, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::goto_clicked));
 
 	add(*(btn=new GLtk::Button(res, "Route")));
-	btn->set_geometry(GLtk::Geometry(geom.w-154, 10, 36, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-154, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
 
 	add(*(btn=new GLtk::Button(res, "TTbl")));
-	btn->set_geometry(GLtk::Geometry(geom.w-190, 10, 36, 24));
+	btn->set_geometry(GLtk::Geometry(geom.w-190, 10, 36, 25));
 	btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::timetable_clicked));
 }