projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp to fix an error in the player (#2401).
[dcpomatic.git]
/
src
/
wx
/
config_dialog.h
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index ce5df2c5b84b43badb59a4fbcee7cd77c8c3729f..ce2686864838e8a21f9dec1ce0a1c683e131f82b 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-18,35
+18,38
@@
*/
*/
+
#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/dcp_content_type.h"
-#include "lib/log.h"
-#include "lib/util.h"
#include "lib/cross.h"
#include "lib/cross.h"
+#include "lib/dcp_content_type.h"
#include "lib/exceptions.h"
#include "lib/exceptions.h"
-#include "lib/
warnings
.h"
-#include
<dcp/locale_convert.h>
-#include
<dcp/exceptions.h>
+#include "lib/
filter
.h"
+#include
"lib/log.h"
+#include
"lib/ratio.h"
#include <dcp/certificate_chain.h>
#include <dcp/certificate_chain.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/stdpaths.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_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>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
#include <RtAudio.h>
#include <RtAudio.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-#include <iostream>
+
class AudioMappingView;
class AudioMappingView;
+class CheckBox;
+
class Page : public wxPreferencesPage
{
class Page : public wxPreferencesPage
{
@@
-74,6
+77,7
@@
private:
bool _window_exists;
};
bool _window_exists;
};
+
class GeneralPage : public Page
{
public:
class GeneralPage : public Page
{
public:
@@
-84,7
+88,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("general"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("general"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-100,12
+104,13
@@
private:
void check_for_updates_changed ();
void check_for_test_updates_changed ();
void check_for_updates_changed ();
void check_for_test_updates_changed ();
-
wx
CheckBox* _set_language;
+ CheckBox* _set_language;
wxChoice* _language;
wxChoice* _language;
-
wx
CheckBox* _check_for_updates;
-
wx
CheckBox* _check_for_test_updates;
+ CheckBox* _check_for_updates;
+ CheckBox* _check_for_test_updates;
};
};
+
class CertificateChainEditor : public wxDialog
{
public:
class CertificateChainEditor : public wxDialog
{
public:
@@
-161,7
+166,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("keys"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("keys"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-192,7
+197,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("sound"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("sound"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-207,13
+212,14
@@
private:
void map_changed (AudioMapping m);
void reset_to_default ();
void map_changed (AudioMapping m);
void reset_to_default ();
-
wx
CheckBox* _sound;
+ CheckBox* _sound;
wxChoice* _sound_output;
wxStaticText* _sound_output_details;
AudioMappingView* _map;
Button* _reset_to_default;
};
wxChoice* _sound_output;
wxStaticText* _sound_output_details;
AudioMappingView* _map;
Button* _reset_to_default;
};
+
class LocationsPage : public Page
{
public:
class LocationsPage : public Page
{
public:
@@
-236,4
+242,5
@@
private:
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
};
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
};
+
#endif
#endif