Arrange widgets in Designer with GLtk::Layout

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

diff --git a/source/designer/trackproperties.cpp b/source/designer/trackproperties.cpp
index 9753849eccf3aadae3b4d937e7dbb51e2baecc64..b85a99ae76e6459247f2f2719a0c17e287c0802d 100644 (file)
--- a/source/designer/trackproperties.cpp
+++ b/source/designer/trackproperties.cpp
@@ -1,5 +1,6 @@
 #include <msp/gltk/button.h>
 #include <msp/gltk/label.h>
+#include <msp/gltk/mixedrows.h>
 #include "libr2c2/track.h"
 #include "libr2c2/tracktype.h"
 #include "selection.h"
@@ -12,33 +13,34 @@ using namespace R2C2;
 TrackProperties::TrackProperties(const Selection &s):
        selection(s)
 {
-       set_size(300, 110);
+       GLtk::MixedRows *rows = new GLtk::MixedRows;
+       set_layout(rows);
 
-       GLtk::Label *lbl;
+       GLtk::Label *lbl1, *lbl2;
 
-       add(*(lbl = new GLtk::Label("Track properties")));
-       lbl->set_geometry(GLtk::Geometry(10, geom.h-30, geom.w-20, 20));
-
-       add(*(lbl = new GLtk::Label("Turnout ID")));
-       lbl->set_geometry(GLtk::Geometry(10, geom.h-65, 70, 20));
+       add(*(lbl1 = new GLtk::Label("Track properties")));
+       layout->set_expand(*lbl1, true, false);
+       lbl1->set_style("title");
 
+       rows->start_row();
+       add(*(lbl1 = new GLtk::Label("Turnout ID")));
        add(*(ent_turnout_id = new GLtk::Entry));
-       ent_turnout_id->set_geometry(GLtk::Geometry(80, geom.h-65, 50, 20));
-
-       add(*(lbl = new GLtk::Label("Sensor ID")));
-       lbl->set_geometry(GLtk::Geometry(150, geom.h-65, 70, 20));
+       ent_turnout_id->set_edit_size(5, 1);
 
+       rows->start_row();
+       add(*(lbl2 = new GLtk::Label("Sensor ID")));
+       rows->add_constraint(*lbl1, GLtk::Layout::COPY_WIDTH, *lbl2);
        add(*(ent_sensor_id = new GLtk::Entry));
-       ent_sensor_id->set_geometry(GLtk::Geometry(220, geom.h-65, 50, 20));
+       ent_sensor_id->set_edit_size(5, 1);
 
        GLtk::Button *btn;
 
+       rows->start_row();
+       rows->split_columns();
        add_button(*(btn = new GLtk::Button("Cncl")), 0);
-       btn->set_geometry(GLtk::Geometry(geom.w-90, 10, 40, 24));
        btn->set_style("red");
 
        add_button(*(btn = new GLtk::Button("OK")), 1);
-       btn->set_geometry(GLtk::Geometry(geom.w-50, 10, 40, 24));
        btn->set_style("green");
 
        if(selection.size()==1)