From: Carl Hetherington <cth@carlh.net>
Date: Sat, 22 Sep 2012 17:17:10 +0000 (+0100)
Subject: Improve spacing of dialogues.
X-Git-Tag: v2.0.48~1720^2~39
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7333d9ee1ff505cbd635cbca23c83656a705a4a4

Improve spacing of dialogues.
---

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 8a430f4f1..b0bd6f2ee 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -170,7 +170,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	server_selection_changed (ev);
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -263,7 +263,7 @@ ConfigDialog::edit_server_clicked (wxCommandEvent &)
 	_servers->GetItem (item);
 
 	vector<ServerDescription*> servers = Config::instance()->servers ();
-	assert (i >= 0 && i < servers.size ());
+	assert (i >= 0 && i < int (servers.size ()));
 
 	ServerDialog* d = new ServerDialog (this, servers[i]);
 	d->ShowModal ();
diff --git a/src/wx/dcp_range_dialog.cc b/src/wx/dcp_range_dialog.cc
index 572d0c628..aed6808cb 100644
--- a/src/wx/dcp_range_dialog.cc
+++ b/src/wx/dcp_range_dialog.cc
@@ -69,7 +69,7 @@ DCPRangeDialog::DCPRangeDialog (wxWindow* p, Film* f)
 	_n_frames->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (DCPRangeDialog::n_frames_changed), 0, this);
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table);
+	overall_sizer->Add (table, 0, wxALL, 6);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index 9ec169395..028d082b4 100644
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -32,7 +32,7 @@ FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & f)
 	, _filters (new FilterView (this, f))
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	sizer->Add (_filters, 1, wxEXPAND);
+	sizer->Add (_filters, 1, wxEXPAND | wxALL, 6);
 
 	_filters->ActiveChanged.connect (sigc::mem_fun (*this, &FilterDialog::active_changed));
 
diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index 431a4672d..fcd54d4cf 100644
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -38,7 +38,7 @@ GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
 	table->Add (_actual, 1, wxEXPAND);
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index aaba31d6e..67f1fc91b 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -61,7 +61,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
 	_total_disk->SetLabel (std_to_wx (t.str ()));
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 0, wxALL, 8);
+	overall_sizer->Add (table, 0, wxALL, 6);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index ad0f7a567..7b394a484 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -49,7 +49,7 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
 	_threads->SetValue (_server->threads ());
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {