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

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index c9185ec97..28f79431a 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,18 +24,27 @@
 
 #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"
 #include "lib/cross.h"
+#include "lib/job.h"
 #include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
+#include <wx/progdlg.h>
 #include <wx/filepicker.h>
 #include <boost/thread.hpp>
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::vector;
+using std::pair;
+using boost::shared_ptr;
+using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 wxStaticText *
 #ifdef __WXOSX__
@@ -49,7 +58,7 @@ create_label (wxWindow* p, wxString t, bool)
 		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.
@@ -150,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)
 {
@@ -285,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)
 {
@@ -354,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"));
@@ -448,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 */
@@ -463,12 +482,6 @@ maybe_show_splash ()
 	return splash;
 }
 
-boost::filesystem::path
-path_from_file_dialog (wxFileDialog* dialog, string extension)
-{
-	return boost::filesystem::path(wx_to_std(dialog->GetPath())).replace_extension(extension);
-}
-
 double
 calculate_mark_interval (double mark_interval)
 {
@@ -491,3 +504,29 @@ calculate_mark_interval (double mark_interval)
 
 	return mark_interval;
 }
+
+
+/** @return false if the task was cancelled */
+bool
+display_progress (wxString title, wxString task)
+{
+	JobManager* jm = JobManager::instance ();
+
+	wxProgressDialog progress (title, task, 100, 0, wxPD_CAN_ABORT);
+
+	bool ok = true;
+
+	while (jm->work_to_do()) {
+		dcpomatic_sleep_seconds (1);
+		if (!progress.Pulse()) {
+			/* user pressed cancel */
+			BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+				i->cancel();
+			}
+			ok = false;
+			break;
+		}
+	}
+
+	return ok;
+}