X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=28ac6ab5c5b4bb4bace0bec0020ffd4c82aa1453;hb=HEAD;hp=9d9d4c599ff2862ad164e07931facfedbba6b5de;hpb=d9b398b33716d5f28fd8d6e22cb723c2fbb635a0;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 9d9d4c599..28ac6ab5c 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -25,8 +25,11 @@
 
 
 #include "file_picker_ctrl.h"
+#include "language_tag_widget.h"
 #include "password_entry.h"
+#include "region_subtag_widget.h"
 #include "static_text.h"
+#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/config.h"
 #include "lib/cross.h"
@@ -122,14 +125,14 @@ add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 
 
 wxStaticText *
-add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer(wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span, bool indent)
 {
-	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
+	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT;
 #ifdef __WXOSX__
 	setup_osx_flags (s, left, flags);
 #endif
 	auto m = create_label (p, t, left);
-	s->Add (m, pos, span, flags);
+	s->Add(m, pos, span, flags, indent ? DCPOMATIC_SIZER_X_GAP : 0);
 	return m;
 }
 
@@ -158,14 +161,13 @@ add_label_to_sizer (wxGridBagSizer* s, wxStaticText* t, bool, wxGBPosition pos,
 void
 error_dialog (wxWindow* parent, wxString m, optional<wxString> e)
 {
-	auto d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+	auto d = make_wx<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 ();
 }
 
 
@@ -176,9 +178,8 @@ error_dialog (wxWindow* parent, wxString m, optional<wxString> e)
 void
 message_dialog (wxWindow* parent, wxString m)
 {
-	auto d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
+	auto d = make_wx<wxMessageDialog>(parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
 	d->ShowModal ();
-	d->Destroy ();
 }
 
 
@@ -186,10 +187,8 @@ message_dialog (wxWindow* parent, wxString m)
 bool
 confirm_dialog (wxWindow* parent, wxString m)
 {
-	auto d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxYES_NO | wxICON_QUESTION);
-	int const r = d->ShowModal ();
-	d->Destroy ();
-	return r == wxID_YES;
+	auto d = make_wx<wxMessageDialog>(parent, m, _("DCP-o-matic"), wxYES_NO | wxICON_QUESTION);
+	return d->ShowModal() == wxID_YES;
 }
 
 
@@ -223,14 +222,14 @@ string_client_data (wxClientData* o)
 void
 checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
 {
-	if (widget->GetPath() != std_to_wx (value.string())) {
+	if (widget->path() != value) {
 		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()));
+		widget->set_path(value);
 	}
 }
 
@@ -383,6 +382,33 @@ checked_set (wxRadioButton* widget, bool value)
 }
 
 
+void
+checked_set(LanguageTagWidget* widget, dcp::LanguageTag value)
+{
+	if (widget->get() != value) {
+		widget->set(value);
+	}
+}
+
+
+void
+checked_set(LanguageTagWidget* widget, optional<dcp::LanguageTag> value)
+{
+	if (widget->get() != value) {
+		widget->set(value);
+	}
+}
+
+
+void
+checked_set(RegionSubtagWidget* widget, optional<dcp::LanguageTag::RegionSubtag> value)
+{
+	if (widget->get() != value) {
+		widget->set(value);
+	}
+}
+
+
 void
 dcpomatic_setup_i18n ()
 {
@@ -417,8 +443,9 @@ dcpomatic_setup_i18n ()
 		locale->AddCatalog (wxT ("wxstd3"));
 #endif
 
-		locale->AddCatalog (wxT ("libdcpomatic2-wx"));
-		locale->AddCatalog (wxT ("dcpomatic2"));
+		locale->AddCatalog(wxT("wxstd"));
+		locale->AddCatalog(wxT("libdcpomatic2-wx"));
+		locale->AddCatalog(wxT("dcpomatic2"));
 
 		if (!locale->IsOk()) {
 			delete locale;
@@ -511,10 +538,11 @@ setup_audio_channels_choice (wxChoice* choice, int minimum)
 }
 
 
-wxSplashScreen *
+wxSplashScreen*
 maybe_show_splash ()
 {
 	wxSplashScreen* splash = nullptr;
+
 	try {
 		wxBitmap bitmap;
 		if (bitmap.LoadFile(bitmap_path("splash.png"), wxBITMAP_TYPE_PNG)) {
@@ -528,9 +556,9 @@ maybe_show_splash ()
 			}
 #ifdef DCPOMATIC_WINDOWS
 			/* Having wxSTAY_ON_TOP means error dialogues hide behind the splash screen on Windows, no matter what I try */
-			splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR);
+			splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR);
 #else
-			splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
+			splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, nullptr, -1);
 #endif
 			wxYield ();
 		}
@@ -642,6 +670,10 @@ bitmap_path (string name)
 	} else {
 		base = resources_path();
 	}
+
+	if (!boost::filesystem::exists(base / name)) {
+		base = path / boost::filesystem::path("osx/preferences");
+	}
 #else
 	base = resources_path();
 #endif
@@ -651,6 +683,13 @@ bitmap_path (string name)
 }
 
 
+wxString
+icon_path(string name)
+{
+	return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name));
+}
+
+
 wxSize
 small_button_size (wxWindow* parent, wxString text)
 {