Further adjustments to changes in GLtk

[r2c2.git] / source / engineer / mainpanel.cpp

diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp
index 49750bfc32af7abee5f5a83a78b366fccdfcde7f..0071f4b9a58a615afe9e19a2741bf8fd59659033 100644 (file)
--- a/source/engineer/mainpanel.cpp
+++ b/source/engineer/mainpanel.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/button.h>
-#include "libmarklin/driver.h"
+#include "libr2c2/driver.h"
 #include "engineer.h"
 #include "mainpanel.h"
 #include "trainproperties.h"
@@ -14,54 +7,52 @@ Distributed under the GPL
 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, 133);
+       set_size(200, 117);
 
        GLtk::Button *btn;
 
-       add(*(btn=new GLtk::Button(res, "Off")));
-       btn->set_geometry(GLtk::Geometry(10, 86, 40, 25));
+       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)));
-       ind_off->set_geometry(GLtk::Geometry(10, 111, 40, 12));
+       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")));
-       btn->set_geometry(GLtk::Geometry(50, 86, 40, 25));
+       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)));
-       ind_on->set_geometry(GLtk::Geometry(50, 111, 40, 12));
+       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, "Quit")));
-       btn->set_geometry(GLtk::Geometry(150, 86, 40, 25));
+       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));
+       ind_halt->set_geometry(GLtk::Geometry(90, 95, 40, 12));
+
+       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")));
-       btn->set_geometry(GLtk::Geometry(90, 86, 40, 25));
+       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(*(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));
+       add(*(lbl_status=new GLtk::Label));
+       lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 20));
        lbl_status->set_style("digital");
 
-       Marklin::Driver &driver = engineer.get_layout().get_driver();
+       R2C2::Driver &driver = engineer.get_layout().get_driver();
        if(driver.get_power())
                ind_on->set_active(true);
        else
@@ -88,13 +79,13 @@ void MainPanel::power_off()
 
 void MainPanel::toggle_halt()
 {
-       Marklin::Driver &driver = engineer.get_layout().get_driver();
+       R2C2::Driver &driver = engineer.get_layout().get_driver();
        driver.halt(!driver.is_halted());
 }
 
 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);