using namespace std;
using namespace Msp;
-MainPanel::MainPanel(Engineer &e, GLtk::Resources &r):
- Widget(r),
- Panel(r),
+MainPanel::MainPanel(Engineer &e):
engineer(e)
{
set_size(200, 117);
GLtk::Button *btn;
- add(*(btn=new GLtk::Button(res, "Off")));
+ add(*(btn=new GLtk::Button("Off")));
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)));
+ add(*(ind_off=new GLtk::Indicator));
ind_off->set_geometry(GLtk::Geometry(10, 95, 40, 12));
ind_off->set_style("red");
- add(*(btn=new GLtk::Button(res, "On")));
+ add(*(btn=new GLtk::Button("On")));
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)));
+ add(*(ind_on=new GLtk::Indicator));
ind_on->set_geometry(GLtk::Geometry(50, 95, 40, 12));
ind_on->set_style("green");
- add(*(btn=new GLtk::Button(res, "Halt")));
+ add(*(btn=new GLtk::Button("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)));
+ add(*(ind_halt=new GLtk::Indicator));
ind_halt->set_geometry(GLtk::Geometry(90, 95, 40, 12));
- add(*(btn=new GLtk::Button(res, "Quit")));
+ add(*(btn=new GLtk::Button("Quit")));
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")));
+ add(*(btn=new GLtk::Button("+Loc")));
btn->set_geometry(GLtk::Geometry(10, 40, 40, 25));
btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::new_loc));
- add(*(lbl_status=new GLtk::Label(res)));
+ add(*(lbl_status=new GLtk::Label));
lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 20));
lbl_status->set_style("digital");
void MainPanel::new_loc()
{
- TrainProperties *dialog = new TrainProperties(engineer, res, 0);
+ TrainProperties *dialog = new TrainProperties(engineer, 0);
engineer.get_root().add(*dialog);
dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
dialog->set_visible(true);