</para>
</section>
-<!-- ============================================================== -->
-<section>
-<title>‘Simple’ and ‘Full’ modes</title>
-
-<para>When you start DCP-o-matic for the first time it will ask you if
-you want to use ‘simple’ or ‘full’ mode.
-</para>
-
-<para>The difference between these two is that some of DCP-o-matic's
-more complex or less-used controls are hidden from view in
-‘Simple’ mode. This makes the interface simpler to
-navigate. You may wish to choose this mode if you do not have much
-experience with DCP or video processing.
-</para>
-
-<para>Even if you choose ‘Simple’ mode you can always go
-back to ‘Full’ mode by changing the <guilabel>Interface
-complexity</guilabel> setting in the <guilabel>General</guilabel> tab
-of <guilabel>Preferences</guilabel>.
-</para>
-
-<para>
-All the screenshots in this manual are from a copy of DCP-o-matic in ‘Full’ mode.
-</para>
-
-</section>
-
</chapter>
_christie_password = optional<string>();
_gdc_username = optional<string>();
_gdc_password = optional<string>();
- _interface_complexity = INTERFACE_SIMPLE;
_player_mode = PLAYER_MODE_WINDOW;
_image_display = 0;
_video_view_type = VIDEO_VIEW_SIMPLE;
_gdc_username = f.optional_string_child("GDCUsername");
_gdc_password = f.optional_string_child("GDCPassword");
- optional<string> ic = f.optional_string_child("InterfaceComplexity");
- if (ic && *ic == "full") {
- _interface_complexity = INTERFACE_FULL;
- }
optional<string> pm = f.optional_string_child("PlayerMode");
if (pm && *pm == "window") {
_player_mode = PLAYER_MODE_WINDOW;
root->add_child("GDCPassword")->add_child_text(*_gdc_password);
}
- /* [XML] InterfaceComplexity <code>simple</code> for the reduced interface or <code>full</code> for the full interface. */
- switch (_interface_complexity) {
- case INTERFACE_SIMPLE:
- root->add_child("InterfaceComplexity")->add_child_text("simple");
- break;
- case INTERFACE_FULL:
- root->add_child("InterfaceComplexity")->add_child_text("full");
- break;
- }
-
/* [XML] PlayerMode <code>window</code> for a single window, <code>full</code> for full-screen and <code>dual</code> for full screen playback
with controls on another monitor.
*/
DKDM_RECIPIENTS,
SOUND,
SOUND_OUTPUT,
- INTERFACE_COMPLEXITY,
PLAYER_CONTENT_DIRECTORY,
PLAYER_PLAYLIST_DIRECTORY,
PLAYER_DEBUG_LOG,
NAG_ENCRYPTED_METADATA,
NAG_ALTER_DECRYPTION_CHAIN,
NAG_BAD_SIGNER_CHAIN,
- /* Not really a nag but it's the same idea */
- NAG_INITIAL_SETUP,
NAG_IMPORT_DECRYPTION_CHAIN,
NAG_DELETE_DKDM,
NAG_32_ON_64,
return _gdc_password;
}
- enum Interface {
- INTERFACE_SIMPLE,
- INTERFACE_FULL
- };
-
- Interface interface_complexity () const {
- return _interface_complexity;
- }
-
enum PlayerMode {
PLAYER_MODE_WINDOW, ///< one window containing image and controls
PLAYER_MODE_FULL, ///< just the image filling the screen
maybe_set (_gdc_password, boost::optional<std::string>());
}
- void set_interface_complexity (Interface i) {
- maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
- }
-
void set_player_mode (PlayerMode m) {
maybe_set (_player_mode, m);
}
boost::optional<std::string> _christie_password;
boost::optional<std::string> _gdc_username;
boost::optional<std::string> _gdc_password;
- Interface _interface_complexity;
PlayerMode _player_mode;
int _image_display;
VideoViewType _video_view_type;
#include "wx/paste_dialog.h"
#include "wx/focus_manager.h"
#include "wx/html_dialog.h"
-#include "wx/initial_setup_dialog.h"
#include "wx/send_i18n_dialog.h"
#include "wx/i18n_hook.h"
#include "lib/film.h"
_frame->Maximize ();
close_splash ();
- if (!Config::instance()->nagged(Config::NAG_INITIAL_SETUP)) {
- InitialSetupDialog* d = new InitialSetupDialog ();
- d->ShowModal ();
- d->Destroy ();
- Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
- }
-
if (running_32_on_64 ()) {
NagDialog::maybe_nag (
_frame, Config::NAG_32_ON_64,
void
AudioPanel::add_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
- _reference->Show (full);
- _reference_note->Show (full);
-
- if (full) {
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
- reference_sizer->Add (_reference, 0);
- reference_sizer->Add (_reference_note, 0);
- _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
- ++r;
- }
+ wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+ reference_sizer->Add (_reference, 0);
+ reference_sizer->Add (_reference_note, 0);
+ _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
+ ++r;
_grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
_grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
_grid->Add (s, wxGBPosition(r, 1));
}
- _gain_calculate_button->Show (full);
-
- if (full) {
- _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
- }
-
- _delay_label->Show (full);
- _delay->show (full);
- _delay_ms_label->Show (full);
+ _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ ++r;
- if (full) {
- add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition(r, 1));
- ++r;
- }
+ add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
+ _grid->Add (s, wxGBPosition(r, 1));
+ ++r;
}
AudioPanel::~AudioPanel ()
_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_sizer->Add (_grid, 0, wxALL, 8);
-
- _config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
-}
-
-void
-ContentSubPanel::config_changed (Config::Property p)
-{
- if (p == Config::INTERFACE_COMPLEXITY) {
- _grid->Clear ();
- add_to_grid ();
- _sizer->Layout ();
- _grid->Layout ();
- }
}
void
note->Wrap (400);
- if (cannot.IsEmpty() || Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
+ if (cannot.IsEmpty()) {
note->Hide ();
} else {
note->Show ();
#define DCPOMATIC_CONTENT_SUB_PANEL_H
#include "lib/film.h"
-#include "lib/config.h"
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
wxSizer* _sizer;
wxGridBagSizer* _grid;
wxString _name;
-
-private:
- void config_changed (Config::Property);
- boost::signals2::scoped_connection _config_connection;
};
#endif
void
DCPPanel::add_to_grid ()
{
- Config::Interface interface = Config::instance()->interface_complexity ();
-
int r = 0;
add_label_to_sizer (_grid, _name_label, true, wxGBPosition (r, 0));
flags |= wxALIGN_RIGHT;
#endif
- bool const full = interface == Config::INTERFACE_FULL;
-
- _use_isdcf_name->Show (full);
- _edit_isdcf_button->Show (full);
- _copy_isdcf_name_button->Show (full);
-
- if (full) {
- _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
- _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
- }
- ++r;
+ _grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
+ {
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+ s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
+ _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
}
+ ++r;
_grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
++r;
_grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
+ add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0));
+ _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ ++r;
- _reels_label->Show (full);
- _reel_type->Show (full);
- _reel_length_label->Show (full);
- _reel_length->Show (full);
- _reel_length_gb_label->Show (full);
- _standard_label->Show (full);
- _standard->Show (full);
- _markers->Show (full);
- _metadata->Show (full);
- _reencode_j2k->Show (full);
- _encrypted->Show (full);
-
- if (full) {
- add_label_to_sizer (_grid, _reels_label, true, wxGBPosition (r, 0));
- _grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
-
- add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition (r, 0));
- {
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_reel_length);
- add_label_to_sizer (s, _reel_length_gb_label, false);
- _grid->Add (s, wxGBPosition (r, 1));
- }
- ++r;
+ add_label_to_sizer (_grid, _reel_length_label, true, wxGBPosition (r, 0));
+ {
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_reel_length);
+ add_label_to_sizer (s, _reel_length_gb_label, false);
+ _grid->Add (s, wxGBPosition (r, 1));
+ }
+ ++r;
- add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0));
- _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
+ add_label_to_sizer (_grid, _standard_label, true, wxGBPosition (r, 0));
+ _grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ ++r;
- wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL);
- extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- _grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2));
- ++r;
- }
+ wxBoxSizer* extra = new wxBoxSizer (wxHORIZONTAL);
+ extra->Add (_markers, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+ extra->Add (_metadata, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+ _grid->Add (extra, wxGBPosition(r, 0), wxGBSpan(1, 2));
+ ++r;
}
void
_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
setup_frame_rate_widget ();
- if (p == Config::INTERFACE_COMPLEXITY) {
- _grid->Clear ();
- add_to_grid ();
- _sizer->Layout ();
- _grid->Layout ();
-
- _video_grid->Clear ();
- add_video_panel_to_grid ();
- _video_grid->Layout ();
-
- _audio_grid->Clear ();
- add_audio_panel_to_grid ();
- _audio_grid->Layout ();
- } else if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
+ if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
_audio_processor->Clear ();
add_audio_processors ();
if (_film) {
void
DCPPanel::add_video_panel_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
add_label_to_sizer (_video_grid, _container_label, true, wxGBPosition (r, 0));
_video_grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _j2k_bandwidth_label->Show (full);
- _j2k_bandwidth->Show (full);
- _mbits_label->Show (full);
-
- if (full) {
- add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_j2k_bandwidth, 1);
- add_label_to_sizer (s, _mbits_label, false);
- _video_grid->Add (s, wxGBPosition (r, 1));
- ++r;
- _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2));
- }
+ add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_j2k_bandwidth, 1);
+ add_label_to_sizer (s, _mbits_label, false);
+ _video_grid->Add (s, wxGBPosition (r, 1));
+ ++r;
+ _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2));
}
int
void
DCPPanel::add_audio_panel_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
- _channels_label->Show (full);
- _audio_channels->Show (full);
-
- if (full) {
- add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0));
- _audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
- ++r;
- }
-
- _processor_label->Show (full);
- _audio_processor->Show (full);
+ add_label_to_sizer (_audio_grid, _channels_label, true, wxGBPosition (r, 0));
+ _audio_grid->Add (_audio_channels, wxGBPosition (r, 1));
+ ++r;
- if (full) {
- add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0));
- _audio_grid->Add (_audio_processor, wxGBPosition (r, 1));
- ++r;
- }
+ add_label_to_sizer (_audio_grid, _processor_label, true, wxGBPosition (r, 0));
+ _audio_grid->Add (_audio_processor, wxGBPosition (r, 1));
+ ++r;
_audio_grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
int r = 0;
add_language_controls (table, r);
- add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
- _interface_complexity = new wxChoice (_panel, wxID_ANY);
- table->Add (_interface_complexity, wxGBPosition (r, 1));
- ++r;
-
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_master_encoding_threads, wxGBPosition (r, 1));
_config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
- _interface_complexity->Append (_("Simple"));
- _interface_complexity->Append (_("Full"));
- _interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
-
_master_encoding_threads->SetRange (1, 128);
_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
{
Config* config = Config::instance ();
- switch (config->interface_complexity()) {
- case Config::INTERFACE_SIMPLE:
- checked_set (_interface_complexity, 0);
- break;
- case Config::INTERFACE_FULL:
- checked_set (_interface_complexity, 1);
- break;
- }
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
d->Destroy ();
}
- void interface_complexity_changed ()
- {
- if (_interface_complexity->GetSelection() == 0) {
- Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
- } else {
- Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
- }
- }
-
-
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
{
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
- wxChoice* _interface_complexity;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
+++ /dev/null
-/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
- This file is part of DCP-o-matic.
-
- DCP-o-matic is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- DCP-o-matic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "initial_setup_dialog.h"
-#include "static_text.h"
-#include "lib/config.h"
-#include <boost/bind.hpp>
-
-InitialSetupDialog::InitialSetupDialog ()
- : wxDialog (0, wxID_ANY, _("DCP-o-matic setup"))
-{
- wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- wxStaticText* text1 = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(600, -1));
- sizer->Add (text1, 1, wxEXPAND | wxALL, 12);
-
- text1->SetLabelMarkup (
- _(
- "<span weight=\"bold\" size=\"larger\">Welcome to DCP-o-matic!</span>\n\n"
- "DCP-o-matic can work in two modes: '<i>simple</i>' or '<i>full</i>'.\n\n"
- "<i>Simple mode</i> is ideal for producing straightforward DCPs without too many confusing "
- "options.\n\n"
- "<i>Full mode</i> gives you the most control over the DCPs you make.\n\n"
- "Please choose which mode you would like to start DCP-o-matic in:"
- )
- );
-
- wxBoxSizer* mode_sizer = new wxBoxSizer (wxVERTICAL);
-
- _simple = new wxRadioButton (this, wxID_ANY, _("Simple mode"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- mode_sizer->Add (_simple, 0, wxTOP, 12);
- _full = new wxRadioButton (this, wxID_ANY, _("Full mode"));
- mode_sizer->Add (_full, 0, wxTOP, 8);
-
- sizer->Add (mode_sizer, 0, wxLEFT, 24);
-
- if (Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
- _simple->SetValue (true);
- } else {
- _full->SetValue (true);
- }
-
- wxStaticText* text2 = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
- sizer->Add (text2, 0, wxEXPAND | wxALL, 12);
-
- text2->SetLabel (_("\nYou can change the mode at any time from the General page of Preferences."));
-
- _simple->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));
- _full->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));
-
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
- if (buttons) {
- sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
- }
-
- sizer->Layout ();
- SetSizerAndFit (sizer);
-}
-
-void
-InitialSetupDialog::interface_complexity_changed ()
-{
- if (_simple->GetValue()) {
- Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
- } else {
- Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
- }
-}
+++ /dev/null
-/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
- This file is part of DCP-o-matic.
-
- DCP-o-matic is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- DCP-o-matic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-
-class InitialSetupDialog : public wxDialog
-{
-public:
- InitialSetupDialog ();
-
-private:
- void interface_complexity_changed ();
-
- wxRadioButton* _simple;
- wxRadioButton* _full;
-};
void
TextPanel::add_to_grid ()
{
- Config::Interface const interface = Config::instance()->interface_complexity();
-
int r = 0;
- _reference->Show (interface == Config::INTERFACE_FULL);
- _reference_note->Show (interface == Config::INTERFACE_FULL);
-
- if (interface == Config::INTERFACE_FULL) {
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
- reference_sizer->Add (_reference, 0);
- reference_sizer->Add (_reference_note, 0);
- _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
- ++r;
- }
+ wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+ reference_sizer->Add (_reference, 0);
+ reference_sizer->Add (_reference_note, 0);
+ _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
+ ++r;
wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL);
use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
void
TimingPanel::add_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
wxSizer* labels = new wxBoxSizer (wxHORIZONTAL);
_grid->Add (_position, wxGBPosition(r, 1));
++r;
- _move_to_start_of_reel->Show (full);
- _full_length_label->Show (full);
- _full_length->Show (full);
- _play_length_label->Show (full);
- _play_length->Show (full);
-
- if (full) {
- _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1));
- ++r;
+ _grid->Add (_move_to_start_of_reel, wxGBPosition(r, 1));
+ ++r;
- add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
- _grid->Add (_full_length, wxGBPosition(r, 1));
- ++r;
- }
+ add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0));
+ _grid->Add (_full_length, wxGBPosition(r, 1));
+ ++r;
add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0));
_grid->Add (_trim_start, wxGBPosition(r, 1));
_grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1));
++r;
- if (full) {
- add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
- _grid->Add (_play_length, wxGBPosition(r, 1));
- ++r;
- }
+ add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0));
+ _grid->Add (_play_length, wxGBPosition(r, 1));
+ ++r;
/* Completely speculative fix for #891 */
_grid->Layout ();
void
VideoPanel::add_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
- _reference->Show (full);
- _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty());
-
- if (full) {
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
- reference_sizer->Add (_reference, 0);
- reference_sizer->Add (_reference_note, 0);
- _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
- ++r;
- }
+ wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+ reference_sizer->Add (_reference, 0);
+ reference_sizer->Add (_reference_note, 0);
+ _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
+ ++r;
add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
_grid->Add (crop, wxGBPosition(r, 1));
++r;
- _scale_label->Show (full);
- _scale_fit->Show (full);
- _scale_custom->Show (full);
- _scale_custom_edit->Show (full);
- _colour_conversion_label->Show (full);
- _colour_conversion->Show (full);
- _edit_colour_conversion_button->Show (full);
- _range_label->Show (full);
- _range->Show (full);
-
add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
_grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
++r;
_grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
++r;
- if (full) {
- add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
- {
- wxSizer* v = new wxBoxSizer (wxVERTICAL);
- v->Add (_scale_fit, 0, wxBOTTOM, 4);
- wxSizer* h = new wxBoxSizer (wxHORIZONTAL);
- h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
- h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
- v->Add (h, 0);
- _grid->Add (v, wxGBPosition(r, 1));
- }
- ++r;
-
- add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- }
- ++r;
+ add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+ {
+ wxSizer* v = new wxBoxSizer (wxVERTICAL);
+ v->Add (_scale_fit, 0, wxBOTTOM, 4);
+ wxSizer* h = new wxBoxSizer (wxHORIZONTAL);
+ h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
+ h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
+ v->Add (h, 0);
+ _grid->Add (v, wxGBPosition(r, 1));
+ }
+ ++r;
- add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0));
- _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
- ++r;
+ add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+ _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
}
+ ++r;
+
+ add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0));
+ _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
+ ++r;
_grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
++r;
gl_video_view.cc
hints_dialog.cc
html_dialog.cc
- initial_setup_dialog.cc
instant_i18n_dialog.cc
interop_metadata_dialog.cc
i18n_hook.cc