X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.h;h=f0e20be9598b015cb13fb8700220d0dfc3308d18;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=6cb7fd00290e8abf553ceade48d651818e440716;hpb=3d9b5186aa39150e53aef3bab09f4350f85cb885;p=dcpomatic.git

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 6cb7fd002..f0e20be95 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,21 +17,53 @@
 
 */
 
+/** @file src/wx/wx_util.h
+ *  @brief Some utility functions and classes.
+ */
+
+#ifndef DCPOMATIC_WX_UTIL_H
+#define DCPOMATIC_WX_UTIL_H
+
 #include <wx/wx.h>
+#include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#endif
 
 class wxFilePickerCtrl;
 class wxSpinCtrl;
+class wxSpinCtrlDouble;
+class wxGridBagSizer;
 
-/** @file src/wx/wx_util.h
- *  @brief Some utility functions and classes.
+#define DCPOMATIC_SIZER_X_GAP 8
+#define DCPOMATIC_SIZER_Y_GAP 8
+#define DCPOMATIC_SIZER_GAP 8
+#define DCPOMATIC_DIALOG_BORDER 12
+
+/** Spacing to use between buttons in a vertical line */
+#ifdef DCPOMATIC_OSX
+#define DCPOMATIC_BUTTON_STACK_GAP 2
+#else
+#define DCPOMATIC_BUTTON_STACK_GAP 0
+#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 *, std::string);
-extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, std::string, int prop = 0);
+extern void error_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* 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 dcpomatic_setup_i18n ();
+extern wxString context_translation (wxString);
 
 /** @class ThreadedStaticText
  *
@@ -41,9 +73,12 @@ extern wxString std_to_wx (std::string);
 class ThreadedStaticText : public wxStaticText
 {
 public:
-	ThreadedStaticText (wxWindow* parent, std::string initial, boost::function<std::string ()> fn);
+	ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn);
 	~ThreadedStaticText ();
 
+	/** Emitted in the UI thread when the text has been set up */
+	boost::signals2::signal<void()> Finished;
+
 private:
 	void run (boost::function<std::string ()> fn);
 	void thread_finished (wxCommandEvent& ev);
@@ -58,8 +93,24 @@ extern std::string string_client_data (wxClientData* o);
 
 extern void checked_set (wxFilePickerCtrl* widget, std::string value);
 extern void checked_set (wxSpinCtrl* widget, int value);
-extern void checked_set (wxComboBox* widget, int value);
-extern void checked_set (wxComboBox* widget, std::string value);
+extern void checked_set (wxSpinCtrlDouble* widget, double value);
+extern void checked_set (wxChoice* widget, int value);
+extern void checked_set (wxChoice* widget, std::string value);
 extern void checked_set (wxTextCtrl* 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);
+
+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))
+#define DCPOMATIC_USE_OWN_DIR_PICKER
+#endif
+
+#endif