X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=003cc222f13ff400b1a64d4f4a06e112ee52a25a;hb=1c13441a19aa387ddd8ac0c972207ccbbe3114d8;hp=5691d341a0eba0ff0bd501c666c5032e050648cb;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 5691d341a..003cc222f 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,9 +24,9 @@ #include #include #include +#include "lib/config.h" +#include "lib/util.h" #include "wx_util.h" -#include "config.h" -#include "util.h" using namespace std; using namespace boost; @@ -35,21 +35,45 @@ using namespace boost; * @param s Sizer to add to. * @param p Parent window for the wxStaticText. * @param t Text for the wxStaticText. + * @param left true if this label is a `left label'; ie the sort + * of label which should be right-aligned on OS X. * @param prop Proportion to pass when calling Add() on the wxSizer. */ wxStaticText * -add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, int prop) +#ifdef __WXOSX__ +add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop) +#else +add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop) +#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, prop, wxALIGN_CENTER_VERTICAL | wxALL, 6); + s->Add (m, prop, flags, 6); return m; } wxStaticText * -add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPosition pos, wxGBSpan span) +#ifdef __WXOSX__ +add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString 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) +#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, wxALIGN_CENTER_VERTICAL | wxALL, 6); + s->Add (m, pos, span, flags); return m; } @@ -81,7 +105,7 @@ confirm_dialog (wxWindow* parent, wxString m) string wx_to_std (wxString s) { - return string (s.mb_str ()); + return string (s.ToUTF8 ()); } /** @param s STL string. @@ -99,10 +123,10 @@ 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, wxString initial, function fn) +ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, boost::function fn) : wxStaticText (parent, wxID_ANY, initial) { - Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this); + Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id); _thread = new thread (bind (&ThreadedStaticText::run, this, fn)); } @@ -115,18 +139,26 @@ ThreadedStaticText::~ThreadedStaticText () /** Run our thread and post the result to the GUI thread via AddPendingEvent */ void -ThreadedStaticText::run (function fn) +ThreadedStaticText::run (boost::function fn) +try { wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id); ev.SetString (std_to_wx (fn ())); GetEventHandler()->AddPendingEvent (ev); } +catch (...) +{ + /* Ignore exceptions; marginally better than the program quitting, but + only marginally. + */ +} /** Called in the GUI thread when our worker thread has finished */ void ThreadedStaticText::thread_finished (wxCommandEvent& ev) { SetLabel (ev.GetString ()); + Finished (); } string @@ -157,6 +189,15 @@ checked_set (wxSpinCtrl* widget, int value) } } +void +checked_set (wxSpinCtrlDouble* widget, double value) +{ + /* XXX: completely arbitrary epsilon */ + if (fabs (widget->GetValue() - value) > 1e-16) { + widget->SetValue (value); + } +} + void checked_set (wxChoice* widget, int value) { @@ -235,13 +276,16 @@ dcpomatic_setup_i18n () locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string())); #endif +#ifdef DCPOMATIC_POSIX + locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX); +#endif + locale->AddCatalog (wxT ("libdcpomatic-wx")); locale->AddCatalog (wxT ("dcpomatic")); if (!locale->IsOk()) { delete locale; locale = new wxLocale (wxLANGUAGE_ENGLISH); - language = wxLANGUAGE_ENGLISH; } } @@ -249,3 +293,39 @@ dcpomatic_setup_i18n () dcpomatic_setup_gettext_i18n (wx_to_std (locale->GetCanonicalName ())); } } + +int +wx_get (wxSpinCtrl* w) +{ + return w->GetValue (); +} + +int +wx_get (wxChoice* w) +{ + return w->GetSelection (); +} + +double +wx_get (wxSpinCtrlDouble* w) +{ + return w->GetValue (); +} + +/** @param s String of the form Context|String + * @return translation, or String if no translation is available. + */ +wxString +context_translation (wxString s) +{ + wxString t = wxGetTranslation (s); + if (t == s) { + /* No translation; strip the context */ + int c = t.Find (wxT ("|")); + if (c != wxNOT_FOUND) { + t = t.Mid (c + 1); + } + } + + return t; +}