Some refactoring in preparation for UI persistence

[r2c2.git] / source / engineer / departuresdialog.cpp

diff --git a/source/engineer/departuresdialog.cpp b/source/engineer/departuresdialog.cpp
index bea7f79281b58fa98a3ccf29182310acacfbc80f..a1a31121447a7e825dc75a628fa51f1d59850934 100644 (file)
--- a/source/engineer/departuresdialog.cpp
+++ b/source/engineer/departuresdialog.cpp
@@ -47,9 +47,13 @@ DeparturesDialog::DeparturesDialog(const Layout &l, const string &group):
        }
 }
 
-void DeparturesDialog::group_selected(unsigned index)
+void DeparturesDialog::set_group(const string &group)
 {
-       const string &group = groups.get(index);
+       int index = groups.find(group);
+       if(index<0)
+               throw key_error(group);
+       drp_groups->set_selected_index(index);
+
        lbl_title->set_text("Departures from "+group);
 
        for(vector<Row>::iterator i=rows.begin(); i!=rows.end(); ++i)
@@ -57,20 +61,15 @@ void DeparturesDialog::group_selected(unsigned index)
 
        delete departures;
        departures = new Departures(layout, group);
-       departures->signal_departure_added.connect(sigc::mem_fun(this, &DeparturesDialog::departure_added));
-       departures->signal_departure_removed.connect(sigc::mem_fun(this, &DeparturesDialog::departure_removed));
-
-       update_rows();
-}
+       departures->signal_departure_added.connect(sigc::hide<0>(sigc::mem_fun(this, &DeparturesDialog::update_rows)));
+       departures->signal_departure_removed.connect(sigc::hide<0>(sigc::mem_fun(this, &DeparturesDialog::update_rows)));
 
-void DeparturesDialog::departure_added(const Departures::Departure &)
-{
        update_rows();
 }
 
-void DeparturesDialog::departure_removed(const Departures::Departure &)
+void DeparturesDialog::group_selected(unsigned index)
 {
-       update_rows();
+       set_group(groups.get(index));
 }
 
 void DeparturesDialog::update_rows()