Accept either , or . for a decimal separator in the gain calculator.

[dcpomatic.git] / src / wx / gain_calculator_dialog.cc

diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index fcd54d4cfb76ccea0398c937db966c405acf78bc..418ec2e7719b3eefba026e3b65e3780583552c76 100644 (file)
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,46 +17,38 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
 #include "gain_calculator_dialog.h"
 #include "wx_util.h"
-
-using namespace boost;
+#include "lib/util.h"
 
 GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, wxString (_("Gain Calculator")))
+       : TableDialog (parent, _("Gain Calculator"), 2, 1, true)
 {
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
-       table->AddGrowableCol (1, 1);
-
-       add_label_to_sizer (table, this, "I want to play this back at fader");
-       _wanted = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
-       table->Add (_wanted, 1, wxEXPAND);
+       add (_("I want to play this back at fader"), true);
+       _wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
-       add_label_to_sizer (table, this, "But I have to use fader");
-       _actual = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
-       table->Add (_actual, 1, wxEXPAND);
+       add (_("But I have to use fader"), true);
+       _actual = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
-       
-       SetSizer (overall_sizer);
-       overall_sizer->SetSizeHints (this);
+       layout ();
 }
 
 float
 GainCalculatorDialog::wanted_fader () const
 {
-       return lexical_cast<float> (wx_to_std (_wanted->GetValue ()));
+       if (_wanted->GetValue().IsEmpty()) {
+               return 0;
+       }
+
+       return relaxed_string_to_float (wx_to_std (_wanted->GetValue ()));
 }
 
 float
 GainCalculatorDialog::actual_fader () const
 {
-       return lexical_cast<float> (wx_to_std (_actual->GetValue ()));
+       if (_actual->GetValue().IsEmpty()) {
+               return 0;
+       }
+
+       return relaxed_string_to_float (wx_to_std (_actual->GetValue ()));
 }