projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated fr_FR translation from Thierry Journet.
[dcpomatic.git]
/
src
/
wx
/
name_format_editor.cc
diff --git
a/src/wx/name_format_editor.cc
b/src/wx/name_format_editor.cc
index 4a93edb1841c3b690653efc21940b6ec41d82757..82adc3f55d36cadc11caf2ba1153bcf1bea8d7cc 100644
(file)
--- a/
src/wx/name_format_editor.cc
+++ b/
src/wx/name_format_editor.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2017
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,6
+20,7
@@
#include "name_format_editor.h"
#include "wx_util.h"
#include "name_format_editor.h"
#include "wx_util.h"
+#include "lib/util.h"
using std::string;
using std::string;
@@
-33,7
+34,9
@@
NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
, _suffix (suffix)
{
_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
, _suffix (suffix)
{
_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
- _sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ if (!_examples.empty ()) {
+ _sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+ }
_panel->SetSizer (_sizer);
for (dcp::NameFormat::Map::const_iterator i = titles.begin(); i != titles.end(); ++i) {
_panel->SetSizer (_sizer);
for (dcp::NameFormat::Map::const_iterator i = titles.begin(); i != titles.end(); ++i) {
@@
-62,7
+65,11
@@
NameFormatEditor::changed ()
void
NameFormatEditor::update_example ()
{
void
NameFormatEditor::update_example ()
{
- _name.set_specification (wx_to_std (_specification->GetValue ()));
+ if (_examples.empty ()) {
+ return;
+ }
+
+ _name.set_specification (careful_string_filter (wx_to_std (_specification->GetValue ())));
wxString example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));
wxString wrapped;
wxString example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));
wxString wrapped;