X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=e18cfc5a78117584b7eb542bdb9f848a7a1a9d83;hb=ac9f0b8c968f5bffc60a49ffb71a7c7a248f4e32;hp=97ddd51516420012ebfde3c82852ab8a25c0c0a9;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 97ddd5151..e18cfc5a7 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -28,18 +28,21 @@
 #define DCPOMATIC_WX_UTIL_H
 
 
+#include "wx_ptr.h"
+#include "lib/config.h"
 #include "lib/dcpomatic_time.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-#include <boost/function.hpp>
-#include <boost/thread.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
 
 
 class FilePickerCtrl;
+class LanguageTagWidget;
+class RegionSubtagWidget;
 class wxDirPickerCtrl;
 class wxSpinCtrl;
 class wxSpinCtrlDouble;
@@ -52,6 +55,29 @@ class PasswordEntry;
 #define DCPOMATIC_SIZER_Y_GAP 8
 #define DCPOMATIC_SIZER_GAP 8
 #define DCPOMATIC_DIALOG_BORDER 12
+#ifdef __WXGTK3__
+#define DCPOMATIC_SPIN_CTRL_WIDTH 118
+#else
+#define DCPOMATIC_SPIN_CTRL_WIDTH 56
+#endif
+
+/** Amount by which you need to bottom-pad text next to a checkbox in order
+ *  for the text baselines to be aligned.
+ */
+#ifdef DCPOMATIC_OSX
+#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 2
+#else
+#define DCPOMATIC_CHECKBOX_BOTTOM_PAD 0
+#endif
+
+#define DCPOMATIC_SUBHEADING_TOP_PAD 16
+
+/** Amount by which you need to top-pad a choice to make it line up, in some cases */
+#ifdef DCPOMATIC_OSX
+#define DCPOMATIC_CHOICE_TOP_PAD 1
+#else
+#define DCPOMATIC_CHOICE_TOP_PAD 0
+#endif
 
 /** Spacing to use between buttons in a vertical/horizontal line */
 #if defined(DCPOMATIC_OSX) || defined(__WXGTK3__)
@@ -84,7 +110,7 @@ extern bool confirm_dialog (wxWindow *, wxString);
 extern wxStaticText* create_label (wxWindow* p, wxString t, bool left);
 extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
 extern wxStaticText* add_label_to_sizer (wxSizer *, wxStaticText *, bool left, int prop = 0, int flags = wxLEFT | wxRIGHT);
-extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
+extern wxStaticText* add_label_to_sizer(wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan, bool indent = false);
 extern wxStaticText* add_label_to_sizer (wxGridBagSizer *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
@@ -93,13 +119,17 @@ extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
 extern wxString time_to_timecode (dcpomatic::DCPTime t, double fps);
 extern void setup_audio_channels_choice (wxChoice* choice, int minimum);
-extern wxSplashScreen* maybe_show_splash ();
+extern wx_ptr<wxSplashScreen> maybe_show_splash();
 extern double calculate_mark_interval (double start);
 extern bool display_progress (wxString title, wxString task);
 extern bool report_errors_from_last_job (wxWindow* parent);
 extern wxString bitmap_path (std::string name);
+extern wxString icon_path(std::string name);
 extern wxSize small_button_size (wxWindow* parent, wxString text);
-
+extern bool gui_is_dark ();
+extern double dpi_scale_factor (wxWindow* window);
+extern int search_ctrl_height ();
+extern void report_config_load_failure(wxWindow* parent, Config::LoadFailure what);
 
 struct Offset
 {
@@ -131,12 +161,15 @@ extern void checked_set (wxCheckBox* widget, bool value);
 extern void checked_set (wxRadioButton* widget, bool value);
 extern void checked_set (wxStaticText* widget, std::string value);
 extern void checked_set (wxStaticText* widget, wxString value);
+extern void checked_set(LanguageTagWidget* widget, dcp::LanguageTag value);
+extern void checked_set(LanguageTagWidget* widget, boost::optional<dcp::LanguageTag> value);
+extern void checked_set(RegionSubtagWidget* widget, boost::optional<dcp::LanguageTag::RegionSubtag> value);
 
 extern int wx_get (wxChoice* widget);
 extern int wx_get (wxSpinCtrl* widget);
 extern double wx_get (wxSpinCtrlDouble* widget);
 
-#if defined(__WXMSW__)
+#ifdef DCPOMATIC_WINDOWS
 #define DCPOMATIC_USE_OWN_PICKER
 #endif