Clear the critical flag one track earlier

[r2c2.git] / source / designer / input.cpp

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index 42cc0783dd994f72c75d6db755a19cfb9950ea74..acfa8bd00dd7e8041ba4633daee7c7b34ac85baa 100644 (file)
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -1,13 +1,8 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <GL/gl.h>
 #include <msp/gl/texture.h>
 #include <msp/gltk/button.h>
+#include <msp/gltk/column.h>
+#include <msp/gltk/row.h>
 #include <msp/input/keys.h>
 #include "designer.h"
 #include "input.h"
@@ -15,48 +10,46 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-::Input::Input(Designer &d, const string &title, const string &text):
-       Panel(d.get_ui_resources()),
+InputDialog::InputDialog(Designer &d, const string &title, const string &text):
        designer(d)
 {
-       set_size(300, 100);
+       set_layout(new GLtk::Layout);
+       GLtk::Column col(*layout);
 
        GLtk::Label *lbl;
-       add(*(lbl=new GLtk::Label(res, title)));
-       lbl->set_geometry(GLtk::Geometry(10, geom.h-30, geom.w-20, 20));
+       add(*(lbl=new GLtk::Label(title)));
+       lbl->set_style("title");
 
-       add(*(entry=new GLtk::Entry(res, text)));
-       entry->set_geometry(GLtk::Geometry(10, geom.h-60, geom.w-20, 20));
+       add(*(entry=new GLtk::Entry(text)));
+       entry->set_edit_size(60, 1);
 
        GLtk::Button *btn;
 
-       add(*(btn=new GLtk::Button(res, "Cncl")));
-       btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
-       btn->set_style("red");
-       btn->signal_clicked.connect(signal_cancel);
+       {
+               GLtk::Row row(*layout);
+               row.split();
+               add_button(*(btn=new GLtk::Button("Cncl")), 0);
+               btn->set_style("red");
 
-       add(*(btn=new GLtk::Button(res, "OK")));
-       btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
-       btn->set_style("green");
-       btn->signal_clicked.connect(signal_accept);
+               add_button(*(btn=new GLtk::Button("OK")), 1);
+               btn->set_style("green");
+       }
 
-       designer.get_root().add(*this);
-       const GLtk::Geometry &rgeom=designer.get_root().get_geometry();
-       set_position((rgeom.w-geom.w)/2, (rgeom.h-geom.h)/2);
        entry->set_focus();
 }
 
-const string &::Input::get_text() const
-{
-       return entry->get_text();
-}
-
-void ::Input::key_press(unsigned key, unsigned mod, wchar_t ch)
+void InputDialog::key_press(unsigned key, unsigned mod)
 {
        if(key==Msp::Input::KEY_ENTER)
-               signal_accept.emit();
+               response(1);
        else if(key==Msp::Input::KEY_ESC)
-               signal_cancel.emit();
+               response(0);
        else
-               Panel::key_press(key, mod, ch);
+               Dialog::key_press(key, mod);
+}
+
+void InputDialog::on_response(int code)
+{
+       if(code)
+               signal_accept.emit(entry->get_text());
 }