Simplify text panel.

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 0bd79805b7f45d08a68aaeef7f84dbc2378d7f3d..aee0d6595ae3e8a3ca8743c450545151d94728b6 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -43,7 +43,7 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (_grid, 0, wxALL, 8);
 
-       Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
 }
 
 

diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index bb0e937a1add8b78f85829f4de44bec1109f4a10..7f201ff488773fdd2bcb91246ad2b2ad72a99779 100644 (file)
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -58,6 +58,7 @@ protected:
 
 private:
        void config_changed (Config::Property);
+       boost::signals2::scoped_connection _config_connection;
 };
 
 #endif

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 169732b66b70a8ba9a72f39ce724a71202f0fec6..9e4bfe6e903e256462b5487ec81c1f7010cf63ed 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -53,110 +53,58 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
        , _fonts_dialog (0)
        , _original_type (t)
 {
-       wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-
        wxString refer = _("Use this DCP's subtitle as OV and make VF");
        if (t == TEXT_CLOSED_CAPTION) {
                refer = _("Use this DCP's closed caption as OV and make VF");
        }
 
        _reference = new wxCheckBox (this, wxID_ANY, refer);
-       reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
-
        _reference_note = new wxStaticText (this, wxID_ANY, _(""));
        _reference_note->Wrap (200);
-       reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
        wxFont font = _reference_note->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
        font.SetPointSize(font.GetPointSize() - 1);
        _reference_note->SetFont(font);
 
-       _sizer->Add (reference_sizer);
-
-       wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       _sizer->Add (grid, 0, wxALL, 8);
-       int r = 0;
-
-       wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL);
        _use = new wxCheckBox (this, wxID_ANY, _("Use as"));
-       use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
        _type = new wxChoice (this, wxID_ANY);
        _type->Append (_("open subtitles"));
        _type->Append (_("closed captions"));
-       use->Add (_type, 1, wxEXPAND, 0);
-       grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2));
-       ++r;
 
        _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
-       grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
-       ++r;
 
-       add_label_to_sizer (grid, this, _("Offset"), true, wxGBPosition (r, 0));
-       wxBoxSizer* offset = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (offset, this, _("X"), true);
+       _offset_label = create_label (this, _("Offset"), true);
+       _x_offset_label = create_label (this, _("X"), true);
        _x_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-       wxStaticText* pc = new wxStaticText (this, wxID_ANY, _("%"));
