X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=30e2b739acacd038e8431ca6fcde871ca56aeca3;hp=d163c6938765dcf7bfa2cd7fac382ef2678b319b;hb=2d2af972a53a2c11b95469058803b4eaed2d3c01;hpb=097f4d493bf98fce75200059e7a38eb120ddbb9c diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index d163c6938..30e2b739a 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,35 +18,63 @@ */ + /** @file src/wx/wx_util.h * @brief Some utility functions and classes. */ + #ifndef DCPOMATIC_WX_UTIL_H #define DCPOMATIC_WX_UTIL_H + #include "lib/dcpomatic_time.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include -#include #include #include -#ifdef __WXGTK__ -#include -#endif + class FilePickerCtrl; +class wxDirPickerCtrl; class wxSpinCtrl; class wxSpinCtrlDouble; class wxGridBagSizer; +class wxSplashScreen; +class PasswordEntry; + #define DCPOMATIC_SIZER_X_GAP 8 #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 -/** Spacing to use between buttons in a vertical line */ +/** 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__) #define DCPOMATIC_BUTTON_STACK_GAP 2 #else #define DCPOMATIC_BUTTON_STACK_GAP 0 @@ -56,32 +84,63 @@ class wxGridBagSizer; #define DCPOMATIC_RTAUDIO_API RtAudio::LINUX_PULSE #endif #ifdef DCPOMATIC_WINDOWS -#define DCPOMATIC_RTAUDIO_API RtAudio::WINDOWS_DS +#define DCPOMATIC_RTAUDIO_API RtAudio::UNSPECIFIED #endif #ifdef DCPOMATIC_OSX #define DCPOMATIC_RTAUDIO_API RtAudio::MACOSX_CORE #endif + /** i18n macro to support strings like Context|String * so that `String' can be translated to different things * in different contexts. */ #define S_(x) context_translation(x) -extern void error_dialog (wxWindow *, wxString); + +extern void error_dialog (wxWindow *, wxString, boost::optional e = boost::optional()); extern void message_dialog (wxWindow *, wxString); extern bool confirm_dialog (wxWindow *, wxString); -extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0); +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 *, wxStaticText *, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan); extern std::string wx_to_std (wxString); extern wxString std_to_wx (std::string); extern void dcpomatic_setup_i18n (); extern wxString context_translation (wxString); extern std::string string_client_data (wxClientData* o); -extern wxString time_to_timecode (DCPTime t, double fps); +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 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 wxSize small_button_size (wxWindow* parent, wxString text); +extern bool gui_is_dark (); +extern double dpi_scale_factor (wxWindow* window); + + +struct Offset +{ + Offset (wxString n, int h, int m) + : name (n) + , hour (h) + , minute (m) + {} + + wxString name; + int hour; + int minute; +}; + +extern int get_offsets (std::vector& offsets); + extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value); +extern void checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value); extern void checked_set (wxSpinCtrl* widget, int value); extern void checked_set (wxSpinCtrlDouble* widget, double value); extern void checked_set (wxChoice* widget, int value); @@ -89,6 +148,7 @@ extern void checked_set (wxChoice* widget, std::string value); extern void checked_set (wxChoice* widget, std::vector > items); extern void checked_set (wxTextCtrl* widget, std::string value); extern void checked_set (wxTextCtrl* widget, wxString value); +extern void checked_set (PasswordEntry* widget, std::string value); 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); @@ -98,12 +158,9 @@ extern int wx_get (wxChoice* widget); extern int wx_get (wxSpinCtrl* widget); extern double wx_get (wxSpinCtrlDouble* widget); -/* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04. - This also seems to apply to 2.24.20 in Ubuntu 13.10 and 2.24.23 in Ubuntu 14.04. - Use our own dir picker as this is the least bad option I can think of. -*/ -#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23)) +#if defined(__WXMSW__) #define DCPOMATIC_USE_OWN_PICKER #endif + #endif