/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "lib/util.h"
#include "lib/cross.h"
#include "lib/job.h"
+#include "lib/warnings.h"
#include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/splash.h>
#include <wx/progdlg.h>
#include <wx/filepicker.h>
+#include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
using std::string;
using std::vector;
using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using dcp::locale_convert;
using namespace dcpomatic;
return new StaticText (p, t);
}
+
+#ifdef __WXOSX__
+static
+void
+setup_osx_flags (wxSizer* s, bool left, int& flags)
+{
+ if (left) {
+ auto box = dynamic_cast<wxBoxSizer*>(s);
+ if (!box || box->GetOrientation() != wxHORIZONTAL) {
+ flags |= wxALIGN_RIGHT;
+ }
+ }
+}
+#endif
+
+
/** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
* @param s Sizer to add to.
* @param p Parent window for the wxStaticText.
add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop, int flags)
{
#ifdef __WXOSX__
- if (left) {
- flags |= wxALIGN_RIGHT;
- }
+ setup_osx_flags (s, left, flags);
#endif
- wxStaticText* m = create_label (p, t, left);
+ auto m = create_label (p, t, left);
s->Add (m, prop, flags, 6);
return m;
}
#endif
{
#ifdef __WXOSX__
- if (left) {
- flags |= wxALIGN_RIGHT;
- }
+ setup_osx_flags (s, left, flags);
#endif
s->Add (t, prop, flags, 6);
return t;
{
int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
#ifdef __WXOSX__
- if (left) {
- flags |= wxALIGN_RIGHT;
- }
+ setup_osx_flags (s, left, flags);
#endif
- wxStaticText* m = create_label (p, t, left);
+ auto m = create_label (p, t, left);
s->Add (m, pos, span, flags);
return m;
}
{
int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
#ifdef __WXOSX__
- if (left) {
- flags |= wxALIGN_RIGHT;
- }
+ setup_osx_flags (s, left, flags);
#endif
s->Add (t, pos, span, flags);
return t;
void
error_dialog (wxWindow* parent, wxString m, optional<wxString> e)
{
- wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+ auto d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
if (e) {
wxString em = *e;
em[0] = wxToupper (em[0]);
void
message_dialog (wxWindow* parent, wxString m)
{
- wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
+ auto d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
d->ShowModal ();
d->Destroy ();
}
void
checked_set (wxChoice* widget, string value)
{
- wxClientData* o = 0;
+ wxClientData* o = nullptr;
if (widget->GetSelection() != -1) {
o = widget->GetClientObject (widget->GetSelection ());
}
}
widget->Clear ();
- for (vector<pair<string, string> >::const_iterator i = items.begin(); i != items.end(); ++i) {
- widget->Append (std_to_wx (i->first), new wxStringClientData (std_to_wx (i->second)));
+ for (auto i: items) {
+ widget->Append (std_to_wx(i.first), new wxStringClientData(std_to_wx(i.second)));
}
}
{
int language = wxLANGUAGE_DEFAULT;
- boost::optional<string> config_lang = Config::instance()->language ();
+ auto config_lang = Config::instance()->language ();
if (config_lang && !config_lang->empty ()) {
- wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ()));
+ auto const li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ()));
if (li) {
language = li->Language;
}
}
- wxLocale* locale = 0;
+ wxLocale* locale = nullptr;
if (wxLocale::IsAvailable (language)) {
locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
wxString
context_translation (wxString s)
{
- wxString t = wxGetTranslation (s);
+ auto t = wxGetTranslation (s);
if (t == s) {
/* No translation; strip the context */
int c = t.Find (wxT ("|"));
wxString
time_to_timecode (DCPTime t, double fps)
{
- double w = t.seconds ();
+ auto w = t.seconds ();
int const h = (w / 3600);
w -= h * 3600;
int const m = (w / 60);
checked_set (choice, items);
}
+
wxSplashScreen *
maybe_show_splash ()
{
- wxSplashScreen* splash = 0;
+ wxSplashScreen* splash = nullptr;
try {
wxBitmap bitmap;
- boost::filesystem::path p = shared_path () / "splash.png";
- if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
+ if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
+#ifdef DCPOMATIC_WINDOWS
+ /* Having wxSTAY_ON_TOP means error dialogues hide behind the splash screen on Windows, no matter what I try */
+ splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR);
+#else
splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
+#endif
wxYield ();
}
} catch (boost::filesystem::filesystem_error& e) {
bool
display_progress (wxString title, wxString task)
{
- JobManager* jm = JobManager::instance ();
+ auto jm = JobManager::instance ();
wxProgressDialog progress (title, task, 100, 0, wxPD_CAN_ABORT);
dcpomatic_sleep_seconds (1);
if (!progress.Pulse()) {
/* user pressed cancel */
- BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+ for (auto i: jm->get()) {
i->cancel();
}
ok = false;
return utc;
}
+
+
+wxString
+bitmap_path (string name)
+{
+ boost::filesystem::path base;
+
+#ifdef DCPOMATIC_DEBUG
+ /* Hack to allow Linux and OS X to find icons when running from the source tree */
+ char* path = getenv ("DCPOMATIC_GRAPHICS");
+ if (path) {
+ base = path;
+ } else {
+ base = resources_path();
+ }
+#else
+ base = resources_path();
+#endif
+
+ boost::filesystem::path p = base / String::compose("%1.png", name);
+ return std_to_wx (p.string());
+}
+
+
+wxSize
+small_button_size (wxWindow* parent, wxString text)
+{
+ wxClientDC dc (parent);
+ auto size = dc.GetTextExtent (text);
+ size.SetHeight (-1);
+ size.IncBy (24, 0);
+ return size;
+}
+