tgl_forward->set_geometry(GLtk::Geometry(geom.w-30, geom.h-59, 20, 27));
tgl_forward->set_value(!train.get_locomotive().get_reverse());
tgl_forward->signal_toggled.connect(sigc::mem_fun(this, &TrainPanel::forward_toggled));
+ train.get_locomotive().signal_reverse_changed.connect(sigc::mem_fun(this, &TrainPanel::train_reverse_changed));
- add(*(lbl_route=new GLtk::Label(res, "Free run")));
+ 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));
train.signal_route_changed.connect(sigc::mem_fun(this, &TrainPanel::train_route_changed));
const map<unsigned, string> &funcs = train.get_locomotive().get_type().get_functions();
unsigned x = 10;
- for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=35)
+ for(map<unsigned, string>::const_iterator i=funcs.begin(); i!=funcs.end(); ++i, x+=36)
{
string fname = i->second;
fname[0] = toupper(fname[0]);
GLtk::Toggle *tgl;
add(*(tgl=new GLtk::Toggle(res)));
tgl->set_text(fname);
- tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 35, 27));
+ tgl->set_geometry(GLtk::Geometry(x, geom.h-85, 36, 27));
tgl->set_value(train.get_locomotive().get_function(i->first));
tgl->signal_toggled.connect(sigc::bind(sigc::mem_fun(this, &TrainPanel::func_toggled), i->first));
sld_speed->set_value(speed);
}
+void TrainPanel::train_reverse_changed(bool reverse)
+{
+ tgl_forward->set_value(!reverse);
+}
+
void TrainPanel::loco_function_changed(unsigned func, bool value)
{
map<unsigned, GLtk::Toggle *>::iterator i = tgl_funcs.find(func);