X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=1a537c0875759f16cafe388a1a4f739cb46cde22;hb=6bfda50f36b35a6635e9da7a25f84319ca29d92f;hp=d732e03d305259d37d71b55291afb22146a53da4;hpb=15a5f157f7867a05211ce494d9d86b9c47fdf72b;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index d732e03d3..1a537c087 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,42 @@
 
 #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;
 
+wxStaticText *
+#ifdef __WXOSX__
+create_label (wxWindow* p, wxString t, bool left)
+#else
+create_label (wxWindow* p, wxString t, bool)
+#endif
+{
+#ifdef __WXOSX__
+	if (left) {
+		t += wxT (":");
+	}
+#endif
+	return new StaticText (p, t);
+}
+
 /** Add a wxStaticText to a wxSizer, aligning it at vertical centre.
  *  @param s Sizer to add to.
  *  @param p Parent window for the wxStaticText.
@@ -44,52 +68,80 @@ using dcp::locale_convert;
  *  of label which should be right-aligned on OS X.
  *  @param prop Proportion to pass when calling Add() on the wxSizer.
  */
+wxStaticText *
+add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop, int flags)
+{
+#ifdef __WXOSX__
+	if (left) {
+		flags |= wxALIGN_RIGHT;
+	}
+#endif
+	wxStaticText* m = create_label (p, t, left);
+	s->Add (m, prop, flags, 6);
+	return m;
+}
+
 wxStaticText *
 #ifdef __WXOSX__
-add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop)
+add_label_to_sizer (wxSizer* s, wxStaticText* t, bool left, int prop, int flags)
 #else
-add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
+add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 #endif
+{
+#ifdef __WXOSX__
+	if (left) {
+		flags |= wxALIGN_RIGHT;
+	}
+#endif
+	s->Add (t, prop, flags, 6);
+	return t;
+}
+
+wxStaticText *
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
 	if (left) {
 		flags |= wxALIGN_RIGHT;
-		t += wxT (":");
 	}
 #endif
-	wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
-	s->Add (m, prop, flags, 6);
+	wxStaticText* m = create_label (p, t, left);
+	s->Add (m, pos, span, flags);
 	return m;
 }
 
 wxStaticText *
 #ifdef __WXOSX__
-add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxStaticText* t, bool left, wxGBPosition pos, wxGBSpan span)
 #else
-add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxStaticText* t, bool, wxGBPosition pos, wxGBSpan span)
 #endif
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
 	if (left) {
 		flags |= wxALIGN_RIGHT;
-		t += wxT (":");
 	}
 #endif
-	wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
-	s->Add (m, pos, span, flags);
-	return m;
+	s->Add (t, pos, span, flags);
+	return t;
 }
 
 /** Pop up an error dialogue box.
  *  @param parent Parent.
  *  @param m Message.
+ *  @param e Extended message.
  */
 void
-error_dialog (wxWindow* parent, wxString m)
+error_dialog (wxWindow* parent, wxString m, optional<wxString> e)
 {
 	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+	if (e) {
+		wxString em = *e;
+		em[0] = wxToupper (em[0]);
+		d->SetExtendedMessage (em);
+	}
 	d->ShowModal ();
 	d->Destroy ();
 }
@@ -106,6 +158,7 @@ message_dialog (wxWindow* parent, wxString m)
 	d->Destroy ();
 }
 
+/** @return true if the user answered "yes" */
 bool
 confirm_dialog (wxWindow* parent, wxString m)
 {
@@ -154,6 +207,20 @@ checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
 	}
 }
 
+void
+checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value)
+{
+	if (widget->GetPath() != std_to_wx (value.string())) {
+		if (value.empty()) {
+			/* Hack to make wxWidgets clear the control when we are passed
+			   an empty value.
+			*/
+			value = " ";
+		}
+		widget->SetPath (std_to_wx (value.string()));
+	}
+}
+
 void
 checked_set (wxSpinCtrl* widget, int value)
 {
@@ -227,6 +294,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)
 {
@@ -296,6 +371,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"));
@@ -390,13 +468,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 */
@@ -405,8 +481,67 @@ maybe_show_splash ()
 	return splash;
 }
 
-boost::filesystem::path
-path_from_file_dialog (wxFileDialog* dialog, string extension)
+double
+calculate_mark_interval (double mark_interval)
 {
-	return boost::filesystem::path(wx_to_std(dialog->GetPath())).replace_extension(extension);
+	if (mark_interval > 5) {
+		mark_interval -= lrint (mark_interval) % 5;
+	}
+	if (mark_interval > 10) {
+		mark_interval -= lrint (mark_interval) % 10;
+	}
+	if (mark_interval > 60) {
+		mark_interval -= lrint (mark_interval) % 60;
+	}
+	if (mark_interval > 3600) {
+		mark_interval -= lrint (mark_interval) % 3600;
+	}
+
+	if (mark_interval < 1) {
+		mark_interval = 1;
+	}
+
+	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 (1);
+		if (!progress.Pulse()) {
+			/* user pressed cancel */
+			BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+				i->cancel();
+			}
+			ok = false;
+			break;
+		}
+	}
+
+	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;
 }