-       offset->Add (pc, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
-       add_label_to_sizer (offset, this, _("Y"), true);
+       _x_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _y_offset_label = create_label (this, _("Y"), true);
        _y_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       offset->Add (_y_offset, 0);
-       add_label_to_sizer (offset, this, _("%"), false);
-       grid->Add (offset, wxGBPosition (r, 1));
-       ++r;
+       _y_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
 
-       add_label_to_sizer (grid, this, _("Scale"), true, wxGBPosition (r, 0));
-       wxBoxSizer* scale = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (scale, this, _("X"), true);
+       _scale_label = create_label (this, _("Scale"), true);
+       _x_scale_label = create_label (this, _("X"), true);
        _x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-       pc = new wxStaticText (this, wxID_ANY, _("%"));
-       scale->Add (pc, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
-       add_label_to_sizer (scale, this, _("Y"), true);
+       _x_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _y_scale_label = create_label (this, _("Y"), true);
        _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       scale->Add (_y_scale, 0);
-       add_label_to_sizer (scale, this, _("%"), false);
-       grid->Add (scale, wxGBPosition (r, 1));
-       ++r;
+       _y_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
 
-       {
-               add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _line_spacing = new wxSpinCtrl (this);
-               s->Add (_line_spacing);
-               add_label_to_sizer (s, this, _("%"), false);
-               grid->Add (s, wxGBPosition (r, 1));
-               ++r;
-       }
+       _line_spacing_label = create_label (this, _("Line spacing"), true);
+       _line_spacing = new wxSpinCtrl (this);
+       _line_spacing_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
 
-       add_label_to_sizer (grid, this, _("DCP track"), true, wxGBPosition(r, 0));
+       _dcp_track_label = create_label (this, _("DCP track"), true);
        _dcp_track = new wxChoice (this, wxID_ANY);
-       grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
-       ++r;
 
-       add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
+       _language_label = create_label (this, _("Language"), true);
        _language = new wxTextCtrl (this, wxID_ANY);
-       grid->Add (_language, wxGBPosition (r, 1));
-       ++r;
 
-       add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
+       _stream_label = create_label (this, _("Stream"), true);
        _stream = new wxChoice (this, wxID_ANY);
-       grid->Add (_stream, wxGBPosition (r, 1));
-       ++r;
-
-       {
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-
-               _text_view_button = new wxButton (this, wxID_ANY, _("View..."));
-               s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-               _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
-               s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-               _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance..."));
-               s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
 
-               grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
-               ++r;
-       }
+       _text_view_button = new wxButton (this, wxID_ANY, _("View..."));
+       _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
+       _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance..."));
 
        _x_offset->SetRange (-100, 100);
        _y_offset->SetRange (-100, 100);
@@ -183,12 +131,90 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
        _text_view_button->Bind         (wxEVT_BUTTON,   boost::bind (&TextPanel::text_view_clicked, this));
        _fonts_dialog_button->Bind      (wxEVT_BUTTON,   boost::bind (&TextPanel::fonts_dialog_clicked, this));
        _appearance_dialog_button->Bind (wxEVT_BUTTON,   boost::bind (&TextPanel::appearance_dialog_clicked, this));
+
+       add_to_grid();
 }
 
 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* use = new wxBoxSizer (wxHORIZONTAL);
+       use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+       use->Add (_type, 1, wxEXPAND, 0);
+       _grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2));
+       ++r;
+
+       _grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
+       ++r;
+
+       add_label_to_sizer (_grid, _offset_label, true, wxGBPosition (r, 0));
+       wxBoxSizer* offset = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (offset, _x_offset_label, true);
+       offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+       offset->Add (_x_offset_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+       add_label_to_sizer (offset, _y_offset_label, true);
+       offset->Add (_y_offset, 0);
+       add_label_to_sizer (offset, _y_offset_pc_label, false);
+       _grid->Add (offset, wxGBPosition (r, 1));
+       ++r;
+
+       add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+       wxBoxSizer* scale = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (scale, _x_scale_label, true);
+       scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+       scale->Add (_x_scale_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+       add_label_to_sizer (scale, _y_scale_label, true);
+       scale->Add (_y_scale, 0);
+       add_label_to_sizer (scale, _y_scale_pc_label, false);
+       _grid->Add (scale, wxGBPosition (r, 1));
+       ++r;
+
+       {
+               add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0));
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               s->Add (_line_spacing);
+               add_label_to_sizer (s, _line_spacing_pc_label, false);
+               _grid->Add (s, wxGBPosition (r, 1));
+               ++r;
+       }
+
+       add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(r, 0));
+       _grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+       ++r;
+
+       add_label_to_sizer (_grid, _language_label, true, wxGBPosition (r, 0));
+       _grid->Add (_language, wxGBPosition (r, 1));
+       ++r;
+
+       add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0));
+       _grid->Add (_stream, wxGBPosition (r, 1));
+       ++r;
+
+       {
+               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+
+               s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+               s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+               s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
 
+               _grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2));
+               ++r;
+       }
 }
 
 void

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index 3c0dc236599d3d6d0fcdc782382f4b1f2f938f66..14a84c610f414983296ff2f5171ded41ddb0df87 100644 (file)
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -62,13 +62,28 @@ private:
        wxCheckBox* _use;
        wxChoice* _type;
        wxCheckBox* _burn;
+       wxStaticText* _offset_label;
+       wxStaticText* _x_offset_label;
+       wxStaticText* _x_offset_pc_label;
+       wxStaticText* _y_offset_label;
+       wxStaticText* _y_offset_pc_label;
        wxSpinCtrl* _x_offset;
        wxSpinCtrl* _y_offset;
+       wxStaticText* _scale_label;
+       wxStaticText* _x_scale_label;
+       wxStaticText* _x_scale_pc_label;
+       wxStaticText* _y_scale_label;
+       wxStaticText* _y_scale_pc_label;
        wxSpinCtrl* _x_scale;
        wxSpinCtrl* _y_scale;
+       wxStaticText* _line_spacing_label;
+       wxStaticText* _line_spacing_pc_label;
        wxSpinCtrl* _line_spacing;
+       wxStaticText* _dcp_track_label;
        wxChoice* _dcp_track;
+       wxStaticText* _language_label;
        wxTextCtrl* _language;
+       wxStaticText* _stream_label;
        wxChoice* _stream;
        wxButton* _text_view_button;
        TextView* _text_view;