X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=6eef0d14795020f0cab6481e76e98ba9687e6567;hb=581797d640af1572f884ddf4395924894b745b3a;hp=d2f463b73ea47dcc7f2792f64e88083235659c2e;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index d2f463b73..6eef0d147 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -517,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()) {
@@ -531,18 +531,39 @@ 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;
+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;
 }