X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=e90d2f8481d49b3f731a05af42a7e021bebf0ff1;hp=98d69e0db1a1082f1b169042b2b94a83d2c3a31c;hb=e3c78ffdb5e562841e86e6f59a20494159c44de7;hpb=fad8d13cd779a6237feed2c855a46e1a7c66e0ad

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 98d69e0db..e90d2f848 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.
 
@@ -24,16 +24,21 @@
 
 #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 "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>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 using std::string;
@@ -42,6 +47,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 wxStaticText *
 #ifdef __WXOSX__
@@ -55,7 +61,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.
@@ -156,6 +162,7 @@ message_dialog (wxWindow* parent, wxString m)
 	d->Destroy ();
 }
 
+/** @return true if the user answered "yes" */
 bool
 confirm_dialog (wxWindow* parent, wxString m)
 {
@@ -291,6 +298,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)
 {
@@ -360,6 +375,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"));
@@ -454,13 +472,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 = resources_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 */
@@ -504,7 +520,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,18 +534,62 @@ 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());
+int
+get_offsets (vector<Offset>& offsets)
+{
+	offsets.push_back (Offset(_("UTC-11"),  -11,  0));
+	offsets.push_back (Offset(_("UTC-10"),  -10,  0));
+	offsets.push_back (Offset(_("UTC-9"),    -9,  0));
+	offsets.push_back (Offset(_("UTC-8"),    -8,  0));
+	offsets.push_back (Offset(_("UTC-7"),    -7,  0));
+	offsets.push_back (Offset(_("UTC-6"),    -6,  0));
+	offsets.push_back (Offset(_("UTC-5"),    -5,  0));
+	offsets.push_back (Offset(_("UTC-4:30"), -4, 30));
+	offsets.push_back (Offset(_("UTC-4"),    -4,  0));
+	offsets.push_back (Offset(_("UTC-3:30"), -3, 30));
+	offsets.push_back (Offset(_("UTC-3"),    -3,  0));
+	offsets.push_back (Offset(_("UTC-2"),    -2,  0));
+	offsets.push_back (Offset(_("UTC-1"),    -1,  0));
+	int utc = offsets.size();
+	offsets.push_back (Offset(_("UTC")  ,     0,  0));
+	offsets.push_back (Offset(_("UTC+1"),     1,  0));
+	offsets.push_back (Offset(_("UTC+2"),     2,  0));
+	offsets.push_back (Offset(_("UTC+3"),     3,  0));
+	offsets.push_back (Offset(_("UTC+4"),     4,  0));
+	offsets.push_back (Offset(_("UTC+5"),     5,  0));
+	offsets.push_back (Offset(_("UTC+5:30"),  5, 30));
+	offsets.push_back (Offset(_("UTC+6"),     6,  0));
+	offsets.push_back (Offset(_("UTC+7"),     7,  0));
+	offsets.push_back (Offset(_("UTC+8"),     8,  0));
+	offsets.push_back (Offset(_("UTC+9"),     9,  0));
+	offsets.push_back (Offset(_("UTC+9:30"),  9, 30));
+	offsets.push_back (Offset(_("UTC+10"),   10,  0));
+	offsets.push_back (Offset(_("UTC+11"),   11,  0));
+	offsets.push_back (Offset(_("UTC+12"),   12,  0));
+
+	return utc;
+}
+
 
-	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;
+wxString
+bitmap_path (string name)
+{
+	boost::filesystem::path base;
+
+#ifdef DCPOMATIC_DEBUG
+	/* Hack to allow 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
 
-	return true;
+	boost::filesystem::path p = base / String::compose("%1.png", name);
+	return std_to_wx (p.string());
 }
+