/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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"
using boost::shared_ptr;
using boost::optional;
using dcp::locale_convert;
+using namespace dcpomatic;
wxStaticText *
#ifdef __WXOSX__
t += wxT (":");
}
#endif
- return new wxStaticText (p, wxID_ANY, t);
+ return new StaticText (p, t);
}
/** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
d->Destroy ();
}
+/** @return true if the user answered "yes" */
bool
confirm_dialog (wxWindow* parent, wxString m)
{
}
}
+void
+checked_set (PasswordEntry* entry, string value)
+{
+ if (entry->get() != value) {
+ entry->set(value);
+ }
+}
+
void
checked_set (wxTextCtrl* widget, wxString value)
{
of wxWidgets.
*/
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"));
{
wxSplashScreen* splash = 0;
try {
- if (!Config::have_existing ("config.xml")) {
- 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 ();
- }
+ 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 */
bool ok = true;
while (jm->work_to_do()) {
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
if (!progress.Pulse()) {
/* user pressed cancel */
BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
return ok;
}
-
-bool
-report_errors_from_last_job (wxWindow* parent)
-{
- JobManager* jm = JobManager::instance ();
-
- DCPOMATIC_ASSERT (!jm->get().empty());
-
- shared_ptr<Job> 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;
-}