summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-25 15:38:15 +0100
committerCarl Hetherington <cth@carlh.net>2016-04-25 15:38:15 +0100
commitfa1a42e87704a93266245b0e7cf0dce2b5c42f66 (patch)
tree290a384ded60d5b4a468dab5dffb6ca4ea4c9891 /src/wx
parentd4bdbb21755b52094988ade47fb51a5698def744 (diff)
Missing i18n tags.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/cinema_dialog.cc4
-rw-r--r--src/wx/cinema_dialog.h2
-rw-r--r--src/wx/screen_dialog.cc6
-rw-r--r--src/wx/screen_dialog.h4
-rw-r--r--src/wx/screens_panel.cc11
5 files changed, 15 insertions, 12 deletions
diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 43017b56b..df56b9cbe 100644
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -37,8 +37,8 @@ column (string s)
return s;
}
-CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
- : wxDialog (parent, wxID_ANY, std_to_wx (title))
+CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, int utc_offset_hour, int utc_offset_minute)
+ : wxDialog (parent, wxID_ANY, title)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index 2949d6c8c..187bd11f2 100644
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -29,7 +29,7 @@ class CinemaDialog : public wxDialog
public:
CinemaDialog (
wxWindow *,
- std::string,
+ wxString,
std::string name = "",
std::list<std::string> emails = std::list<std::string> (),
int utc_offset_hour = 0,
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index f640cdbc2..ddedb71ec 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2015 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
@@ -50,8 +50,8 @@ public:
}
};
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
- : wxDialog (parent, wxID_ANY, std_to_wx (title))
+ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
+ : wxDialog (parent, wxID_ANY, title)
, _recipient (recipient)
, _trusted_devices (trusted_devices)
{
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5ae369415..5b786f6c1 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 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
@@ -31,7 +31,7 @@ class ScreenDialog : public wxDialog
public:
ScreenDialog (
wxWindow *,
- std::string,
+ wxString,
std::string name = "",
boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 4f95ff408..8eb8ba670 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -146,7 +146,7 @@ ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
void
ScreensPanel::add_cinema_clicked ()
{
- CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
+ CinemaDialog* d = new CinemaDialog (this, _("Add Cinema"));
if (d->ShowModal () == wxID_OK) {
shared_ptr<Cinema> c (new Cinema (d->name(), d->emails(), d->utc_offset_hour(), d->utc_offset_minute()));
Config::instance()->add_cinema (c);
@@ -165,7 +165,10 @@ ScreensPanel::edit_cinema_clicked ()
pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
- CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails, c.second->utc_offset_hour(), c.second->utc_offset_minute());
+ CinemaDialog* d = new CinemaDialog (
+ this, _("Edit cinema"), c.second->name, c.second->emails, c.second->utc_offset_hour(), c.second->utc_offset_minute()
+ );
+
if (d->ShowModal () == wxID_OK) {
c.second->name = d->name ();
c.second->emails = d->emails ();
@@ -198,7 +201,7 @@ ScreensPanel::add_screen_clicked ()
shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
- ScreenDialog* d = new ScreenDialog (this, "Add Screen");
+ ScreenDialog* d = new ScreenDialog (this, _("Add Screen"));
if (d->ShowModal () != wxID_OK) {
return;
}
@@ -224,7 +227,7 @@ ScreensPanel::edit_screen_clicked ()
pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
- ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
+ ScreenDialog* d = new ScreenDialog (this, _("Edit screen"), s.second->name, s.second->recipient, s.second->trusted_devices);
if (d->ShowModal () == wxID_OK) {
s.second->name = d->name ();
s.second->recipient = d->recipient ();