Panel(r),
engineer(e)
{
- set_size(200, 133);
+ set_size(200, 117);
GLtk::Button *btn;
add(*(btn=new GLtk::Button(res, "Off")));
- btn->set_geometry(GLtk::Geometry(10, 86, 40, 25));
+ btn->set_geometry(GLtk::Geometry(10, 70, 40, 25));
btn->set_style("red");
btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::power_off));
add(*(ind_off=new GLtk::Indicator(res)));
- ind_off->set_geometry(GLtk::Geometry(10, 111, 40, 12));
+ ind_off->set_geometry(GLtk::Geometry(10, 95, 40, 12));
ind_off->set_style("red");
add(*(btn=new GLtk::Button(res, "On")));
- btn->set_geometry(GLtk::Geometry(50, 86, 40, 25));
+ btn->set_geometry(GLtk::Geometry(50, 70, 40, 25));
btn->set_style("green");
btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::power_on));
add(*(ind_on=new GLtk::Indicator(res)));
- ind_on->set_geometry(GLtk::Geometry(50, 111, 40, 12));
+ ind_on->set_geometry(GLtk::Geometry(50, 95, 40, 12));
ind_on->set_style("green");
+ add(*(btn=new GLtk::Button(res, "Halt")));
+ btn->set_geometry(GLtk::Geometry(90, 70, 40, 25));
+ btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::toggle_halt));
+
+ add(*(ind_halt=new GLtk::Indicator(res)));
+ ind_halt->set_geometry(GLtk::Geometry(90, 95, 40, 12));
+
add(*(btn=new GLtk::Button(res, "Quit")));
- btn->set_geometry(GLtk::Geometry(150, 86, 40, 25));
+ btn->set_geometry(GLtk::Geometry(150, 70, 40, 25));
btn->set_style("red");
btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::quit));
add(*(btn=new GLtk::Button(res, "+Loc")));
- btn->set_geometry(GLtk::Geometry(90, 86, 40, 25));
+ btn->set_geometry(GLtk::Geometry(10, 40, 40, 25));
btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::new_loc));
- add(*(ind_halt=new GLtk::Indicator(res)));
- ind_halt->set_geometry(GLtk::Geometry(10, 69, 40, 12));
-
- add(*(btn=new GLtk::Button(res, "Halt")));
- btn->set_geometry(GLtk::Geometry(10, 44, 40, 25));
- btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::toggle_halt));
-
add(*(lbl_status=new GLtk::Label(res)));
- lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 24));
+ lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 20));
lbl_status->set_style("digital");
Marklin::Driver &driver = engineer.get_layout().get_driver();