X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=1a537c0875759f16cafe388a1a4f739cb46cde22;hb=6bfda50f36b35a6635e9da7a25f84319ca29d92f;hp=e9c07c91fe7bf2a566532f328ed7681d000e1d8b;hpb=b76a5ae9a72c50ef0d1261b26babef5b916c4751;p=dcpomatic.git diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index e9c07c91f..1a537c087 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,15 +22,43 @@ * @brief Some utility functions and classes. */ -#include -#include -#include +#include "wx_util.h" +#include "file_picker_ctrl.h" +#include "static_text.h" +#include "password_entry.h" #include "lib/config.h" +#include "lib/job_manager.h" #include "lib/util.h" -#include "wx_util.h" +#include "lib/cross.h" +#include "lib/job.h" +#include +#include +#include +#include +#include +#include -using namespace std; -using namespace boost; +using std::string; +using std::vector; +using std::pair; +using boost::shared_ptr; +using boost::optional; +using dcp::locale_convert; + +wxStaticText * +#ifdef __WXOSX__ +create_label (wxWindow* p, wxString t, bool left) +#else +create_label (wxWindow* p, wxString t, bool) +#endif +{ +#ifdef __WXOSX__ + if (left) { + t += wxT (":"); + } +#endif + return new StaticText (p, t); +} /** Add a wxStaticText to a wxSizer, aligning it at vertical centre. * @param s Sizer to add to. @@ -40,55 +69,96 @@ using namespace boost; * @param prop Proportion to pass when calling Add() on the wxSizer. */ wxStaticText * +add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop, int flags) +{ #ifdef __WXOSX__ -add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop) + if (left) { + flags |= wxALIGN_RIGHT; + } +#endif + wxStaticText* m = create_label (p, t, left); + s->Add (m, prop, flags, 6); + return m; +} + +wxStaticText * +#ifdef __WXOSX__ +add_label_to_sizer (wxSizer* s, wxStaticText* t, bool left, int prop, int flags) #else -add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop) +add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags) #endif +{ +#ifdef __WXOSX__ + if (left) { + flags |= wxALIGN_RIGHT; + } +#endif + s->Add (t, prop, flags, 6); + return t; +} + +wxStaticText * +add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span) { int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT; #ifdef __WXOSX__ if (left) { flags |= wxALIGN_RIGHT; - t += wxT (":"); } -#endif - wxStaticText* m = new wxStaticText (p, wxID_ANY, t); - s->Add (m, prop, flags, 6); +#endif + wxStaticText* m = create_label (p, t, left); + s->Add (m, pos, span, flags); return m; } wxStaticText * #ifdef __WXOSX__ -add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span) +add_label_to_sizer (wxGridBagSizer* s, wxStaticText* t, bool left, wxGBPosition pos, wxGBSpan span) #else -add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span) +add_label_to_sizer (wxGridBagSizer* s, wxStaticText* t, bool, wxGBPosition pos, wxGBSpan span) #endif { int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT; #ifdef __WXOSX__ if (left) { flags |= wxALIGN_RIGHT; - t += wxT (":"); } -#endif - wxStaticText* m = new wxStaticText (p, wxID_ANY, t); - s->Add (m, pos, span, flags); - return m; +#endif + s->Add (t, pos, span, flags); + return t; } /** Pop up an error dialogue box. * @param parent Parent. * @param m Message. + * @param e Extended message. */ void -error_dialog (wxWindow* parent, wxString m) +error_dialog (wxWindow* parent, wxString m, optional e) { - wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK); + wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR); + if (e) { + wxString em = *e; + em[0] = wxToupper (em[0]); + d->SetExtendedMessage (em); + } + d->ShowModal (); + d->Destroy (); +} + +/** Pop up an error dialogue box. + * @param parent Parent. + * @param m Message. + */ +void +message_dialog (wxWindow* parent, wxString m) +{ + wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION); d->ShowModal (); d->Destroy (); } +/** @return true if the user answered "yes" */ bool confirm_dialog (wxWindow* parent, wxString m) { @@ -97,7 +167,7 @@ confirm_dialog (wxWindow* parent, wxString m) d->Destroy (); return r == wxID_YES; } - + /** @param s wxWidgets string. * @return Corresponding STL string. @@ -124,16 +194,30 @@ string_client_data (wxClientData* o) } void -checked_set (wxFilePickerCtrl* widget, string value) +checked_set (FilePickerCtrl* widget, boost::filesystem::path value) { - if (widget->GetPath() != std_to_wx (value)) { + if (widget->GetPath() != std_to_wx (value.string())) { if (value.empty()) { /* Hack to make wxWidgets clear the control when we are passed an empty value. */ value = " "; } - widget->SetPath (std_to_wx (value)); + widget->SetPath (std_to_wx (value.string())); + } +} + +void +checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value) +{ + if (widget->GetPath() != std_to_wx (value.string())) { + if (value.empty()) { + /* Hack to make wxWidgets clear the control when we are passed + an empty value. + */ + value = " "; + } + widget->SetPath (std_to_wx (value.string())); } } @@ -169,7 +253,7 @@ checked_set (wxChoice* widget, string value) if (widget->GetSelection() != -1) { o = widget->GetClientObject (widget->GetSelection ()); } - + if (!o || string_client_data(o) != value) { for (unsigned int i = 0; i < widget->GetCount(); ++i) { if (string_client_data (widget->GetClientObject (i)) == value) { @@ -210,6 +294,14 @@ checked_set (wxTextCtrl* widget, string value) } } +void +checked_set (PasswordEntry* entry, string value) +{ + if (entry->get() != value) { + entry->set(value); + } +} + void checked_set (wxTextCtrl* widget, wxString value) { @@ -269,7 +361,7 @@ dcpomatic_setup_i18n () #ifdef DCPOMATIC_WINDOWS locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string())); -#endif +#endif #ifdef DCPOMATIC_LINUX locale->AddCatalogLookupPathPrefix (LINUX_LOCALE_PREFIX); @@ -278,12 +370,15 @@ dcpomatic_setup_i18n () so we rename it to avoid clashes with any other installation of wxWidgets. */ - locale->AddCatalog (wxT ("dcpomatic-wxstd")); -#endif - - locale->AddCatalog (wxT ("libdcpomatic-wx")); - locale->AddCatalog (wxT ("dcpomatic")); - + locale->AddCatalog (wxT ("dcpomatic2-wxstd")); + + /* Fedora 29 (at least) installs wxstd3.mo instead of wxstd.mo */ + locale->AddCatalog (wxT ("wxstd3")); +#endif + + locale->AddCatalog (wxT ("libdcpomatic2-wx")); + locale->AddCatalog (wxT ("dcpomatic2")); + if (!locale->IsOk()) { delete locale; locale = new wxLocale (wxLANGUAGE_ENGLISH); @@ -330,3 +425,123 @@ context_translation (wxString s) return t; } + +wxString +time_to_timecode (DCPTime t, double fps) +{ + double w = t.seconds (); + int const h = (w / 3600); + w -= h * 3600; + int const m = (w / 60); + w -= m * 60; + int const s = floor (w); + w -= s; + int const f = lrint (w * fps); + return wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f); +} + +void +setup_audio_channels_choice (wxChoice* choice, int minimum) +{ + vector > items; + for (int i = minimum; i <= 16; i += 2) { + if (i == 2) { + items.push_back (make_pair (wx_to_std (_("2 - stereo")), locale_convert (i))); + } else if (i == 4) { + items.push_back (make_pair (wx_to_std (_("4 - L/C/R/Lfe")), locale_convert (i))); + } else if (i == 6) { + items.push_back (make_pair (wx_to_std (_("6 - 5.1")), locale_convert (i))); + } else if (i == 8) { + items.push_back (make_pair (wx_to_std (_("8 - 5.1/HI/VI")), locale_convert (i))); + } else if (i == 12) { + items.push_back (make_pair (wx_to_std (_("12 - 7.1/HI/VI")), locale_convert (i))); + } else { + items.push_back (make_pair (locale_convert (i), locale_convert (i))); + } + } + + checked_set (choice, items); +} + +wxSplashScreen * +maybe_show_splash () +{ + wxSplashScreen* splash = 0; + try { + wxBitmap bitmap; + boost::filesystem::path p = shared_path () / "splash.png"; + if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { + splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); + wxYield (); + } + } catch (boost::filesystem::filesystem_error& e) { + /* Maybe we couldn't find the splash image; never mind */ + } + + return splash; +} + +double +calculate_mark_interval (double mark_interval) +{ + if (mark_interval > 5) { + mark_interval -= lrint (mark_interval) % 5; + } + if (mark_interval > 10) { + mark_interval -= lrint (mark_interval) % 10; + } + if (mark_interval > 60) { + mark_interval -= lrint (mark_interval) % 60; + } + if (mark_interval > 3600) { + mark_interval -= lrint (mark_interval) % 3600; + } + + if (mark_interval < 1) { + mark_interval = 1; + } + + return mark_interval; +} + + +/** @return false if the task was cancelled */ +bool +display_progress (wxString title, wxString task) +{ + JobManager* jm = JobManager::instance (); + + wxProgressDialog progress (title, task, 100, 0, wxPD_CAN_ABORT); + + bool ok = true; + + while (jm->work_to_do()) { + dcpomatic_sleep (1); + if (!progress.Pulse()) { + /* user pressed cancel */ + BOOST_FOREACH (shared_ptr i, jm->get()) { + i->cancel(); + } + ok = false; + break; + } + } + + return ok; +} + +bool +report_errors_from_last_job (wxWindow* parent) +{ + JobManager* jm = JobManager::instance (); + + DCPOMATIC_ASSERT (!jm->get().empty()); + + shared_ptr last = jm->get().back(); + if (last->finished_in_error()) { + error_dialog(parent, std_to_wx(last->error_summary()) + ".\n", std_to_wx(last->error_details())); + return false; + } + + return true; +}