X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fscreens_panel.cc;h=8cdba50d446bf15f4599f0a0aacb067e309d19f5;hb=3498b9638cae0a4d793f2d71bb757124b5fd9141;hp=c5aea4223e5c62f4c381d16f1f7a1df28785c468;hpb=11199da66bafc54cfab92106563696d9a5e72b69;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index c5aea4223..8cdba50d4 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -27,6 +27,11 @@ #include "lib/cinema.h" #include "lib/config.h" #include "lib/screen.h" +#include +#include +#include +#include +#include using std::cout; @@ -55,8 +60,11 @@ 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->SetSortColumn (0); + _targets->SetItemComparator (&_comparator); + targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); add_cinemas (); @@ -109,57 +117,60 @@ 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) { 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->AppendItem(_targets->GetRootItem(), std_to_wx(cinema->name)); - _cinemas[id] = c; + _cinemas.push_back(make_pair(id, cinema)); + _item_to_cinema[id] = cinema; - 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; + auto cinema_iter = _cinemas.begin(); + while (cinema_iter != _cinemas.end() && cinema_iter->second != cinema) { + ++cinema_iter; } - if (i == _cinemas.end()) { + if (cinema_iter == _cinemas.end()) { return {}; } - _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s; - return i->first; + auto id = _targets->AppendItem(cinema_iter->first, std_to_wx(screen->name)); + + _screens.push_back(make_pair(id, screen)); + _item_to_screen[id] = screen; + + return cinema_iter->first; } @@ -168,9 +179,9 @@ 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); + auto cinema = make_shared(d->name(), d->emails(), d->notes(), d->utc_offset_hour(), d->utc_offset_minute()); + Config::instance()->add_cinema (cinema); + auto id = add_cinema (cinema); if (id) { _targets->UnselectAll (); _targets->Select (*id); @@ -181,26 +192,38 @@ ScreensPanel::add_cinema_clicked () } +optional>> +ScreensPanel::cinema_for_operation () const +{ + if (_selected_cinemas.size() == 1) { + return make_pair(_selected_cinemas.begin()->first, _selected_cinemas.begin()->second); + } else if (_selected_screens.size() == 1) { + return make_pair(_targets->GetItemParent(_selected_screens.begin()->first), _selected_screens.begin()->second->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->second->name, cinema->second->emails, cinema->second->notes, cinema->second->utc_offset_hour(), cinema->second->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->second->name = d->name (); + cinema->second->emails = d->emails (); + cinema->second->notes = d->notes (); + cinema->second->set_utc_offset_hour (d->utc_offset_hour ()); + cinema->second->set_utc_offset_minute (d->utc_offset_minute ()); + _targets->SetItemText (cinema->first, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); } @@ -233,20 +256,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->second->screens()) { + if (screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -258,9 +280,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->second->add_screen (screen); + auto id = add_screen (cinema->second, screen); if (id) { _targets->Expand (id.get ()); } @@ -278,17 +300,25 @@ ScreensPanel::edit_screen_clicked () return; } - auto s = *_selected_screens.begin(); + auto edit_screen = *_selected_screens.begin(); + + auto d = new ScreenDialog ( + GetParent(), _("Edit screen"), + edit_screen.second->name, + edit_screen.second->notes, + edit_screen.second->recipient, + edit_screen.second->recipient_file, + edit_screen.second->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.second->cinema; + for (auto screen: cinema->screens()) { + if (screen != edit_screen.second && screen->name == d->name()) { error_dialog ( GetParent(), wxString::Format ( @@ -300,12 +330,12 @@ 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.second->name = d->name (); + edit_screen.second->notes = d->notes (); + edit_screen.second->recipient = d->recipient (); + edit_screen.second->recipient_file = d->recipient_file (); + edit_screen.second->trusted_devices = d->trusted_devices (); + _targets->SetItemText (edit_screen.first, std_to_wx(d->name())); Config::instance()->changed (Config::CINEMAS); d->Destroy (); @@ -355,9 +385,8 @@ ScreensPanel::screens () const 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); } } } @@ -380,20 +409,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(make_pair(selection[i], 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(make_pair(selection[i], screen)); } } @@ -404,8 +431,8 @@ ScreensPanel::selection_changed () void ScreensPanel::add_cinemas () { - for (auto i: Config::instance()->cinemas()) { - add_cinema (i); + for (auto cinema: Config::instance()->cinemas()) { + add_cinema (cinema); } } @@ -417,30 +444,32 @@ ScreensPanel::search_changed () _cinemas.clear (); _screens.clear (); + _item_to_cinema.clear (); + _item_to_screen.clear (); add_cinemas (); _ignore_selection_change = true; - for (auto const& i: _selected_cinemas) { + for (auto const& selection: _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; + auto cinema = _cinemas.begin (); + while (cinema != _cinemas.end() && cinema->second != selection.second) { + ++cinema; } - if (j != _cinemas.end()) { - _targets->Select (j->first); + if (cinema != _cinemas.end()) { + _targets->Select (cinema->first); } } - for (auto const& i: _selected_screens) { - auto j = _screens.begin (); - while (j != _screens.end() && j->second != i.second) { - ++j; + for (auto const& selection: _selected_screens) { + auto screen = _screens.begin (); + while (screen != _screens.end() && screen->second != selection.second) { + ++screen; } - if (j != _screens.end()) { - _targets->Select (j->first); + if (screen != _screens.end()) { + _targets->Select (screen->first); } } @@ -451,7 +480,7 @@ ScreensPanel::search_changed () void ScreensPanel::checkbox_changed (wxTreeListEvent& ev) { - if (_cinemas.find(ev.GetItem()) != _cinemas.end()) { + 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)) { @@ -483,14 +512,61 @@ ScreensPanel::checkbox_changed (wxTreeListEvent& ev) } +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 { - return strcoll (wx_to_std(GetItemText(a)).c_str(), wx_to_std(GetItemText(b)).c_str()); + auto iter = _item_to_screen.find (item); + if (iter == _item_to_screen.end()) { + return {}; + } + + return iter->second; } +ScreensPanel::Comparator::Comparator () +{ + 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); + } +} + +ScreensPanel::Comparator::~Comparator () +{ + if (_collator) { + ucol_close (_collator); + } +} + +int +ScreensPanel::Comparator::Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) +{ + auto utf8_a = wx_to_std(tree_list->GetItemText(a)); + auto utf8_b = wx_to_std(tree_list->GetItemText(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()); + } +}