X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=abddd2826a37c618c2ee5a51ecf9760b5a6ede98;hb=06581bf43d6471acc33740a1e8384f71cb8951f2;hp=534b40604213e9fb4fb6e47a63a89bf773331b7a;hpb=f3bc2bad4657d660a07f9578b2cb1897b4e9d8c2;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 534b40604..abddd2826 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2021 Carl Hetherington + Copyright (C) 2015-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -19,41 +19,40 @@ */ -#include "screens_panel.h" -#include "wx_util.h" #include "cinema_dialog.h" -#include "screen_dialog.h" #include "dcpomatic_button.h" -#include "lib/config.h" +#include "screen_dialog.h" +#include "screens_panel.h" +#include "wx_util.h" #include "lib/cinema.h" +#include "lib/config.h" #include "lib/screen.h" +#include "lib/timer.h" +#include +#include +#include +#include +#include -using std::list; -using std::pair; using std::cout; -using std::map; -using std::string; using std::make_pair; using std::make_shared; +using std::map; +using std::pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; using namespace dcpomatic; ScreensPanel::ScreensPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) - , _ignore_selection_change (false) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); -#ifdef __WXGTK3__ - int const height = 30; -#else - int const height = -1; -#endif - - _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height)); + _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ /* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */ _search->ShowCancelButton (true); @@ -61,8 +60,9 @@ ScreensPanel::ScreensPanel (wxWindow* parent) sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP); auto targets = new wxBoxSizer (wxHORIZONTAL); - _targets = new TreeListCtrl (this); + _targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER); _targets->AppendColumn (wxT("foo")); + targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); add_cinemas (); @@ -99,6 +99,14 @@ ScreensPanel::ScreensPanel (wxWindow* parent) _remove_screen->Bind (wxEVT_BUTTON, boost::bind (&ScreensPanel::remove_screen_clicked, this)); SetSizer (sizer); + + UErrorCode status = U_ZERO_ERROR; + _collator = ucol_open(nullptr, &status); + if (_collator) { + ucol_setAttribute(_collator, UCOL_NORMALIZATION_MODE, UCOL_ON, &status); + ucol_setAttribute(_collator, UCOL_STRENGTH, UCOL_PRIMARY, &status); + ucol_setAttribute(_collator, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, &status); + } } @@ -106,6 +114,10 @@ ScreensPanel::~ScreensPanel () { _targets->Unbind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this); _targets->Unbind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this); + + if (_collator) { + ucol_close (_collator); + } } @@ -115,57 +127,58 @@ ScreensPanel::setup_sensitivity () bool const sc = _selected_cinemas.size() == 1; bool const ss = _selected_screens.size() == 1; - _edit_cinema->Enable (sc); + _edit_cinema->Enable (sc || ss); _remove_cinema->Enable (_selected_cinemas.size() >= 1); - _add_screen->Enable (sc); + _add_screen->Enable (sc || ss); _edit_screen->Enable (ss); _remove_screen->Enable (_selected_screens.size() >= 1); } optional -ScreensPanel::add_cinema (shared_ptr c) +ScreensPanel::add_cinema (shared_ptr cinema, wxTreeListItem previous) { auto search = wx_to_std (_search->GetValue ()); transform (search.begin(), search.end(), search.begin(), ::tolower); if (!search.empty ()) { - auto name = c->name; + auto name = cinema->name; transform (name.begin(), name.end(), name.begin(), ::tolower); if (name.find (search) == string::npos) { return {}; } } - auto id = _targets->AppendItem(_targets->GetRootItem(), std_to_wx(c->name)); + auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name)); - _cinemas[id] = c; + _cinemas.push_back(make_pair(id, cinema)); + _item_to_cinema[id] = cinema; + _cinema_to_item[cinema] = id; - for (auto i: c->screens()) { - add_screen (c, i); + for (auto screen: cinema->screens()) { + add_screen (cinema, screen); } - _targets->SetSortColumn (0); - return id; } optional -ScreensPanel::add_screen (shared_ptr c, shared_ptr s) +ScreensPanel::add_screen (shared_ptr cinema, shared_ptr screen) { - auto i = _cinemas.begin(); - while (i != _cinemas.end() && i->second != c) { - ++i; - } - - if (i == _cinemas.end()) { + auto item = cinema_to_item(cinema); + if (!item) { return {}; } - _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s; - return i->first; + auto id = _targets->AppendItem(*item, std_to_wx(screen->name)); + + _screens.push_back(make_pair(id, screen)); + _item_to_screen[id] = screen; + _screen_to_item[screen] = id; + + return item; } @@ -174,39 +187,72 @@ ScreensPanel::add_cinema_clicked () { auto d = new CinemaDialog (GetParent(), _("Add Cinema")); if (d->ShowModal () == wxID_OK) { - auto c = make_shared(d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); - Config::instance()->add_cinema (c); - auto id = add_cinema (c); - if (id) { + auto cinema = make_shared(d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); + + auto cinemas = Config::instance()->cinemas(); + cinemas.sort( + [this](shared_ptr a, shared_ptr b) { return compare(a->name, b->name) < 0; } + ); + + optional item; + for (auto existing_cinema: cinemas) { + if (!item && compare(d->name(), existing_cinema->name) < 0) { + if (auto existing_item = cinema_to_item(existing_cinema)) { + item = add_cinema (cinema, *existing_item); + } + } + } + + if (!item) { + item = add_cinema (cinema, wxTLI_LAST); + } + + if (item) { _targets->UnselectAll (); - _targets->Select (*id); + _targets->Select (*item); } + + Config::instance()->add_cinema (cinema); } d->Destroy (); } +shared_ptr +ScreensPanel::cinema_for_operation () const +{ + if (_selected_cinemas.size() == 1) { + return _selected_cinemas[0]; + } else if (_selected_screens.size() == 1) { + return _selected_screens[0]->cinema; + } + + return {}; +} + + void ScreensPanel::edit_cinema_clicked () { - if (_selected_cinemas.size() != 1) { + auto cinema = cinema_for_operation (); + if (!cinema) { return; } - auto c = *_selected_cinemas.begin(); - auto d = new CinemaDialog ( - GetParent(), _("Edit cinema"), c.second->name, c.second->emails, c.second->notes, c.second->utc_offset_hour(), c.second->utc_offset_minute() + GetParent(), _("Edit cinema"), cinema->name, cinema->emails, cinema->notes, cinema->utc_offset_hour(), cinema->utc_offset_minute() ); if (d->ShowModal() == wxID_OK) { - c.second->name = d->name (); - c.second->emails = d->emails (); - c.second->notes = d->notes (); - c.second->set_utc_offset_hour (d->utc_offset_hour ()); - c.second->set_utc_offset_minute (d->utc_offset_minute ()); - _targets->SetItemText (c.first, std_to_wx (d->name())); + cinema->name = d->name(); + cinema->emails = d->emails(); + cinema->notes = d->notes(); + cinema->set_utc_offset_hour(d->utc_offset_hour()); + cinema->set_utc_offset_minute(d->utc_offset_minute()); + auto item = cinema_to_item(cinema); + DCPOMATIC_ASSERT(item); + _targets->SetItemText (*item, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); } @@ -218,7 +264,7 @@ void ScreensPanel::remove_cinema_clicked () { if (_selected_cinemas.size() == 1) { - if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the cinema '%s'?"), std_to_wx(_selected_cinemas.begin()->second->name)))) { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the cinema '%s'?"), std_to_wx(_selected_cinemas[0]->name)))) { return; } } else { @@ -227,9 +273,11 @@ ScreensPanel::remove_cinema_clicked () } } - for (auto const& i: _selected_cinemas) { - Config::instance()->remove_cinema (i.second); - _targets->DeleteItem (i.first); + for (auto const& cinema: _selected_cinemas) { + Config::instance()->remove_cinema(cinema); + auto item = cinema_to_item(cinema); + DCPOMATIC_ASSERT(item); + _targets->DeleteItem(*item); } selection_changed (); @@ -239,20 +287,19 @@ ScreensPanel::remove_cinema_clicked () void ScreensPanel::add_screen_clicked () { - if (_selected_cinemas.size() != 1) { + auto cinema = cinema_for_operation (); + if (!cinema) { return; } - auto c = _selected_cinemas.begin()->second; - auto d = new ScreenDialog (GetParent(), _("Add Screen")); if (d->ShowModal () != wxID_OK) { d->Destroy (); return; } - for (auto i: c->screens ()) { - if (i->name == d->name()) { + for (auto screen: cinema->screens()) { + if (screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -264,9 +311,9 @@ ScreensPanel::add_screen_clicked () } } - auto s = std::make_shared(d->name(), d->notes(), d->recipient(), d->recipient_file(), d->trusted_devices()); - c->add_screen (s); - auto id = add_screen (c, s); + auto screen = std::make_shared(d->name(), d->notes(), d->recipient(), d->recipient_file(), d->trusted_devices()); + cinema->add_screen (screen); + auto id = add_screen (cinema, screen); if (id) { _targets->Expand (id.get ()); } @@ -284,17 +331,25 @@ ScreensPanel::edit_screen_clicked () return; } - auto s = *_selected_screens.begin(); + auto edit_screen = _selected_screens[0]; + + auto d = new ScreenDialog ( + GetParent(), _("Edit screen"), + edit_screen->name, + edit_screen->notes, + edit_screen->recipient, + edit_screen->recipient_file, + edit_screen->trusted_devices + ); - auto d = new ScreenDialog (GetParent(), _("Edit screen"), s.second->name, s.second->notes, s.second->recipient, s.second->recipient_file, s.second->trusted_devices); if (d->ShowModal() != wxID_OK) { d->Destroy (); return; } - auto c = s.second->cinema; - for (auto i: c->screens ()) { - if (i != s.second && i->name == d->name()) { + auto cinema = edit_screen->cinema; + for (auto screen: cinema->screens()) { + if (screen != edit_screen && screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -306,12 +361,14 @@ ScreensPanel::edit_screen_clicked () } } - s.second->name = d->name (); - s.second->notes = d->notes (); - s.second->recipient = d->recipient (); - s.second->recipient_file = d->recipient_file (); - s.second->trusted_devices = d->trusted_devices (); - _targets->SetItemText (s.first, std_to_wx (d->name())); + edit_screen->name = d->name(); + edit_screen->notes = d->notes(); + edit_screen->recipient = d->recipient(); + edit_screen->recipient_file = d->recipient_file(); + edit_screen->trusted_devices = d->trusted_devices(); + auto item = screen_to_item(edit_screen); + DCPOMATIC_ASSERT (item); + _targets->SetItemText (*item, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); d->Destroy (); @@ -322,7 +379,7 @@ void ScreensPanel::remove_screen_clicked () { if (_selected_screens.size() == 1) { - if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the screen '%s'?"), std_to_wx(_selected_screens.begin()->second->name)))) { + if (!confirm_dialog(this, wxString::Format(_("Are you sure you want to remove the screen '%s'?"), std_to_wx(_selected_screens[0]->name)))) { return; } } else { @@ -331,39 +388,26 @@ ScreensPanel::remove_screen_clicked () } } - for (auto const& i: _selected_screens) { - auto j = _cinemas.begin (); - while (j != _cinemas.end ()) { - auto sc = j->second->screens (); - if (find (sc.begin(), sc.end(), i.second) != sc.end ()) { - break; - } - - ++j; - } - - if (j == _cinemas.end()) { - continue; - } - - j->second->remove_screen (i.second); - _targets->DeleteItem (i.first); + for (auto const& screen: _selected_screens) { + screen->cinema->remove_screen(screen); + auto item = screen_to_item(screen); + DCPOMATIC_ASSERT(item); + _targets->DeleteItem(*item); } Config::instance()->changed (Config::CINEMAS); } -list> +vector> ScreensPanel::screens () const { - list> output; + vector> output; for (auto item = _targets->GetFirstItem(); item.IsOk(); item = _targets->GetNextItem(item)) { if (_targets->GetCheckedState(item) == wxCHK_CHECKED) { - auto screen_iter = _screens.find(item); - if (screen_iter != _screens.end()) { - output.push_back (screen_iter->second); + if (auto screen = item_to_screen(item)) { + output.push_back (screen); } } } @@ -386,20 +430,18 @@ ScreensPanel::selection_changed () return; } - wxTreeListItems s; - _targets->GetSelections (s); + wxTreeListItems selection; + _targets->GetSelections (selection); _selected_cinemas.clear (); _selected_screens.clear (); - for (size_t i = 0; i < s.size(); ++i) { - auto j = _cinemas.find (s[i]); - if (j != _cinemas.end ()) { - _selected_cinemas[j->first] = j->second; + for (size_t i = 0; i < selection.size(); ++i) { + if (auto cinema = item_to_cinema(selection[i])) { + _selected_cinemas.push_back(cinema); } - auto k = _screens.find (s[i]); - if (k != _screens.end ()) { - _selected_screens[k->first] = k->second; + if (auto screen = item_to_screen(selection[i])) { + _selected_screens.push_back(screen); } } @@ -410,8 +452,13 @@ ScreensPanel::selection_changed () void ScreensPanel::add_cinemas () { - for (auto i: Config::instance()->cinemas()) { - add_cinema (i); + auto cinemas = Config::instance()->cinemas(); + cinemas.sort( + [this](shared_ptr a, shared_ptr b) { return compare(a->name, b->name) < 0; } + ); + + for (auto cinema: cinemas) { + add_cinema (cinema, wxTLI_LAST); } } @@ -423,80 +470,161 @@ ScreensPanel::search_changed () _cinemas.clear (); _screens.clear (); + _item_to_cinema.clear (); + _cinema_to_item.clear (); + _item_to_screen.clear (); + _screen_to_item.clear (); + add_cinemas (); _ignore_selection_change = true; - for (auto const& i: _selected_cinemas) { - /* The wxTreeListItems will now be different, so we must search by cinema */ - auto j = _cinemas.begin (); - while (j != _cinemas.end() && j->second != i.second) { - ++j; + for (auto const& selection: _selected_cinemas) { + if (auto item = cinema_to_item(selection)) { + _targets->Select (*item); } + } - if (j != _cinemas.end()) { - _targets->Select (j->first); + for (auto const& selection: _selected_screens) { + if (auto item = screen_to_item(selection)) { + _targets->Select (*item); } } - for (auto const& i: _selected_screens) { - auto j = _screens.begin (); - while (j != _screens.end() && j->second != i.second) { - ++j; - } + _ignore_selection_change = false; - if (j != _screens.end()) { - _targets->Select (j->first); + _ignore_check_change = true; + + for (auto const& checked: _checked_screens) { + if (auto item = screen_to_item(checked)) { + _targets->CheckItem(*item, wxCHK_CHECKED); + setup_cinema_checked_state(*item); } } - _ignore_selection_change = false; + _ignore_check_change = false; +} + + +void +ScreensPanel::set_screen_checked (wxTreeListItem item, bool checked) +{ + auto screen = item_to_screen(item); + DCPOMATIC_ASSERT(screen); + if (checked) { + _checked_screens.insert(screen); + } else { + _checked_screens.erase(screen); + } +} + + +void +ScreensPanel::setup_cinema_checked_state (wxTreeListItem screen) +{ + auto cinema = _targets->GetItemParent(screen); + DCPOMATIC_ASSERT (cinema.IsOk()); + int checked = 0; + int unchecked = 0; + for (auto child = _targets->GetFirstChild(cinema); child.IsOk(); child = _targets->GetNextSibling(child)) { + if (_targets->GetCheckedState(child) == wxCHK_CHECKED) { + ++checked; + } else { + ++unchecked; + } + } + if (checked == 0) { + _targets->CheckItem(cinema, wxCHK_UNCHECKED); + } else if (unchecked == 0) { + _targets->CheckItem(cinema, wxCHK_CHECKED); + } else { + _targets->CheckItem(cinema, wxCHK_UNDETERMINED); + } } void ScreensPanel::checkbox_changed (wxTreeListEvent& ev) { - if (_cinemas.find(ev.GetItem()) != _cinemas.end()) { + if (_ignore_check_change) { + return; + } + + if (item_to_cinema(ev.GetItem())) { /* Cinema: check/uncheck all children */ auto const checked = _targets->GetCheckedState(ev.GetItem()); for (auto child = _targets->GetFirstChild(ev.GetItem()); child.IsOk(); child = _targets->GetNextSibling(child)) { _targets->CheckItem(child, checked); + set_screen_checked(child, checked); } } else { - /* Screen: set cinema to checked/unchecked/3state */ - auto parent = _targets->GetItemParent(ev.GetItem()); - DCPOMATIC_ASSERT (parent.IsOk()); - int checked = 0; - int unchecked = 0; - for (auto child = _targets->GetFirstChild(parent); child.IsOk(); child = _targets->GetNextSibling(child)) { - if (_targets->GetCheckedState(child) == wxCHK_CHECKED) { - ++checked; - } else { - ++unchecked; - } - } - if (checked == 0) { - _targets->CheckItem(parent, wxCHK_UNCHECKED); - } else if (unchecked == 0) { - _targets->CheckItem(parent, wxCHK_CHECKED); - } else { - _targets->CheckItem(parent, wxCHK_UNDETERMINED); - } + set_screen_checked(ev.GetItem(), _targets->GetCheckedState(ev.GetItem())); + setup_cinema_checked_state(ev.GetItem()); } ScreensChanged (); } +shared_ptr +ScreensPanel::item_to_cinema (wxTreeListItem item) const +{ + auto iter = _item_to_cinema.find (item); + if (iter == _item_to_cinema.end()) { + return {}; + } -wxIMPLEMENT_DYNAMIC_CLASS (TreeListCtrl, wxTreeListCtrl); + return iter->second; +} -int -TreeListCtrl::OnCompareItems (wxTreeListItem const& a, wxTreeListItem const& b) +shared_ptr +ScreensPanel::item_to_screen (wxTreeListItem item) const +{ + auto iter = _item_to_screen.find (item); + if (iter == _item_to_screen.end()) { + return {}; + } + + return iter->second; +} + + +optional +ScreensPanel::cinema_to_item (shared_ptr cinema) const { - return strcoll (wx_to_std(GetItemText(a)).c_str(), wx_to_std(GetItemText(b)).c_str()); + auto iter = _cinema_to_item.find (cinema); + if (iter == _cinema_to_item.end()) { + return {}; + } + + return iter->second; } +optional +ScreensPanel::screen_to_item (shared_ptr screen) const +{ + auto iter = _screen_to_item.find (screen); + if (iter == _screen_to_item.end()) { + return {}; + } + + return iter->second; +} + + +int +ScreensPanel::compare (string const& utf8_a, string const& utf8_b) +{ + if (_collator) { + UErrorCode error = U_ZERO_ERROR; + boost::scoped_array utf16_a(new uint16_t[utf8_a.size() + 1]); + u_strFromUTF8(reinterpret_cast(utf16_a.get()), utf8_a.size() + 1, nullptr, utf8_a.c_str(), -1, &error); + boost::scoped_array utf16_b(new uint16_t[utf8_b.size() + 1]); + u_strFromUTF8(reinterpret_cast(utf16_b.get()), utf8_b.size() + 1, nullptr, utf8_b.c_str(), -1, &error); + return ucol_strcoll(_collator, reinterpret_cast(utf16_a.get()), -1, reinterpret_cast(utf16_b.get()), -1); + } else { + return strcoll(utf8_a.c_str(), utf8_b.c_str()); + } +}