Stack-allocate wxDialog instead of using wx_ptr.

[dcpomatic.git] / src / wx / screens_panel.cc

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 272b983d90c8bf5e72c81e00c3b38ef3e9791163..b794590326daf6947a0ae9e11175114a486a2a80 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -32,6 +32,7 @@
 
 
 using std::cout;
+using std::list;
 using std::make_pair;
 using std::make_shared;
 using std::map;
@@ -229,16 +230,12 @@ ScreensPanel::add_screen (shared_ptr<Cinema> cinema, shared_ptr<Screen> screen)
 void
 ScreensPanel::add_cinema_clicked ()
 {
-       auto dialog = new CinemaDialog (GetParent(), _("Add Cinema"));
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       CinemaDialog dialog(GetParent(), _("Add Cinema"));
 
-       if (dialog->ShowModal() == wxID_OK) {
-               auto cinema = make_shared<Cinema>(dialog->name(), dialog->emails(), dialog->notes(), dialog->utc_offset_hour(), dialog->utc_offset_minute());
+       if (dialog.ShowModal() == wxID_OK) {
+               auto cinema = make_shared<Cinema>(dialog.name(), dialog.emails(), dialog.notes(), dialog.utc_offset_hour(), dialog.utc_offset_minute());
 
-               auto cinemas = Config::instance()->cinemas();
-               cinemas.sort(
-                       [this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return _collator.compare(a->name, b->name) < 0; }
-                       );
+               auto cinemas = sorted_cinemas();
 
                try {
                        _ignore_cinemas_changed = true;
@@ -251,8 +248,13 @@ ScreensPanel::add_cinema_clicked ()
 
                wxTreeListItem previous = wxTLI_FIRST;
                bool found = false;
+               auto search = wx_to_std(_search->GetValue());
+               convert_to_lower(search);
                for (auto existing_cinema: cinemas) {
-                       if (_collator.compare(dialog->name(), existing_cinema->name) < 0) {
+                       if (!matches_search(existing_cinema, search)) {
+                               continue;
+                       }
+                       if (_collator.compare(dialog.name(), existing_cinema->name) < 0) {
                                /* existing_cinema should be after the one we're inserting */
                                found = true;
                                break;
@@ -295,21 +297,20 @@ ScreensPanel::edit_cinema_clicked ()
                return;
        }
 
-       auto dialog = new CinemaDialog(
+       CinemaDialog dialog(
                GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->utc_offset_minute()
                );
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
-
-       if (dialog->ShowModal() == wxID_OK) {
-               cinema->name = dialog->name();
-               cinema->emails = dialog->emails();
-               cinema->notes = dialog->notes();
-               cinema->set_utc_offset_hour(dialog->utc_offset_hour());
-               cinema->set_utc_offset_minute(dialog->utc_offset_minute());
+
+       if (dialog.ShowModal() == wxID_OK) {
+               cinema->name = dialog.name();
+               cinema->emails = dialog.emails();
+               cinema->notes = dialog.notes();
+               cinema->set_utc_offset_hour(dialog.utc_offset_hour());
+               cinema->set_utc_offset_minute(dialog.utc_offset_minute());
                notify_cinemas_changed();
                auto item = cinema_to_item(cinema);
                DCPOMATIC_ASSERT(item);
-               _targets->SetItemText (*item, std_to_wx(dialog->name()));
+               _targets->SetItemText (*item, std_to_wx(dialog.name()));
        }
 }
 
@@ -348,27 +349,26 @@ ScreensPanel::add_screen_clicked ()
                return;
        }
 
-       auto dialog = new ScreenDialog(GetParent(), _("Add Screen"));
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       ScreenDialog dialog(GetParent(), _("Add Screen"));
 
-       if (dialog->ShowModal () != wxID_OK) {
+       if (dialog.ShowModal () != wxID_OK) {
                return;
        }
 
        for (auto screen: cinema->screens()) {
-               if (screen->name == dialog->name()) {
+               if (screen->name == dialog.name()) {
                        error_dialog (
                                GetParent(),
                                wxString::Format (
                                        _("You cannot add a screen called '%s' as the cinema already has a screen with this name."),
-                                       std_to_wx(dialog->name()).data()
+                                       std_to_wx(dialog.name()).data()
                                        )
                                );
                        return;
                }
        }
 
-       auto screen = std::make_shared<Screen>(dialog->name(), dialog->notes(), dialog->recipient(), dialog->recipient_file(), dialog->trusted_devices());
+       auto screen = std::make_shared<Screen>(dialog.name(), dialog.notes(), dialog.recipient(), dialog.recipient_file(), dialog.trusted_devices());
        cinema->add_screen (screen);
        notify_cinemas_changed();
 
@@ -388,7 +388,7 @@ ScreensPanel::edit_screen_clicked ()
 
        auto edit_screen = _selected_screens[0];
 
-       auto dialog = new ScreenDialog(
+       ScreenDialog dialog(
                GetParent(), _("Edit screen"),
                edit_screen->name,
                edit_screen->notes,
@@ -396,36 +396,35 @@ ScreensPanel::edit_screen_clicked ()
                edit_screen->recipient_file,
                edit_screen->trusted_devices
                );
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
 
-       if (dialog->ShowModal() != wxID_OK) {
+       if (dialog.ShowModal() != wxID_OK) {
                return;
        }
 
        auto cinema = edit_screen->cinema;
        for (auto screen: cinema->screens()) {
-               if (screen != edit_screen && screen->name == dialog->name()) {
+               if (screen != edit_screen && screen->name == dialog.name()) {
                        error_dialog (
                                GetParent(),
                                wxString::Format (
                                        _("You cannot change this screen's name to '%s' as the cinema already has a screen with this name."),
-                                       std_to_wx(dialog->name()).data()
+                                       std_to_wx(dialog.name()).data()
                                        )
                                );
                        return;
                }
        }
 
-       edit_screen->name = dialog->name();
-       edit_screen->notes = dialog->notes();
-       edit_screen->recipient = dialog->recipient();
-       edit_screen->recipient_file = dialog->recipient_file();
-       edit_screen->trusted_devices = dialog->trusted_devices();
+       edit_screen->name = dialog.name();
+       edit_screen->notes = dialog.notes();
+       edit_screen->recipient = dialog.recipient();
+       edit_screen->recipient_file = dialog.recipient_file();
+       edit_screen->trusted_devices = dialog.trusted_devices();
        notify_cinemas_changed();
 
        auto item = screen_to_item(edit_screen);
        DCPOMATIC_ASSERT (item);
-       _targets->SetItemText (*item, std_to_wx(dialog->name()));
+       _targets->SetItemText(*item, std_to_wx(dialog.name()));
 }
 
 
@@ -449,6 +448,10 @@ ScreensPanel::remove_screen_clicked ()
                _targets->DeleteItem(*item);
        }
 
+       /* This is called by the signal on Linux, but not it seems on Windows, so we call it ourselves
+        * as well.
+        */
+       selection_changed();
        notify_cinemas_changed();
 }
 
@@ -495,15 +498,23 @@ ScreensPanel::selection_changed ()
 }
 
 
-void
-ScreensPanel::add_cinemas ()
+list<shared_ptr<Cinema>>
+ScreensPanel::sorted_cinemas() const
 {
        auto cinemas = Config::instance()->cinemas();
+
        cinemas.sort(
                [this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return _collator.compare(a->name, b->name) < 0; }
                );
 
-       for (auto cinema: cinemas) {
+       return cinemas;
+}
+
+
+void
+ScreensPanel::add_cinemas ()
+{
+       for (auto cinema: sorted_cinemas()) {
                add_cinema (cinema, wxTLI_LAST);
        }
 }