X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=28f79431a5147171626e1b45b90d51630b4420c9;hb=3dfe3b92df03eee932f3c92336197559c11a5913;hp=354297d49549f17d522b9771482775db75beb879;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 354297d49..28f79431a 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -25,6 +25,7 @@
 #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"
@@ -43,6 +44,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 wxStaticText *
 #ifdef __WXOSX__
@@ -157,6 +159,7 @@ message_dialog (wxWindow* parent, wxString m)
 	d->Destroy ();
 }
 
+/** @return true if the user answered "yes" */
 bool
 confirm_dialog (wxWindow* parent, wxString m)
 {
@@ -292,6 +295,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)
 {
@@ -361,6 +372,9 @@ dcpomatic_setup_i18n ()
 		   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"));
@@ -455,13 +469,11 @@ maybe_show_splash ()
 {
 	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 */
@@ -505,7 +517,7 @@ display_progress (wxString title, wxString task)
 	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()) {
@@ -518,19 +530,3 @@ display_progress (wxString title, wxString task)
 
 	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;
-}