X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=5691d341a0eba0ff0bd501c666c5032e050648cb;hb=09a9ac376db005a40a351736bcff4077f098825d;hp=44d9462e504404e1379111eb5effdc59cfb2aac3;hpb=292012d86ffda3c19530ad8e9d8788a51db2b6c5;p=dcpomatic.git diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 44d9462e5..5691d341a 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -22,33 +22,71 @@ */ #include +#include +#include #include "wx_util.h" +#include "config.h" +#include "util.h" using namespace std; using namespace boost; +/** Add a wxStaticText to a wxSizer, aligning it at vertical centre. + * @param s Sizer to add to. + * @param p Parent window for the wxStaticText. + * @param t Text for the wxStaticText. + * @param prop Proportion to pass when calling Add() on the wxSizer. + */ wxStaticText * -add_label_to_sizer (wxSizer* s, wxWindow* p, string t, int prop) +add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, int prop) { - wxStaticText* m = new wxStaticText (p, wxID_ANY, std_to_wx (t)); + wxStaticText* m = new wxStaticText (p, wxID_ANY, t); s->Add (m, prop, wxALIGN_CENTER_VERTICAL | wxALL, 6); return m; } +wxStaticText * +add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPosition pos, wxGBSpan span) +{ + wxStaticText* m = new wxStaticText (p, wxID_ANY, t); + s->Add (m, pos, span, wxALIGN_CENTER_VERTICAL | wxALL, 6); + return m; +} + +/** Pop up an error dialogue box. + * @param parent Parent. + * @param m Message. + */ void -error_dialog (wxWindow* parent, string m) +error_dialog (wxWindow* parent, wxString m) { - wxMessageDialog* d = new wxMessageDialog (parent, std_to_wx (m), wxT ("DVD-o-matic"), wxOK); + wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK); d->ShowModal (); d->Destroy (); } +bool +confirm_dialog (wxWindow* parent, wxString m) +{ + wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxYES_NO | wxICON_QUESTION); + int const r = d->ShowModal (); + d->Destroy (); + return r == wxID_YES; +} + + +/** @param s wxWidgets string. + * @return Corresponding STL string. + */ string wx_to_std (wxString s) { return string (s.mb_str ()); } +/** @param s STL string. + * @return Corresponding wxWidgets string. + */ wxString std_to_wx (string s) { @@ -61,8 +99,8 @@ int const ThreadedStaticText::_update_event_id = 10000; * @param initial Initial text for the wxStaticText while the computation is being run. * @param fn Function which works out what the wxStaticText content should be and returns it. */ -ThreadedStaticText::ThreadedStaticText (wxWindow* parent, string initial, function fn) - : wxStaticText (parent, wxID_ANY, std_to_wx (initial)) +ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function fn) + : wxStaticText (parent, wxID_ANY, initial) { Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this); _thread = new thread (bind (&ThreadedStaticText::run, this, fn)); @@ -75,17 +113,139 @@ ThreadedStaticText::~ThreadedStaticText () delete _thread; } +/** Run our thread and post the result to the GUI thread via AddPendingEvent */ void ThreadedStaticText::run (function fn) { - /* Run the thread and post the result to the GUI thread via AddPendingEvent */ wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id); ev.SetString (std_to_wx (fn ())); GetEventHandler()->AddPendingEvent (ev); } +/** Called in the GUI thread when our worker thread has finished */ void ThreadedStaticText::thread_finished (wxCommandEvent& ev) { SetLabel (ev.GetString ()); } + +string +string_client_data (wxClientData* o) +{ + return wx_to_std (dynamic_cast(o)->GetData()); +} + +void +checked_set (wxFilePickerCtrl* widget, string value) +{ + if (widget->GetPath() != std_to_wx (value)) { + if (value.empty()) { + /* Hack to make wxWidgets clear the control when we are passed + an empty value. + */ + value = " "; + } + widget->SetPath (std_to_wx (value)); + } +} + +void +checked_set (wxSpinCtrl* widget, int value) +{ + if (widget->GetValue() != value) { + widget->SetValue (value); + } +} + +void +checked_set (wxChoice* widget, int value) +{ + if (widget->GetSelection() != value) { + widget->SetSelection (value); + } +} + +void +checked_set (wxChoice* widget, string value) +{ + wxClientData* o = 0; + 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) { + widget->SetSelection (i); + } + } + } +} + +void +checked_set (wxTextCtrl* widget, string value) +{ + if (widget->GetValue() != std_to_wx (value)) { + widget->ChangeValue (std_to_wx (value)); + } +} + +void +checked_set (wxStaticText* widget, string value) +{ + if (widget->GetLabel() != std_to_wx (value)) { + widget->SetLabel (std_to_wx (value)); + } +} + +void +checked_set (wxCheckBox* widget, bool value) +{ + if (widget->GetValue() != value) { + widget->SetValue (value); + } +} + +void +checked_set (wxRadioButton* widget, bool value) +{ + if (widget->GetValue() != value) { + widget->SetValue (value); + } +} + +void +dcpomatic_setup_i18n () +{ + int language = wxLANGUAGE_DEFAULT; + + boost::optional config_lang = Config::instance()->language (); + if (config_lang && !config_lang->empty ()) { + wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ())); + if (li) { + language = li->Language; + } + } + + wxLocale* locale = 0; + if (wxLocale::IsAvailable (language)) { + locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT); + +#ifdef DCPOMATIC_WINDOWS + locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string())); +#endif + + locale->AddCatalog (wxT ("libdcpomatic-wx")); + locale->AddCatalog (wxT ("dcpomatic")); + + if (!locale->IsOk()) { + delete locale; + locale = new wxLocale (wxLANGUAGE_ENGLISH); + language = wxLANGUAGE_ENGLISH; + } + } + + if (locale) { + dcpomatic_setup_gettext_i18n (wx_to_std (locale->GetCanonicalName ())); + } +}