From: Carl Hetherington Date: Wed, 15 Aug 2018 09:51:16 +0000 (+0100) Subject: Add GDC and accounts icon. X-Git-Tag: v2.13.43~24^2~4 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=998b2eea5640cda23950ff6c5e24bd1f9ccb160f;hp=c3fc23c2670ae6377ef42a4e4af051d47b88e75d Add GDC and accounts icon. --- diff --git a/graphics/src/accounts.svg b/graphics/src/accounts.svg new file mode 100644 index 000000000..920051848 --- /dev/null +++ b/graphics/src/accounts.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2010-03-29T08:04:16 + "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> +\n<br><br> +\nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka + + + warszawianka + + + + + email + envelope + externalsource + icon + letter + tango + + + + + + + + + + + diff --git a/graphics/update b/graphics/update index 9815cf9a7..51336745e 100755 --- a/graphics/update +++ b/graphics/update @@ -55,7 +55,7 @@ else # OS X preferences icons # servers.png does not have an SVG version mkdir -p osx/preferences - for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications; do + for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications accounts; do $INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32 done diff --git a/src/lib/config.cc b/src/lib/config.cc index 28af9b303..76c70ed5d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -160,6 +160,8 @@ Config::set_defaults () _barco_password = optional(); _christie_username = optional(); _christie_password = optional(); + _gdc_username = optional(); + _gdc_password = optional(); _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -471,6 +473,8 @@ try _barco_password = f.optional_string_child("BarcoPassword"); _christie_username = f.optional_string_child("ChristieUsername"); _christie_password = f.optional_string_child("ChristiePassword"); + _gdc_username = f.optional_string_child("GDCUsername"); + _gdc_password = f.optional_string_child("GDCPassword"); /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) { @@ -829,6 +833,13 @@ Config::write_config () const root->add_child("ChristiePassword")->add_child_text(*_christie_password); } + if (_gdc_username) { + root->add_child("GDCUsername")->add_child_text(*_gdc_username); + } + if (_gdc_password) { + root->add_child("GDCPassword")->add_child_text(*_gdc_password); + } + try { doc.write_to_file_formatted(config_file().string()); } catch (xmlpp::exception& e) { diff --git a/src/lib/config.h b/src/lib/config.h index b710f537d..0be3b20b9 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -439,6 +439,14 @@ public: return _christie_password; } + boost::optional gdc_username () const { + return _gdc_username; + } + + boost::optional gdc_password () const { + return _gdc_password; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -817,6 +825,22 @@ public: maybe_set (_christie_password, boost::optional()); } + void set_gdc_username (std::string u) { + maybe_set (_gdc_username, u); + } + + void unset_gdc_username () { + maybe_set (_gdc_username, boost::optional()); + } + + void set_gdc_password (std::string p) { + maybe_set (_gdc_password, p); + } + + void unset_gdc_password () { + maybe_set (_gdc_password, boost::optional()); + } + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -996,6 +1020,8 @@ private: boost::optional _barco_password; boost::optional _christie_username; boost::optional _christie_password; + boost::optional _gdc_username; + boost::optional _gdc_password; static int const _current_version; diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc index dfafee36c..a12097001 100644 --- a/src/wx/download_certificate_dialog.cc +++ b/src/wx/download_certificate_dialog.cc @@ -21,6 +21,7 @@ #include "dolby_doremi_certificate_panel.h" #include "barco_alchemy_certificate_panel.h" #include "christie_certificate_panel.h" +#include "gdc_certificate_panel.h" #include "download_certificate_dialog.h" #include "wx_util.h" @@ -47,6 +48,7 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent) _pages.push_back (new DolbyDoremiCertificatePanel (this)); _pages.push_back (new BarcoAlchemyCertificatePanel (this)); _pages.push_back (new ChristieCertificatePanel (this)); + _pages.push_back (new GDCCertificatePanel (this)); BOOST_FOREACH (DownloadCertificatePanel* i, _pages) { _notebook->AddPage (i, i->name(), true); diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc new file mode 100644 index 000000000..b4352dff4 --- /dev/null +++ b/src/wx/gdc_certificate_panel.cc @@ -0,0 +1,69 @@ +/* + Copyright (C) 2018 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + +#include "gdc_certificate_panel.h" +#include "download_certificate_dialog.h" +#include "wx_util.h" +#include "lib/internet.h" +#include "lib/compose.hpp" +#include "lib/config.h" + +using std::string; +using boost::optional; + +GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) + : DownloadCertificatePanel (dialog) +{ + +} + +void +GDCCertificatePanel::do_download () +{ + Config* config = Config::instance (); + if (!config->gdc_username() || !config->gdc_password()) { + _dialog->message()->SetLabel(wxT("")); + error_dialog (this, _("No GDC username/password configured. Add your account details to the Accounts page in Preferences.")); + return; + } + + string const url = String::compose( + "ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3", + Config::instance()->gdc_username().get(), + Config::instance()->gdc_password().get(), + serial + ); + + optional error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1)); + + if (error) { + _dialog->message()->SetLabel(wxT("")); + error_dialog (this, std_to_wx(*error)); + } else { + _dialog->message()->SetLabel (_("Certificate downloaded")); + _dialog->setup_sensitivity (); + } +} + +wxString +GDCCertificatePanel::name () const +{ + return _("GDC"); +} diff --git a/src/wx/gdc_certificate_panel.h b/src/wx/gdc_certificate_panel.h new file mode 100644 index 000000000..18a78e586 --- /dev/null +++ b/src/wx/gdc_certificate_panel.h @@ -0,0 +1,30 @@ +/* + Copyright (C) 2018 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + +#include "download_certificate_panel.h" + +class GDCCertificatePanel : public DownloadCertificatePanel +{ +public: + GDCCertificatePanel (DownloadCertificateDialog* dialog); + + void do_download (); + wxString name () const; +}; diff --git a/src/wx/wscript b/src/wx/wscript index 560bfc1ab..d50286bf4 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -68,6 +68,7 @@ sources = """ font_files_dialog.cc full_config_dialog.cc gain_calculator_dialog.cc + gdc_certificate_panel.cc hints_dialog.cc job_view.cc job_view_dialog.cc