*/
-#include "wx/wx_util.h"
-#include "wx/wx_signal_manager.h"
+#include "wx/id.h"
#include "wx/static_text.h"
-#include "lib/util.h"
-#include "lib/encoded_log_entry.h"
-#include "lib/encode_server.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
#include "lib/config.h"
-#include "lib/log.h"
-#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
+#include "lib/encode_server.h"
+#include "lib/encoded_log_entry.h"
+#include "lib/log.h"
+#include "lib/signaller.h"
+#include "lib/util.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/icon.h>
using std::cout;
-using std::string;
+using std::dynamic_pointer_cast;
using std::exception;
-using std::list;
using std::fixed;
+using std::list;
using std::setprecision;
using std::shared_ptr;
-using boost::thread;
+using std::string;
using boost::bind;
using boost::optional;
-using std::dynamic_pointer_cast;
+using boost::thread;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
enum {
- ID_status = 1,
+ ID_status = DCPOMATIC_MAIN_MENU,
ID_quit,
ID_timer
};
#else
string const colour = gui_is_dark() ? "white" : "black";
wxBitmap bitmap (
- bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+ bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
wxBITMAP_TYPE_PNG
);
wxIcon icon;
server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
dcpomatic_log = server_log;
- Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1));
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
auto splash = maybe_show_splash ();
signal_manager->ui_idle ();
}
- void config_failed_to_load ()
+ void config_failed_to_load(Config::LoadFailure what)
{
- message_dialog (nullptr, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ report_config_load_failure(nullptr, what);
}
void config_warning (string m)