X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Fremote.cpp;h=c53bddda1c2f08c4578b09cca3e05bf93c66ca5f;hb=cafa5ec7024622a14fa94b4c992dafa7ab71c3f6;hp=57080c1fd0897ea86ea0527cf974a42f8b836d5d;hpb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;p=r2c2.git diff --git a/source/remote/remote.cpp b/source/remote/remote.cpp index 57080c1..c53bddd 100644 --- a/source/remote/remote.cpp +++ b/source/remote/remote.cpp @@ -1,10 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite -Copyright © 2009 Mikkosoft Productions, Mikko Rasa +This file is part of R²C² +Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ +#include +#include #include #include #include "remote.h" @@ -34,9 +36,16 @@ Remote::Remote(int argc, char **argv): delete addr; window.signal_hide().connect(sigc::bind(sigc::mem_fun(this, &Remote::exit), 0)); + window.set_default_size(300, 200); window.set_border_width(5); + + Gtk::ScrolledWindow *scroll = new Gtk::ScrolledWindow; + window.add(*manage(scroll)); + scroll->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + train_box = new Gtk::VBox(false, 5); - window.add(*manage(train_box)); + scroll->add(*manage(train_box)); + window.show_all(); } @@ -46,8 +55,15 @@ void Remote::tick() gtk.iteration(false); } -void Remote::train_added(Marklin::NetTrain &t) +void Remote::train_added(R2C2::NetTrain &t) { - TrainPanel *panel = new TrainPanel(t); - train_box->add(*manage(panel)); + TrainPanel *panel = new TrainPanel(*this, client, t); + if(!train_panels.empty()) + { + Gtk::HSeparator *sep = new Gtk::HSeparator; + train_box->pack_start(*manage(sep), false, true); + sep->show(); + } + train_box->pack_start(*manage(panel), false, true); + train_panels.push_back(panel); }