From: Carl Hetherington Date: Sat, 6 Jul 2013 17:18:35 +0000 (+0100) Subject: Various layout tweaks (looking at OS X). X-Git-Tag: v2.0.48~1337^2~302^2~8 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e683d5d750b2532806594cfafbd6e732b3004a99 Various layout tweaks (looking at OS X). --- diff --git a/ChangeLog b/ChangeLog index 7bb54b4c1..37605627a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-07-06 Carl Hetherington + + * Various tweaks to layout, trying to make + it more consistent and better looking + (especially on OS X). + 2013-07-04 Carl Hetherington * Version 0.107beta1 released. diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index de94d0a2f..6018ea858 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -244,7 +244,7 @@ public: wxBoxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); main_sizer->Add (_top_sizer, 2, wxEXPAND | wxALL, 6); - main_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6); + main_sizer->Add (job_manager_view, 1, wxALL, 6); panel->SetSizer (main_sizer); set_menu_sensitivity (); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index a737818ec..534ab86d5 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -80,7 +80,7 @@ ConfigDialog::make_misc_panel () wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _misc_panel->SetSizer (s); - wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (3, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL | wxEXPAND, 8); @@ -105,7 +105,7 @@ ConfigDialog::make_misc_panel () add_label_to_sizer (table, _misc_panel, _("Threads to use for encoding on this host")); _num_local_encoding_threads = new wxSpinCtrl (_misc_panel); - table->Add (_num_local_encoding_threads, 1, wxEXPAND); + table->Add (_num_local_encoding_threads, 1); table->AddSpacer (0); add_label_to_sizer (table, _misc_panel, _("Default directory for new films")); @@ -194,7 +194,7 @@ ConfigDialog::make_tms_panel () wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _tms_panel->SetSizer (s); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL | wxEXPAND, 8); @@ -233,7 +233,7 @@ ConfigDialog::make_metadata_panel () wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _metadata_panel->SetSizer (s); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL | wxEXPAND, 8); @@ -260,7 +260,7 @@ ConfigDialog::make_ab_panel () wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _ab_panel->SetSizer (s); - wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (3, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL, 8); @@ -302,7 +302,7 @@ ConfigDialog::make_servers_panel () wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _servers_panel->SetSizer (s); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (0, 1); s->Add (table, 1, wxALL | wxEXPAND, 8); @@ -323,11 +323,11 @@ ConfigDialog::make_servers_panel () { wxSizer* s = new wxBoxSizer (wxVERTICAL); _add_server = new wxButton (_servers_panel, wxID_ANY, _("Add")); - s->Add (_add_server); + s->Add (_add_server, 0, wxTOP | wxBOTTOM, 2); _edit_server = new wxButton (_servers_panel, wxID_ANY, _("Edit")); - s->Add (_edit_server); + s->Add (_edit_server, 0, wxTOP | wxBOTTOM, 2); _remove_server = new wxButton (_servers_panel, wxID_ANY, _("Remove")); - s->Add (_remove_server); + s->Add (_remove_server, 0, wxTOP | wxBOTTOM, 2); table->Add (s, 0); } diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc index c08c58ed4..ced4d5c8f 100644 --- a/src/wx/dci_metadata_dialog.cc +++ b/src/wx/dci_metadata_dialog.cc @@ -27,7 +27,7 @@ using boost::shared_ptr; DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm) : wxDialog (parent, wxID_ANY, _("DCI name"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); add_label_to_sizer (table, this, _("Audio Language (e.g. EN)")); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index dd952e22a..90f91c00f 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -97,14 +97,14 @@ FilmEditor::make_film_panel () _film_sizer = new wxBoxSizer (wxVERTICAL); _film_panel->SetSizer (_film_sizer); - wxGridBagSizer* grid = new wxGridBagSizer (4, 4); + wxGridBagSizer* grid = new wxGridBagSizer (DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); _film_sizer->Add (grid, 0, wxALL, 8); int r = 0; add_label_to_grid_bag_sizer (grid, _film_panel, _("Name"), wxGBPosition (r, 0)); _name = new wxTextCtrl (_film_panel, wxID_ANY); - grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); + grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT); ++r; add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Name"), wxGBPosition (r, 0)); @@ -266,7 +266,7 @@ FilmEditor::make_video_panel () _video_sizer = new wxBoxSizer (wxVERTICAL); _video_panel->SetSizer (_video_sizer); - wxGridBagSizer* grid = new wxGridBagSizer (4, 4); + wxGridBagSizer* grid = new wxGridBagSizer (DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); _video_sizer->Add (grid, 0, wxALL, 8); int r = 0; @@ -312,7 +312,7 @@ FilmEditor::make_video_panel () s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); _filters_button = new wxButton (_video_panel, wxID_ANY, _("Edit...")); video_control (_filters_button); - s->Add (_filters_button, 0); + s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } ++r; @@ -363,7 +363,7 @@ FilmEditor::make_audio_panel () _audio_sizer = new wxBoxSizer (wxVERTICAL); _audio_panel->SetSizer (_audio_sizer); - wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); + wxFlexGridSizer* grid = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); _audio_sizer->Add (grid, 0, wxALL, 8); _show_audio = new wxButton (_audio_panel, wxID_ANY, _("Show Audio...")); @@ -400,7 +400,7 @@ FilmEditor::make_audio_panel () s->Add (video_control (_audio_stream), 1); _audio = new wxStaticText (_audio_panel, wxID_ANY, wxT ("")); s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8); - grid->Add (s, 1, wxEXPAND); + grid->Add (s); } _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio")); @@ -423,7 +423,7 @@ FilmEditor::make_subtitle_panel () _subtitle_panel = new wxPanel (_notebook); _subtitle_sizer = new wxBoxSizer (wxVERTICAL); _subtitle_panel->SetSizer (_subtitle_sizer); - wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); + wxFlexGridSizer* grid = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); _subtitle_sizer->Add (grid, 0, wxALL, 8); _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles")); diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc index 22e6b447a..5a8dc8433 100644 --- a/src/wx/gain_calculator_dialog.cc +++ b/src/wx/gain_calculator_dialog.cc @@ -26,7 +26,7 @@ using namespace boost; GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Gain Calculator")) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); add_label_to_sizer (table, this, _("I want to play this back at fader")); diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index 8beb13004..709ab0e04 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -37,13 +37,13 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent) wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6); add_label_to_sizer (table, this, _("Film name")); _name = new wxTextCtrl (this, wxID_ANY); - table->Add (_name, 1, wxEXPAND); + table->Add (_name, 0, wxEXPAND); add_label_to_sizer (table, this, _("Create in folder")); diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc index 44a713dc3..86ff171ed 100644 --- a/src/wx/properties_dialog.cc +++ b/src/wx/properties_dialog.cc @@ -36,7 +36,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) , _film (film) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); add_label_to_sizer (table, this, _("Frames")); _frames = new wxStaticText (this, wxID_ANY, wxT ("")); diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index 7a9cf95c7..80e4232af 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -30,7 +30,7 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server) _server = new ServerDescription (wx_to_std (N_("localhost")), 1); } - wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); add_label_to_sizer (table, this, _("Host name or IP address")); diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 1a7b73faf..6ed8747d7 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -41,7 +41,7 @@ wxStaticText * add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, int prop) { wxStaticText* m = new wxStaticText (p, wxID_ANY, t); - s->Add (m, prop, wxALIGN_CENTER_VERTICAL | wxALL, 6); + s->Add (m, prop, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6); return m; } @@ -49,7 +49,7 @@ wxStaticText * add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPosition pos, wxGBSpan span) { wxStaticText* m = new wxStaticText (p, wxID_ANY, t); - s->Add (m, pos, span, wxALIGN_CENTER_VERTICAL | wxALL, 6); + s->Add (m, pos, span, wxALIGN_CENTER_VERTICAL | wxALL); return m; } diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 464aa1752..55873027c 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -32,6 +32,9 @@ class wxFilePickerCtrl; class wxSpinCtrl; class wxGridBagSizer; +#define DVDOMATIC_SIZER_X_GAP 8 +#define DVDOMATIC_SIZER_Y_GAP 8 + /** @file src/wx/wx_util.h * @brief Some utility functions and classes. */