X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fremote%2Fremote.cpp;h=e5384777bf49ffaf5f52b21196483361e5088186;hb=d084e6f369a829f41086d1f7f9befa52d0392d58;hp=c6afc6de537e0ab4fe7d3d4ffb75970fc69af24f;hpb=2fe7cbcb761487bc7409b93b372da6f8ab3c581e;p=r2c2.git

diff --git a/source/remote/remote.cpp b/source/remote/remote.cpp
index c6afc6d..e538477 100644
--- a/source/remote/remote.cpp
+++ b/source/remote/remote.cpp
@@ -1,13 +1,15 @@
 /* $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-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/separator.h>
 #include <msp/net/resolve.h>
 #include <msp/time/units.h>
+#include "mainpanel.h"
 #include "remote.h"
 #include "trainpanel.h"
 
@@ -38,8 +40,15 @@ Remote::Remote(int argc, char **argv):
 	window.set_default_size(300, 200);
 	window.set_border_width(5);
 
-	train_box = new Gtk::VBox(false, 5);
-	window.add(*manage(train_box));
+	Gtk::ScrolledWindow *scroll = new Gtk::ScrolledWindow;
+	window.add(*manage(scroll));
+	scroll->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+	panel_box = new Gtk::VBox(false, 5);
+	scroll->add(*manage(panel_box));
+
+	main_panel = new MainPanel(*this, client);
+	panel_box->pack_start(*manage(main_panel), false, true);
 
 	window.show_all();
 }
@@ -50,15 +59,13 @@ void Remote::tick()
 	gtk.iteration(false);
 }
 
-void Remote::train_added(Marklin::NetTrain &t)
+void Remote::train_added(R2C2::NetTrain &t)
 {
-	TrainPanel *panel = new TrainPanel(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);
+	Gtk::HSeparator *sep = new Gtk::HSeparator;
+	panel_box->pack_start(*manage(sep), false, true);
+	sep->show();
+
+	TrainPanel *panel = new TrainPanel(*this, client, t);
+	panel_box->pack_start(*manage(panel), false, true);
 	train_panels.push_back(panel);
 }