From: Mikko Rasa Date: Fri, 15 Nov 2013 22:44:31 +0000 (+0200) Subject: Base the train list item on MultiColumnItem X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=190829464f446f211e4aff058bb555519a65c6ee;p=r2c2.git Base the train list item on MultiColumnItem --- diff --git a/source/engineer/trainlistdialog.cpp b/source/engineer/trainlistdialog.cpp index fccfbfb..f4fbb10 100644 --- a/source/engineer/trainlistdialog.cpp +++ b/source/engineer/trainlistdialog.cpp @@ -11,20 +11,12 @@ using namespace std; using namespace Msp; using namespace R2C2; -class TrainItem: public GLtk::List::Item +class TrainItem: public GLtk::List::MultiColumnItem { -private: - GLtk::Label protocol; - GLtk::Label address; - GLtk::Label name; - -public: +public: typedef R2C2::Train *ValueType; TrainItem(ValueType); - -private: - virtual void on_style_change(); }; @@ -95,30 +87,10 @@ void TrainListDialog::train_name_changed(Train &train) } -TrainItem::TrainItem(ValueType train): - protocol(train->get_protocol()), - address(lexical_cast(train->get_address())), - name(train->get_name()) +TrainItem::TrainItem(ValueType train) { - add(protocol); - add(address); - add(name); + add(*new GLtk::Label(train->get_protocol())); + add(*new GLtk::Label(lexical_cast(train->get_address()))); + add(*new GLtk::Label(train->get_name())); } -void TrainItem::on_style_change() -{ - if(!style) - return; - - protocol.autosize(); - address.autosize(); - name.autosize(); - - if(const GLtk::Part *part = style->get_part("children")) - { - const GLtk::Sides &margin = part->get_margin(); - protocol.set_position(margin.left, margin.bottom); - address.set_position(margin.left+30, margin.bottom); - name.set_position(margin.left+60, margin.bottom); - } -}