X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/de760c05d707d0b239f4fc09cb1dba2c13a18b45..8991f15558a6b0fbcfd588abe073f6f0537a7f8d:/Constructor/src/cisternptywnd.cpp diff --git a/Constructor/src/cisternptywnd.cpp b/Constructor/src/cisternptywnd.cpp index 495b0ef..c63c57f 100644 --- a/Constructor/src/cisternptywnd.cpp +++ b/Constructor/src/cisternptywnd.cpp @@ -8,11 +8,19 @@ CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtrget_widget("txt_cistern_name", txt_cistern_name); refGlade->get_widget("btn_select_color", btn_select_color); refGlade->get_widget("color_preview",color_preview); + refGlade->get_widget("spin_flot_inf", spin_flot_inf); + refGlade->get_widget("spin_flot_sup", spin_flot_sup); Glib::RefPtr ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "color_select_dlg"); ref->get_widget("color_select_dlg",color_select_dlg); ref->get_widget("dlg_select_color_cancel",dlg_select_color_cancel); ref->get_widget("dlg_select_color_ok",dlg_select_color_ok); + + Glib::RefPtr ref2 = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "dlg_flot"); + ref2->get_widget("dlg_flot",dlg_flot); + ref2->get_widget("btn_dlg_flot_ok",btn_dlg_flot_ok); + + btn_dlg_flot_ok->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_btn_dlg_flot_ok_clicked)); btn_select_color->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_btn_select_color_clicked)); dlg_select_color_cancel->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_dlg_select_color_cancel_clicked)); @@ -35,7 +43,7 @@ CisternPtyWnd::~CisternPtyWnd() void CisternPtyWnd::on_btn_accept_clicked() { CisternPtyWnd::on_btn_apply_clicked(); - if ( !cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) ) + if ( !cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) && ( spin_flot_inf->get_value() < spin_flot_sup->get_value() ) ) hide(); } @@ -49,6 +57,12 @@ void CisternPtyWnd::on_btn_apply_clicked() dlg_name->show(); else cistern->set_name( txt_cistern_name->get_text() ); + if ( spin_flot_inf->get_value() >= spin_flot_sup->get_value() ) + dlg_flot->show(); + else { + cistern->set_flotante_inf(spin_flot_inf->get_value() ); + cistern->set_flotante_sup(spin_flot_sup->get_value() ); + } } void CisternPtyWnd::on_btn_select_color_clicked() @@ -68,3 +82,8 @@ void CisternPtyWnd::on_dlg_select_color_ok_clicked() color_preview->modify_bg( Gtk::STATE_NORMAL , cistern->get_liquid_color() ); color_select_dlg->hide(); } + +void CisternPtyWnd::on_btn_dlg_flot_ok_clicked() +{ + dlg_flot->hide(); +}