projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
wx
/
config_dialog.h
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index 5203af609f8e13673968d50dca03610cdf8496ee..eade690437e2b19456b8631ee7bd575f6ba8d593 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-18,40
+18,48
@@
*/
*/
+
#ifndef DCPOMATIC_CONFIG_DIALOG_H
#define DCPOMATIC_CONFIG_DIALOG_H
#ifndef DCPOMATIC_CONFIG_DIALOG_H
#define DCPOMATIC_CONFIG_DIALOG_H
-#include "wx_util.h"
+
#include "editable_list.h"
#include "make_chain_dialog.h"
#include "editable_list.h"
#include "make_chain_dialog.h"
+#include "wx_util.h"
#include "lib/config.h"
#include "lib/config.h"
-#include "lib/ratio.h"
-#include "lib/filter.h"
+#include "lib/cross.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
#include "lib/log.h"
#include "lib/log.h"
+#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/util.h"
-#include "lib/cross.h"
-#include "lib/exceptions.h"
-#include <dcp/locale_convert.h>
-#include <dcp/exceptions.h>
+#include "lib/warnings.h"
#include <dcp/certificate_chain.h>
#include <dcp/certificate_chain.h>
-#include <wx/stdpaths.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
-#include <wx/
filepicker
.h>
+#include <wx/
stdpaths
.h>
#include <RtAudio.h>
#include <RtAudio.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
#include <iostream>
+
class AudioMappingView;
class AudioMappingView;
-class Page
+
+class Page : public wxPreferencesPage
{
public:
Page (wxSize panel_size, int border);
virtual ~Page () {}
{
public:
Page (wxSize panel_size, int border);
virtual ~Page () {}
+ wxWindow* CreateWindow (wxWindow* parent) override;
+
protected:
wxWindow* create_window (wxWindow* parent);
protected:
wxWindow* create_window (wxWindow* parent);
@@
-70,29
+78,25
@@
private:
bool _window_exists;
};
bool _window_exists;
};
-class StockPage : public wxStockPreferencesPage, public Page
-{
-public:
- StockPage (Kind kind, wxSize panel_size, int border);
- wxWindow* CreateWindow (wxWindow* parent);
-};
-class StandardPage : public wxPreferencesPage, public Page
-{
-public:
- StandardPage (wxSize panel_size, int border);
- wxWindow* CreateWindow (wxWindow* parent);
-};
-
-class GeneralPage : public StockPage
+class GeneralPage : public Page
{
public:
GeneralPage (wxSize panel_size, int border);
{
public:
GeneralPage (wxSize panel_size, int border);
+ wxString GetName () const override;
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const override
+ {
+ return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
+ }
+#endif
+
protected:
void add_language_controls (wxGridBagSizer* table, int& r);
void add_update_controls (wxGridBagSizer* table, int& r);
protected:
void add_language_controls (wxGridBagSizer* table, int& r);
void add_update_controls (wxGridBagSizer* table, int& r);
- v
irtual void config_changed ()
;
+ v
oid config_changed () override
;
private:
void setup_sensitivity ();
private:
void setup_sensitivity ();
@@
-107,6
+111,7
@@
private:
wxCheckBox* _check_for_test_updates;
};
wxCheckBox* _check_for_test_updates;
};
+
class CertificateChainEditor : public wxDialog
{
public:
class CertificateChainEditor : public wxDialog
{
public:
@@
-114,9
+119,9
@@
public:
wxWindow* parent,
wxString title,
int border,
wxWindow* parent,
wxString title,
int border,
-
boost::function<void (boost
::shared_ptr<dcp::CertificateChain>)> set,
-
boost::function<boost
::shared_ptr<const dcp::CertificateChain> (void)> get,
-
boost
::function<bool (void)> nag_alter
+
std::function<void (std
::shared_ptr<dcp::CertificateChain>)> set,
+
std::function<std
::shared_ptr<const dcp::CertificateChain> (void)> get,
+
std
::function<bool (void)> nag_alter
);
void add_button (wxWindow* button);
);
void add_button (wxWindow* button);
@@
-145,61
+150,62
@@
private:
wxStaticText* _private_key_bad;
wxSizer* _sizer;
wxBoxSizer* _button_sizer;
wxStaticText* _private_key_bad;
wxSizer* _sizer;
wxBoxSizer* _button_sizer;
-
boost::function<void (boost
::shared_ptr<dcp::CertificateChain>)> _set;
-
boost::function<boost
::shared_ptr<const dcp::CertificateChain> (void)> _get;
-
boost
::function<bool (void)> _nag_alter;
+
std::function<void (std
::shared_ptr<dcp::CertificateChain>)> _set;
+
std::function<std
::shared_ptr<const dcp::CertificateChain> (void)> _get;
+
std
::function<bool (void)> _nag_alter;
};
};
-class KeysPage : public
Standard
Page
+class KeysPage : public Page
{
public:
KeysPage (wxSize panel_size, int border)
{
public:
KeysPage (wxSize panel_size, int border)
- :
Standard
Page (panel_size, border)
+ : Page (panel_size, border)
{}
{}
- wxString GetName () const;
+ wxString GetName () const
override
;
#ifdef DCPOMATIC_OSX
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const
override
{
{
- return wxBitmap
("keys", wxBITMAP_TYPE_PNG_RESOURCE
);
+ return wxBitmap
(bitmap_path("keys"), wxBITMAP_TYPE_PNG
);
}
#endif
private:
}
#endif
private:
- void setup ();
+ void setup ()
override
;
void export_decryption_certificate ();
void export_decryption_certificate ();
- void config_changed () {}
+ void config_changed ()
override
{}
bool nag_alter_decryption_chain ();
void decryption_advanced ();
void signing_advanced ();
void export_decryption_chain_and_key ();
void import_decryption_chain_and_key ();
bool nag_alter_decryption_chain ();
void decryption_advanced ();
void signing_advanced ();
void export_decryption_chain_and_key ();
void import_decryption_chain_and_key ();
+ void remake_signing ();
};
};
-class SoundPage : public
Standard
Page
+class SoundPage : public Page
{
public:
SoundPage (wxSize panel_size, int border)
{
public:
SoundPage (wxSize panel_size, int border)
- :
Standard
Page (panel_size, border)
+ : Page (panel_size, border)
{}
{}
- wxString GetName() const;
+ wxString GetName() const
override
;
#ifdef DCPOMATIC_OSX
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const
override
{
{
- return wxBitmap
("sound", wxBITMAP_TYPE_PNG_RESOURCE
);
+ return wxBitmap
(bitmap_path("sound"), wxBITMAP_TYPE_PNG
);
}
#endif
private:
}
#endif
private:
- void setup ();
- void config_changed ();
+ void setup ()
override
;
+ void config_changed ()
override
;
boost::optional<std::string> get_sound_output ();
void sound_changed ();
void sound_output_changed ();
boost::optional<std::string> get_sound_output ();
void sound_changed ();
void sound_output_changed ();
@@
-214,33
+220,28
@@
private:
Button* _reset_to_default;
};
Button* _reset_to_default;
};
-class LocationsPage : public StandardPage
+
+class LocationsPage : public Page
{
public:
LocationsPage (wxSize panel_size, int border);
{
public:
LocationsPage (wxSize panel_size, int border);
- wxString GetName () const;
+ wxString GetName () const
override
;
#ifdef DCPOMATIC_OSX
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const;
+ wxBitmap GetLargeIcon () const
override
;
#endif
private:
#endif
private:
- void setup ();
- void config_changed ();
+ void setup ()
override
;
+ void config_changed ()
override
;
void content_directory_changed ();
void playlist_directory_changed ();
void kdm_directory_changed ();
void content_directory_changed ();
void playlist_directory_changed ();
void kdm_directory_changed ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- void background_image_changed ();
-#endif
-
wxDirPickerCtrl* _content_directory;
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
wxDirPickerCtrl* _content_directory;
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- FilePickerCtrl* _background_image;
-#endif
};
};
+
#endif
#endif