Replace various map lookups with functions from maputils.h

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

diff --git a/source/engineer/timetabledialog.cpp b/source/engineer/timetabledialog.cpp
index 4f227128cee624fe5bd50b255284f31d3258d7d8..1d0842a83328ab248fd11eb2a852c9df82297895 100644 (file)
--- a/source/engineer/timetabledialog.cpp
+++ b/source/engineer/timetabledialog.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/button.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
@@ -12,31 +5,29 @@ Distributed under the GPL
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-TimetableDialog::TimetableDialog(const GLtk::Resources &r, Timetable &tt):
-       GLtk::Widget(r),
-       GLtk::Dialog(r),
+TimetableDialog::TimetableDialog(Timetable &tt):
        timetable(tt)
 {
-       set_size(200, 200);
+       set_size(250, 200);
 
        GLtk::Button *btn;
 
-       add_button(*(btn = new GLtk::Button(res, "Cncl")), 0);
+       add_button(*(btn = new GLtk::Button("Cncl")), 0);
        btn->set_geometry(GLtk::Geometry(geom.w-80, 10, 30, 25));
        btn->set_style("red");
 
-       add_button(*(btn = new GLtk::Button(res, "OK")), 1);
+       add_button(*(btn = new GLtk::Button("OK")), 1);
        btn->set_geometry(GLtk::Geometry(geom.w-40, 10, 30, 25));
        btn->set_style("green");
 
-       add(*(tgl_enabled = new GLtk::Toggle(res, "On")));
+       add(*(tgl_enabled = new GLtk::Toggle("On")));
        tgl_enabled->set_geometry(GLtk::Geometry(10, 10, 40, 27));
        tgl_enabled->set_value(timetable.is_enabled());
        tgl_enabled->signal_toggled.connect(sigc::mem_fun(this, &TimetableDialog::enabled_toggled));
 
-       add(*(ent_timetable = new GLtk::Entry(res)));
+       add(*(ent_timetable = new GLtk::Entry));
        ent_timetable->set_geometry(GLtk::Geometry(10, 45, geom.w-20, geom.h-55));
        ent_timetable->set_style("multiline");
        ent_timetable->set_multiline(true);