diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-15 16:35:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-15 16:35:32 +0100 |
| commit | fcfaa5e1de1e166508793d71ed53edcb145656da (patch) | |
| tree | aaab01d73473d5021228b3d6b029f5b1c3c521af /src/tools | |
| parent | 32bd6c0c623b8e19470955705c2da795a95ab476 (diff) | |
00cc8646894f6519d1e2726f3e7a4fbc1e11d8f3 from master; make the config dialog update itself when the configuration changes, and add a menu option to restore the default configuration.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index d0b6faecb..16506e411 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -127,6 +127,7 @@ enum { ID_file_save, ID_file_properties, ID_file_history, + ID_edit_restore_default_preferences, /* Allow spare IDs after _history for the recent files list */ ID_content_scale_to_fit_width = 100, ID_content_scale_to_fit_height, @@ -189,6 +190,7 @@ public: Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_history, this, _1), ID_file_history, ID_file_history + HISTORY_SIZE); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_exit, this), wxID_EXIT); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_preferences, this), wxID_PREFERENCES); + Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_restore_default_preferences, this), ID_edit_restore_default_preferences); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_dcp, this), ID_jobs_make_dcp); @@ -391,6 +393,11 @@ private: _config_dialog->Show (this); } + void edit_restore_default_preferences () + { + Config::restore_defaults (); + } + void jobs_make_dcp () { double required; @@ -660,9 +667,11 @@ private: #ifdef __WXOSX__ add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); + add_item (_file_menu, _("Restore default preferences"), ID_edit_restore_default_preferences, ALWAYS); #else wxMenu* edit = new wxMenu; add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS); + add_item (edit, _("Restore default preferences"), ID_edit_restore_default_preferences, ALWAYS); #endif wxMenu* content = new wxMenu; |