X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Finput.cpp;h=18b14a573bcad9754407c00525abc482b468c37e;hb=0a370f46322b0d6b804801bed042817fb8f98408;hp=e2b0ae0e06a175f8215b8299248fd07709ddfd49;hpb=17c219cff8f859978ec1274786319478cc99450c;p=r2c2.git

diff --git a/source/designer/input.cpp b/source/designer/input.cpp
index e2b0ae0..18b14a5 100644
--- a/source/designer/input.cpp
+++ b/source/designer/input.cpp
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008, 2010  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/mixedrows.h>
 #include <msp/input/keys.h>
 #include "designer.h"
 #include "input.h"
@@ -16,43 +10,41 @@ using namespace std;
 using namespace Msp;
 
 InputDialog::InputDialog(Designer &d, const string &title, const string &text):
-	GLtk::Widget(d.get_ui_resources()),
-	GLtk::Dialog(d.get_ui_resources()),
 	designer(d)
 {
-	set_size(300, 100);
+	GLtk::MixedRows *rows = new GLtk::MixedRows;
+	set_layout(rows);
 
 	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)));
+	layout->set_expand(*lbl, true, false);
+	lbl->set_style("title");
 
-	add(*(entry=new GLtk::Entry(res, text)));
-	entry->set_geometry(GLtk::Geometry(10, geom.h-60, geom.w-20, 20));
+	rows->start_row();
+	add(*(entry=new GLtk::Entry(text)));
+	entry->set_edit_size(60, 1);
 
 	GLtk::Button *btn;
 
-	add_button(*(btn=new GLtk::Button(res, "Cncl")), 0);
-	btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
+	rows->start_row();
+	rows->split_columns();
+	add_button(*(btn=new GLtk::Button("Cncl")), 0);
 	btn->set_style("red");
 
-	add_button(*(btn=new GLtk::Button(res, "OK")), 1);
-	btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
+	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();
 }
 
-void InputDialog::key_press(unsigned key, unsigned mod, wchar_t ch)
+void InputDialog::key_press(unsigned key, unsigned mod)
 {
 	if(key==Msp::Input::KEY_ENTER)
 		response(1);
 	else if(key==Msp::Input::KEY_ESC)
 		response(0);
 	else
-		Dialog::key_press(key, mod, ch);
+		Dialog::key_press(key, mod);
 }
 
 void InputDialog::on_response(int code)