X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fmainpanel.cpp;h=c89060a4416b77145337de2f2bffd743493cb6e3;hb=aead7f2da831199fbb8f6950b067656b2965c2fa;hp=c471b962d0c26ebf68fa0227fedd42ccecbfd0ec;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp index c471b96..c89060a 100644 --- a/source/engineer/mainpanel.cpp +++ b/source/engineer/mainpanel.cpp @@ -2,6 +2,7 @@ #include "engineer.h" #include "mainpanel.h" +using namespace std; using namespace Msp; MainPanel::MainPanel(Engineer &e, GLtk::Resources &r): @@ -36,15 +37,24 @@ MainPanel::MainPanel(Engineer &e, GLtk::Resources &r): btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::quit)); add(*(btn=new GLtk::Button(res, "+Loc"))); - btn->set_geometry(GLtk::Geometry(10, 10, 40, 25)); + btn->set_geometry(GLtk::Geometry(90, 53, 40, 25)); btn->signal_clicked.connect(sigc::mem_fun(this, &MainPanel::new_loc)); + add(*(lbl_status=new GLtk::Label(res))); + lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 24)); + lbl_status->set_style("digital"); + if(engineer.get_control().get_power()) ind_on->set_active(true); else ind_off->set_active(true); } +void MainPanel::set_status_text(const string &txt) +{ + lbl_status->set_text(txt); +} + void MainPanel::power_on() { engineer.get_control().set_power(true);