#include <wx/imaglist.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
#include <boost/foreach.hpp>
using std::exception;
using boost::weak_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
class ContentDialog : public wxDialog, public ContentStore
{
}
overall_sizer->Layout ();
+
+ _config_changed_connection = Config::instance()->Changed.connect(boost::bind(&ContentView::update, _content_view));
}
shared_ptr<Content> selected () const
private:
ContentView* _content_view;
+ boost::signals2::scoped_connection _config_changed_connection;
};
wxImageList* images = new wxImageList (16, 16);
wxIcon tick_icon;
wxIcon no_tick_icon;
-#ifdef DCPOMATIC_OSX
- tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
- no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
-#else
- boost::filesystem::path tick_path = shared_path() / "tick.png";
- tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG);
- boost::filesystem::path no_tick_path = shared_path() / "no_tick.png";
- no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG);
-#endif
+ tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG);
+ no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG);
images->Add (tick_icon);
images->Add (no_tick_icon);
{
optional<boost::filesystem::path> dir = Config::instance()->player_playlist_directory();
if (!dir) {
- error_dialog (this, _("No playlist folder is specified in preferences. Please set on and then try again."));
+ error_dialog (this, _("No playlist folder is specified in preferences. Please set one and then try again."));
return;
}
playlist->write (*dir / (playlist->id() + ".xml"));
unsetenv ("UBUNTU_MENUPROXY");
#endif
-#ifdef __WXOSX__
- ProcessSerialNumber serial;
- GetCurrentProcess (&serial);
- TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+ make_foreground_application ();
#endif
dcpomatic_setup_path_encoding ();