#include "../wx/wx_util.h"
#include "../wx/wx_signal_manager.h"
#include "../wx/content_view.h"
+#include "../wx/dcpomatic_button.h"
#include "../lib/util.h"
#include "../lib/config.h"
#include "../lib/cross.h"
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/imaglist.h>
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
using std::exception;
using std::cout;
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
{
public:
- ContentDialog (wxWindow* parent, weak_ptr<Film> film)
+ ContentDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Add content"), wxDefaultPosition, wxSize(800, 640))
, _content_view (new ContentView(this))
{
public:
explicit DOMFrame (wxString const & title)
: wxFrame (0, -1, title)
- /* XXX: this is a bit of a hack, but we need it to be able to use the Content class hierarchy */
- , _film (new Film(optional<boost::filesystem::path>()))
- , _content_dialog (new ContentDialog(this, _film))
+ , _content_dialog (new ContentDialog(this))
{
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
main_sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
wxBoxSizer* button_sizer = new wxBoxSizer (wxVERTICAL);
- _up = new wxButton (overall_panel, wxID_ANY, _("Up"));
- _down = new wxButton (overall_panel, wxID_ANY, _("Down"));
- _add = new wxButton (overall_panel, wxID_ANY, _("Add"));
- _remove = new wxButton (overall_panel, wxID_ANY, _("Remove"));
- _save = new wxButton (overall_panel, wxID_ANY, _("Save playlist"));
- _load = new wxButton (overall_panel, wxID_ANY, _("Load playlist"));
+ _up = new Button (overall_panel, _("Up"));
+ _down = new Button (overall_panel, _("Down"));
+ _add = new Button (overall_panel, _("Add"));
+ _remove = new Button (overall_panel, _("Remove"));
+ _save = new Button (overall_panel, _("Save playlist"));
+ _load = new Button (overall_panel, _("Load playlist"));
button_sizer->Add (_up, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
button_sizer->Add (_down, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
button_sizer->Add (_add, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
item.SetId (_list->GetItemCount());
long const N = _list->InsertItem (item);
set_item (N, e);
- _playlist.add (e);
}
void selection_changed ()
_list->SetItem (N, 1, std_to_wx(e.id));
_list->SetItem (N, 2, std_to_wx(dcp::content_kind_to_string(e.kind)));
_list->SetItem (N, 3, e.type == SPLEntry::DCP ? _("DCP") : _("E-cinema"));
- _list->SetItem (N, 4, e.encrypted ? _("Y") : _("N"));
+ _list->SetItem (N, 4, e.encrypted ? S_("Question|Y") : S_("Question|N"));
_list->SetItem (N, COLUMN_SKIPPABLE, wxEmptyString, e.skippable ? 0 : 1);
_list->SetItem (N, COLUMN_DISABLE_TIMELINE, wxEmptyString, e.disable_timeline ? 0 : 1);
_list->SetItem (N, COLUMN_STOP_AFTER_PLAY, wxEmptyString, e.stop_after_play ? 0 : 1);
if (r == wxID_OK) {
shared_ptr<Content> content = _content_dialog->selected ();
if (content) {
- add (SPLEntry(content));
+ SPLEntry e (content);
+ add (e);
+ _playlist.add (e);
}
}
}
void save_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+ Config* c = Config::instance ();
+ wxString default_dir = c->player_playlist_directory() ? std_to_wx(c->player_playlist_directory()->string()) : wxString(wxEmptyString);
+ wxFileDialog* d = new wxFileDialog (this, _("Select playlist file"), default_dir, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (d->ShowModal() == wxID_OK) {
- _playlist.write (wx_to_std(d->GetPath()));
+ boost::filesystem::path file = wx_to_std (d->GetPath());
+ file.replace_extension (".xml");
+ _playlist.write (file);
}
}
void load_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select playlist file"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"));
+ Config* c = Config::instance ();
+ wxString default_dir = c->player_playlist_directory() ? std_to_wx(c->player_playlist_directory()->string()) : wxString(wxEmptyString);
+ wxFileDialog* d = new wxFileDialog (this, _("Select playlist file"), default_dir, wxEmptyString, wxT("XML files (*.xml)|*.xml"));
if (d->ShowModal() == wxID_OK) {
_list->DeleteAllItems ();
- if (!_playlist.read (wx_to_std(d->GetPath()), _content_dialog)) {
+ _playlist.read (wx_to_std(d->GetPath()), _content_dialog);
+ if (!_playlist.missing()) {
+ _list->DeleteAllItems ();
BOOST_FOREACH (SPLEntry i, _playlist.get()) {
add (i);
}
wxButton* _remove;
wxButton* _save;
wxButton* _load;
- boost::shared_ptr<Film> _film;
SPL _playlist;
ContentDialog* _content_dialog;
unsetenv ("UBUNTU_MENUPROXY");
#endif
- #ifdef __WXOSX__
+#ifdef __WXOSX__
ProcessSerialNumber serial;
GetCurrentProcess (&serial);
TransformProcessType (&serial, kProcessTransformToForegroundApplication);