/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "../wx/wx_util.h"
#include "../wx/wx_signal_manager.h"
+#include "../wx/content_view.h"
+#include "../wx/dcpomatic_button.h"
+#include "../wx/about_dialog.h"
+#include "../wx/player_config_dialog.h"
#include "../lib/util.h"
#include "../lib/config.h"
#include "../lib/cross.h"
+#include "../lib/film.h"
+#include "../lib/dcp_content.h"
+#include "../lib/spl_entry.h"
+#include "../lib/spl.h"
#include <wx/wx.h>
#include <wx/listctrl.h>
#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 std::cout;
+using std::string;
+using std::map;
+using std::make_pair;
+using std::vector;
using boost::optional;
+using boost::shared_ptr;
+using boost::weak_ptr;
+using boost::bind;
+using boost::dynamic_pointer_cast;
-class PlaylistEntry
+class ContentDialog : public wxDialog, public ContentStore
{
public:
- std::string name;
- std::string cpl_id;
- dcp::ContentKind kind;
- enum Type {
- DCP,
- ECINEMA
- };
- Type type;
- bool encrypted;
- bool skippable;
- bool disable_timeline;
- bool stop_after_play;
+ ContentDialog (wxWindow* parent)
+ : wxDialog (parent, wxID_ANY, _("Add content"), wxDefaultPosition, wxSize(800, 640))
+ , _content_view (new ContentView(this))
+ {
+ _content_view->update ();
+
+ wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+ SetSizer (overall_sizer);
+
+ overall_sizer->Add (_content_view, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+ if (buttons) {
+ overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+
+ overall_sizer->Layout ();
+ }
+
+ shared_ptr<Content> selected () const
+ {
+ return _content_view->selected ();
+ }
+
+ shared_ptr<Content> get (string digest) const
+ {
+ return _content_view->get (digest);
+ }
+
+private:
+ ContentView* _content_view;
};
-class DOMFrame : public wxFrame
+
+class PlaylistList
{
public:
- explicit DOMFrame (wxString const & title)
- : wxFrame (0, -1, title)
+ PlaylistList (wxPanel* parent, ContentStore* content_store)
+ : _sizer (new wxBoxSizer(wxVERTICAL))
+ , _content_store (content_store)
{
- /* Use a panel as the only child of the Frame so that we avoid
- the dark-grey background on Windows.
- */
- wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
- wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
+ wxStaticText* label = new wxStaticText (parent, wxID_ANY, wxEmptyString);
+ label->SetLabelMarkup (_("<b>Playlists</b>"));
+ _sizer->Add (label, 0, wxTOP | wxLEFT, DCPOMATIC_SIZER_GAP * 2);
_list = new wxListCtrl (
- overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL
+ parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL
+ );
+
+ _list->AppendColumn (_("Name"), wxLIST_FORMAT_LEFT, 840);
+ _list->AppendColumn (_("Length"), wxLIST_FORMAT_LEFT, 100);
+
+ wxBoxSizer* button_sizer = new wxBoxSizer (wxVERTICAL);
+ _new = new Button (parent, _("New"));
+ button_sizer->Add (_new, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+ _delete = new Button (parent, _("Delete"));
+ button_sizer->Add (_delete, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+
+ wxSizer* list = new wxBoxSizer (wxHORIZONTAL);
+ list->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
+ list->Add (button_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
+
+ _sizer->Add (list);
+
+ load_playlists ();
+
+ _list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, bind(&PlaylistList::selection_changed, this));
+ _list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, bind(&PlaylistList::selection_changed, this));
+ _new->Bind (wxEVT_BUTTON, bind(&PlaylistList::new_playlist, this));
+ _delete->Bind (wxEVT_BUTTON, bind(&PlaylistList::delete_playlist, this));
+ }
+
+ wxSizer* sizer ()
+ {
+ return _sizer;
+ }
+
+ shared_ptr<SPL> first_playlist () const
+ {
+ if (_playlists.empty()) {
+ return shared_ptr<SPL>();
+ }
+
+ return _playlists.front ();
+ }
+
+ boost::signals2::signal<void (shared_ptr<SPL>)> Edit;
+
+private:
+ void add_playlist_to_view (shared_ptr<const SPL> playlist)
+ {
+ wxListItem item;
+ item.SetId (_list->GetItemCount());
+ long const N = _list->InsertItem (item);
+ _list->SetItem (N, 0, std_to_wx(playlist->name()));
+ }
+
+ void add_playlist_to_model (shared_ptr<SPL> playlist)
+ {
+ _playlists.push_back (playlist);
+ playlist->NameChanged.connect (bind(&PlaylistList::name_changed, this, weak_ptr<SPL>(playlist)));
+ }
+
+ void name_changed (weak_ptr<SPL> wp)
+ {
+ shared_ptr<SPL> playlist = wp.lock ();
+ if (!playlist) {
+ return;
+ }
+
+ int N = 0;
+ BOOST_FOREACH (shared_ptr<SPL> i, _playlists) {
+ if (i == playlist) {
+ _list->SetItem (N, 0, std_to_wx(i->name()));
+ }
+ ++N;
+ }
+ }
+
+ void load_playlists ()
+ {
+ optional<boost::filesystem::path> path = Config::instance()->player_playlist_directory();
+ if (!path) {
+ return;
+ }
+
+ _list->DeleteAllItems ();
+ _playlists.clear ();
+ for (boost::filesystem::directory_iterator i(*path); i != boost::filesystem::directory_iterator(); ++i) {
+ shared_ptr<SPL> spl(new SPL);
+ try {
+ spl->read (*i, _content_store);
+ add_playlist_to_model (spl);
+ } catch (...) {}
+ }
+
+ BOOST_FOREACH (shared_ptr<SPL> i, _playlists) {
+ add_playlist_to_view (i);
+ }
+ }
+
+ void new_playlist ()
+ {
+ shared_ptr<SPL> spl (new SPL(wx_to_std(_("New Playlist"))));
+ add_playlist_to_model (spl);
+ add_playlist_to_view (spl);
+ _list->SetItemState (_list->GetItemCount() - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+ }
+
+ void delete_playlist ()
+ {
+ long int selected = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected < 0 || selected >= int(_playlists.size())) {
+ return;
+ }
+
+ optional<boost::filesystem::path> dir = Config::instance()->player_playlist_directory();
+ if (!dir) {
+ return;
+ }
+
+ boost::filesystem::remove (*dir / (_playlists[selected]->id() + ".xml"));
+ _list->DeleteItem (selected);
+ _playlists.erase (_playlists.begin() + selected);
+
+ Edit (shared_ptr<SPL>());
+ }
+
+ void selection_changed ()
+ {
+ long int selected = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (selected < 0 || selected >= int(_playlists.size())) {
+ Edit (shared_ptr<SPL>());
+ } else {
+ Edit (_playlists[selected]);
+ }
+ }
+
+ wxBoxSizer* _sizer;
+ wxListCtrl* _list;
+ wxButton* _new;
+ wxButton* _delete;
+ vector<shared_ptr<SPL> > _playlists;
+ ContentStore* _content_store;
+};
+
+
+class PlaylistContent
+{
+public:
+ PlaylistContent (wxPanel* parent, ContentDialog* content_dialog)
+ : _content_dialog (content_dialog)
+ , _sizer (new wxBoxSizer(wxVERTICAL))
+ {
+ wxBoxSizer* title = new wxBoxSizer (wxHORIZONTAL);
+ wxStaticText* label = new wxStaticText (parent, wxID_ANY, wxEmptyString);
+ label->SetLabelMarkup (_("<b>Playlist:</b>"));
+ title->Add (label, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ _name = new wxTextCtrl (parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
+ title->Add (_name, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
+ _sizer->Add (title, 0, wxTOP | wxLEFT, DCPOMATIC_SIZER_GAP * 2);
+
+ wxBoxSizer* list = new wxBoxSizer (wxHORIZONTAL);
+
+ _list = new wxListCtrl (
+ parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL
);
_list->AppendColumn (_("Name"), wxLIST_FORMAT_LEFT, 400);
- _list->AppendColumn (_("CPL"), wxLIST_FORMAT_LEFT, 400);
- _list->AppendColumn (_("Type"), wxLIST_FORMAT_CENTRE, 75);
- _list->AppendColumn (_("Format"), wxLIST_FORMAT_CENTRE, 75);
+ _list->AppendColumn (_("CPL"), wxLIST_FORMAT_LEFT, 350);
+ _list->AppendColumn (_("Type"), wxLIST_FORMAT_LEFT, 100);
_list->AppendColumn (_("Encrypted"), wxLIST_FORMAT_CENTRE, 90);
- _list->AppendColumn (_("Skippable"), wxLIST_FORMAT_CENTRE, 90);
- _list->AppendColumn (_("Disable timeline"), wxLIST_FORMAT_CENTRE, 125);
- _list->AppendColumn (_("Stop after play"), wxLIST_FORMAT_CENTRE, 125);
wxImageList* images = new wxImageList (16, 16);
wxIcon tick_icon;
wxIcon no_tick_icon;
-#ifdef DCPOMATIX_OSX
+#ifdef DCPOMATIC_OSX
tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE);
#else
_list->SetImageList (images, wxIMAGE_LIST_SMALL);
- main_sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
+ list->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 (parent, _("Up"));
+ _down = new Button (parent, _("Down"));
+ _add = new Button (parent, _("Add"));
+ _remove = new Button (parent, _("Remove"));
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);
button_sizer->Add (_remove, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- button_sizer->Add (_save, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- button_sizer->Add (_load, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- main_sizer->Add (button_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
- overall_panel->SetSizer (main_sizer);
+ list->Add (button_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
+
+ _sizer->Add (list);
- _list->Bind (wxEVT_LEFT_DOWN, bind(&DOMFrame::list_left_click, this, _1));
+ _list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, bind(&PlaylistContent::setup_sensitivity, this));
+ _list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, bind(&PlaylistContent::setup_sensitivity, this));
+ _name->Bind (wxEVT_TEXT, bind(&PlaylistContent::name_changed, this));
+ _up->Bind (wxEVT_BUTTON, bind(&PlaylistContent::up_clicked, this));
+ _down->Bind (wxEVT_BUTTON, bind(&PlaylistContent::down_clicked, this));
+ _add->Bind (wxEVT_BUTTON, bind(&PlaylistContent::add_clicked, this));
+ _remove->Bind (wxEVT_BUTTON, bind(&PlaylistContent::remove_clicked, this));
+ }
- PlaylistEntry pe;
- pe.name = "Shit";
- pe.cpl_id = "sh-1t";
- pe.kind = dcp::FEATURE;
- pe.type = PlaylistEntry::ECINEMA;
- pe.encrypted = true;
- pe.disable_timeline = false;
- pe.stop_after_play = true;
- add (pe);
+ wxSizer* sizer ()
+ {
+ return _sizer;
+ }
+ void set (shared_ptr<SPL> playlist)
+ {
+ _playlist = playlist;
+ _list->DeleteAllItems ();
+ if (_playlist) {
+ BOOST_FOREACH (SPLEntry i, _playlist->get()) {
+ add (i);
+ }
+ _name->SetValue (std_to_wx(_playlist->name()));
+ } else {
+ _name->SetValue (wxT(""));
+ }
setup_sensitivity ();
}
+ shared_ptr<SPL> playlist () const
+ {
+ return _playlist;
+ }
+
+
private:
+ void name_changed ()
+ {
+ if (_playlist) {
+ _playlist->set_name (wx_to_std(_name->GetValue()));
+ }
+ }
- void add (PlaylistEntry e)
+ void add (SPLEntry e)
{
wxListItem item;
- item.SetId (0);
+ item.SetId (_list->GetItemCount());
long const N = _list->InsertItem (item);
set_item (N, e);
- _playlist.push_back (e);
}
- void set_item (long N, PlaylistEntry e)
+ void set_item (long N, SPLEntry e)
{
_list->SetItem (N, 0, std_to_wx(e.name));
- _list->SetItem (N, 1, std_to_wx(e.cpl_id));
+ _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 == PlaylistEntry::DCP ? _("DCP") : _("E-cinema"));
- _list->SetItem (N, 4, e.encrypted ? _("Y") : _("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);
+ _list->SetItem (N, 3, e.encrypted ? S_("Question|Y") : S_("Question|N"));
}
void setup_sensitivity ()
{
- int const selected = _list->GetSelectedItemCount ();
- _up->Enable (selected > 0);
- _down->Enable (selected > 0);
- _remove->Enable (selected > 0);
+ bool const have_list = static_cast<bool>(_playlist);
+ int const num_selected = _list->GetSelectedItemCount ();
+ long int selected = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ _name->Enable (have_list);
+ _list->Enable (have_list);
+ _up->Enable (have_list && selected > 0);
+ _down->Enable (have_list && selected != -1 && selected < (_list->GetItemCount() - 1));
+ _add->Enable (have_list);
+ _remove->Enable (have_list && num_selected > 0);
}
- void list_left_click (wxMouseEvent& ev)
+ void add_clicked ()
{
- int flags;
- long item = _list->HitTest (ev.GetPosition(), flags, 0);
- int x = ev.GetPosition().x;
- optional<int> column;
- for (int i = 0; i < _list->GetColumnCount(); ++i) {
- x -= _list->GetColumnWidth (i);
- if (x < 0) {
- column = i;
- break;
+ int const r = _content_dialog->ShowModal ();
+ if (r == wxID_OK) {
+ shared_ptr<Content> content = _content_dialog->selected ();
+ if (content) {
+ SPLEntry e (content);
+ add (e);
+ DCPOMATIC_ASSERT (_playlist);
+ _playlist->add (e);
}
}
+ }
- if (item != -1 && column) {
- switch (*column) {
- case COLUMN_SKIPPABLE:
- _playlist[item].skippable = !_playlist[item].skippable;
- break;
- case COLUMN_DISABLE_TIMELINE:
- _playlist[item].disable_timeline = !_playlist[item].disable_timeline;
- break;
- case COLUMN_STOP_AFTER_PLAY:
- _playlist[item].stop_after_play = !_playlist[item].stop_after_play;
- break;
- default:
- ev.Skip ();
- }
- set_item (item, _playlist[item]);
- } else {
- ev.Skip ();
+ void up_clicked ()
+ {
+ long int s = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s < 1) {
+ return;
}
+
+ DCPOMATIC_ASSERT (_playlist);
+
+ SPLEntry tmp = (*_playlist)[s];
+ (*_playlist)[s] = (*_playlist)[s-1];
+ (*_playlist)[s-1] = tmp;
+
+ set_item (s - 1, (*_playlist)[s-1]);
+ set_item (s, (*_playlist)[s]);
+ }
+
+ void down_clicked ()
+ {
+ long int s = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s > (_list->GetItemCount() - 1)) {
+ return;
+ }
+
+ DCPOMATIC_ASSERT (_playlist);
+
+ SPLEntry tmp = (*_playlist)[s];
+ (*_playlist)[s] = (*_playlist)[s+1];
+ (*_playlist)[s+1] = tmp;
+
+ set_item (s + 1, (*_playlist)[s+1]);
+ set_item (s, (*_playlist)[s]);
+ }
+
+ void remove_clicked ()
+ {
+ long int s = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s == -1) {
+ return;
+ }
+
+ DCPOMATIC_ASSERT (_playlist);
+ _playlist->remove (s);
+ _list->DeleteItem (s);
}
+ ContentDialog* _content_dialog;
+ wxBoxSizer* _sizer;
+ wxTextCtrl* _name;
wxListCtrl* _list;
wxButton* _up;
wxButton* _down;
wxButton* _add;
wxButton* _remove;
- wxButton* _save;
- wxButton* _load;
- std::vector<PlaylistEntry> _playlist;
-
- enum {
- COLUMN_SKIPPABLE = 5,
- COLUMN_DISABLE_TIMELINE = 6,
- COLUMN_STOP_AFTER_PLAY = 7
- };
+ shared_ptr<SPL> _playlist;
+};
+
+
+class DOMFrame : public wxFrame
+{
+public:
+ explicit DOMFrame (wxString const & title)
+ : wxFrame (0, -1, title)
+ , _content_dialog (new ContentDialog(this))
+ {
+ wxMenuBar* bar = new wxMenuBar;
+ setup_menu (bar);
+ SetMenuBar (bar);
+
+ /* Use a panel as the only child of the Frame so that we avoid
+ the dark-grey background on Windows.
+ */
+ wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
+ wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+
+ _playlist_list = new PlaylistList (overall_panel, _content_dialog);
+ _playlist_content = new PlaylistContent (overall_panel, _content_dialog);
+
+ sizer->Add (_playlist_list->sizer());
+ sizer->Add (_playlist_content->sizer());
+
+ overall_panel->SetSizer (sizer);
+
+ _playlist_list->Edit.connect (bind(&DOMFrame::change_playlist, this, _1));
+
+ _playlist_content->set (_playlist_list->first_playlist());
+
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), wxID_ABOUT);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
+ }
+
+private:
+
+ void file_exit ()
+ {
+ /* false here allows the close handler to veto the close request */
+ Close (false);
+ }
+
+ void help_about ()
+ {
+ AboutDialog* d = new AboutDialog (this);
+ d->ShowModal ();
+ d->Destroy ();
+ }
+
+ void edit_preferences ()
+ {
+ if (!_config_dialog) {
+ _config_dialog = create_player_config_dialog ();
+ }
+ _config_dialog->Show (this);
+ }
+
+ void change_playlist (shared_ptr<SPL> playlist)
+ {
+ shared_ptr<SPL> old = _playlist_content->playlist ();
+ if (old) {
+ save_playlist (old);
+ }
+ _playlist_content->set (playlist);
+ }
+
+ void save_playlist (shared_ptr<SPL> playlist)
+ {
+ 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."));
+ return;
+ }
+ playlist->write (*dir / (playlist->id() + ".xml"));
+ }
+
+ void setup_menu (wxMenuBar* m)
+ {
+ wxMenu* file = new wxMenu;
+#ifdef __WXOSX__
+ file->Append (wxID_EXIT, _("&Exit"));
+#else
+ file->Append (wxID_EXIT, _("&Quit"));
+#endif
+
+#ifndef __WXOSX__
+ wxMenu* edit = new wxMenu;
+ edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+#endif
+
+ wxMenu* help = new wxMenu;
+#ifdef __WXOSX__
+ help->Append (wxID_ABOUT, _("About DCP-o-matic"));
+#else
+ help->Append (wxID_ABOUT, _("About"));
+#endif
+
+ m->Append (file, _("&File"));
+#ifndef __WXOSX__
+ m->Append (edit, _("&Edit"));
+#endif
+ m->Append (help, _("&Help"));
+ }
+
+ ContentDialog* _content_dialog;
+ PlaylistList* _playlist_list;
+ PlaylistContent* _playlist_content;
+ wxPreferencesEditor* _config_dialog;
};
/** @class App
unsetenv ("UBUNTU_MENUPROXY");
#endif
- #ifdef __WXOSX__
+#ifdef __WXOSX__
ProcessSerialNumber serial;
GetCurrentProcess (&serial);
TransformProcessType (&serial, kProcessTransformToForegroundApplication);
*/
Config::drop ();
- _frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
+ _frame = new DOMFrame (_("DCP-o-matic Playlist Editor"));
SetTopWindow (_frame);
_frame->Maximize ();
_frame->Show ();
projects / dcpomatic.git / blobdiff