#include "nag_dialog.h"
#include "monitor_dialog.h"
#include "check_box.h"
+#include "static_text.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
int r = 0;
add_language_controls (table, r);
- add_play_sound_controls (table, r);
add_update_controls (table, r);
add_label_to_sizer (table, _panel, _("Start player as"), true, wxGBPosition(r, 0));
#endif
};
-class LocationsPage : public StandardPage
+
+/** @class PlayerAdvancedPage
+ * @brief Advanced page of the preferences dialog for the player.
+ */
+class PlayerAdvancedPage : public StockPage
{
public:
- LocationsPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ PlayerAdvancedPage (wxSize panel_size, int border)
+ : StockPage (Kind_Advanced, panel_size, border)
+ , _log_general (0)
+ , _log_warning (0)
+ , _log_error (0)
+ , _log_timing (0)
{}
- wxString GetName () const
- {
- return _("Locations");
- }
-
-#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+private:
+ void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
{
- return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
- }
+ int flags = wxALIGN_TOP | wxTOP | wxLEFT;
+#ifdef __WXOSX__
+ flags |= wxALIGN_RIGHT;
+ text += wxT (":");
#endif
+ wxStaticText* m = new StaticText (parent, text);
+ table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
+ }
-private:
void setup ()
{
-
- int r = 0;
-
- wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
- add_label_to_sizer (table, _panel, _("Content directory"), true, wxGBPosition (r, 0));
- _content_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
- table->Add (_content_directory, wxGBPosition (r, 1));
- ++r;
-
- add_label_to_sizer (table, _panel, _("Playlist directory"), true, wxGBPosition (r, 0));
- _playlist_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
- table->Add (_playlist_directory, wxGBPosition (r, 1));
- ++r;
-
- add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0));
- _kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
- table->Add (_kdm_directory, wxGBPosition (r, 1));
- ++r;
+ {
+ add_top_aligned_label_to_sizer (table, _panel, _("Log"));
+ wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
+ _log_general = new CheckBox (_panel, _("General"));
+ t->Add (_log_general, 1, wxEXPAND | wxALL);
+ _log_warning = new CheckBox (_panel, _("Warnings"));
+ t->Add (_log_warning, 1, wxEXPAND | wxALL);
+ _log_error = new CheckBox (_panel, _("Errors"));
+ t->Add (_log_error, 1, wxEXPAND | wxALL);
+ /// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
+ _log_timing = new CheckBox (_panel, S_("Config|Timing"));
+ t->Add (_log_timing, 1, wxEXPAND | wxALL);
+ table->Add (t, 0, wxALL, 6);
+ }
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0));
- _background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true);
- table->Add (_background_image, wxGBPosition (r, 1));
- ++r;
+#ifdef DCPOMATIC_WINDOWS
+ _win32_console = new CheckBox (_panel, _("Open console window"));
+ table->Add (_win32_console, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
#endif
- _content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this));
- _playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this));
- _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this));
+ _log_general->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+ _log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+ _log_error->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+ _log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
+#ifdef DCPOMATIC_WINDOWS
+ _win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::win32_console_changed, this));
#endif
}
{
Config* config = Config::instance ();
- if (config->player_content_directory()) {
- checked_set (_content_directory, *config->player_content_directory());
- }
- if (config->player_playlist_directory()) {
- checked_set (_playlist_directory, *config->player_playlist_directory());
- }
- if (config->player_kdm_directory()) {
- checked_set (_kdm_directory, *config->player_kdm_directory());
- }
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (config->player_background_image()) {
- checked_set (_background_image, *config->player_background_image());
- }
+ checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
+ checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
+ checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
+ checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
+#ifdef DCPOMATIC_WINDOWS
+ checked_set (_win32_console, config->win32_console());
#endif
}
- void content_directory_changed ()
- {
- Config::instance()->set_player_content_directory(wx_to_std(_content_directory->GetPath()));
- }
-
- void playlist_directory_changed ()
+ void log_changed ()
{
- Config::instance()->set_player_playlist_directory(wx_to_std(_playlist_directory->GetPath()));
- }
-
- void kdm_directory_changed ()
- {
- Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
+ int types = 0;
+ if (_log_general->GetValue ()) {
+ types |= LogEntry::TYPE_GENERAL;
+ }
+ if (_log_warning->GetValue ()) {
+ types |= LogEntry::TYPE_WARNING;
+ }
+ if (_log_error->GetValue ()) {
+ types |= LogEntry::TYPE_ERROR;
+ }
+ if (_log_timing->GetValue ()) {
+ types |= LogEntry::TYPE_TIMING;
+ }
+ Config::instance()->set_log_types (types);
}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- void background_image_changed ()
+#ifdef DCPOMATIC_WINDOWS
+ void win32_console_changed ()
{
- boost::filesystem::path const f = wx_to_std(_background_image->GetPath());
- if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) {
- error_dialog (0, _("Could not load image file."));
- if (Config::instance()->player_background_image()) {
- checked_set (_background_image, *Config::instance()->player_background_image());
- }
- return;
- }
-
- Config::instance()->set_player_background_image(f);
+ Config::instance()->set_win32_console (_win32_console->GetValue ());
}
#endif
- wxDirPickerCtrl* _content_directory;
- wxDirPickerCtrl* _playlist_directory;
- wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- FilePickerCtrl* _background_image;
+ wxCheckBox* _log_general;
+ wxCheckBox* _log_warning;
+ wxCheckBox* _log_error;
+ wxCheckBox* _log_timing;
+#ifdef DCPOMATIC_WINDOWS
+ wxCheckBox* _win32_console;
#endif
};
+
#ifdef DCPOMATIC_VARIANT_SWAROOP
class WatermarkPage : public StandardPage
{
wxPreferencesEditor*
create_player_config_dialog ()
{
- wxPreferencesEditor* e = new wxPreferencesEditor ();
+ wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
#ifdef DCPOMATIC_OSX
/* Width that we force some of the config panels to be on OSX so that
#endif
e->AddPage (new PlayerGeneralPage(wxSize(-1, 500), border));
+ e->AddPage (new SoundPage(ps, border));
e->AddPage (new LocationsPage(ps, border));
e->AddPage (new KeysPage(ps, border));
#ifdef DCPOMATIC_VARIANT_SWAROOP
e->AddPage (new WatermarkPage(ps, border));
e->AddPage (new DevicesPage(ps, border));
#endif
+ e->AddPage (new PlayerAdvancedPage(ps, border));
return e;
}
projects / dcpomatic.git / blobdiff