X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=8ac824c508d81d1edc5640de2df33f7a792cfdc2;hb=cddd5a812b0ec2db5dbdd120f6ed115ea9550bbb;hp=464aa17523709865c2d86102db701340e7e62746;hpb=ff5dcaaeff14f4eb8d7cabe7a7af2cf66fa39512;p=dcpomatic.git diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 464aa1752..8ac824c50 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -17,13 +17,14 @@ */ -#ifndef DVDOMATIC_WX_UTIL_H -#define DVDOMATIC_WX_UTIL_H +#ifndef DCPOMATIC_WX_UTIL_H +#define DCPOMATIC_WX_UTIL_H #include #include #include #include +#include #ifdef __WXGTK__ #include #endif @@ -32,17 +33,21 @@ class wxFilePickerCtrl; class wxSpinCtrl; class wxGridBagSizer; +#define DCPOMATIC_SIZER_X_GAP 8 +#define DCPOMATIC_SIZER_Y_GAP 8 +#define DCPOMATIC_DIALOG_BORDER 12 + /** @file src/wx/wx_util.h * @brief Some utility functions and classes. */ extern void error_dialog (wxWindow *, wxString); extern bool confirm_dialog (wxWindow *, wxString); -extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, int prop = 0); -extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, wxGBPosition, wxGBSpan span = wxDefaultSpan); +extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool left, int prop = 0); +extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan); extern std::string wx_to_std (wxString); extern wxString std_to_wx (std::string); -extern void dvdomatic_setup_i18n (); +extern void dcpomatic_setup_i18n (); /** @class ThreadedStaticText * @@ -55,6 +60,9 @@ public: ThreadedStaticText (wxWindow* parent, wxString initial, boost::function fn); ~ThreadedStaticText (); + /** Emitted in the UI thread when the text has been set up */ + boost::signals2::signal Finished; + private: void run (boost::function fn); void thread_finished (wxCommandEvent& ev); @@ -76,11 +84,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 int wx_get (wxChoice* widget); +extern int wx_get (wxSpinCtrl* 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 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) -#define DVDOMATIC_USE_OWN_DIR_PICKER +#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20)) +#define DCPOMATIC_USE_OWN_DIR_PICKER #endif #endif