* @brief Some utility functions and classes.
*/
-#include <boost/thread.hpp>
-#include <wx/filepicker.h>
-#include <wx/spinctrl.h>
+#include "wx_util.h"
+#include "file_picker_ctrl.h"
#include "lib/config.h"
#include "lib/util.h"
-#include "wx_util.h"
+#include <wx/spinctrl.h>
+#include <boost/thread.hpp>
using namespace std;
using namespace boost;
flags |= wxALIGN_RIGHT;
t += wxT (":");
}
-#endif
+#endif
wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
s->Add (m, prop, flags, 6);
return m;
wxStaticText *
#ifdef __WXOSX__
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
#else
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
#endif
{
int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
flags |= wxALIGN_RIGHT;
t += wxT (":");
}
-#endif
+#endif
wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
s->Add (m, pos, span, flags);
return m;
void
error_dialog (wxWindow* parent, wxString m)
{
- wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK);
+ wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+ d->ShowModal ();
+ d->Destroy ();
+}
+
+/** Pop up an error dialogue box.
+ * @param parent Parent.
+ * @param m Message.
+ */
+void
+message_dialog (wxWindow* parent, wxString m)
+{
+ wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
d->ShowModal ();
d->Destroy ();
}
d->Destroy ();
return r == wxID_YES;
}
-
+
/** @param s wxWidgets string.
* @return Corresponding STL string.
}
void
-checked_set (wxFilePickerCtrl* widget, string value)
+checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
{
- if (widget->GetPath() != std_to_wx (value)) {
+ if (widget->GetPath() != std_to_wx (value.string())) {
if (value.empty()) {
/* Hack to make wxWidgets clear the control when we are passed
an empty value.
*/
value = " ";
}
- widget->SetPath (std_to_wx (value));
+ widget->SetPath (std_to_wx (value.string()));
}
}
if (widget->GetSelection() != -1) {
o = widget->GetClientObject (widget->GetSelection ());
}
-
+
if (!o || string_client_data(o) != value) {
for (unsigned int i = 0; i < widget->GetCount(); ++i) {
if (string_client_data (widget->GetClientObject (i)) == value) {
#ifdef DCPOMATIC_WINDOWS
locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
-#endif
+#endif
#ifdef DCPOMATIC_LINUX
locale->AddCatalogLookupPathPrefix (LINUX_LOCALE_PREFIX);
so we rename it to avoid clashes with any other installation
of wxWidgets.
*/
- locale->AddCatalog (wxT ("dcpomatic-wxstd"));
-#endif
-
- locale->AddCatalog (wxT ("libdcpomatic-wx"));
- locale->AddCatalog (wxT ("dcpomatic"));
-
+ locale->AddCatalog (wxT ("dcpomatic2-wxstd"));
+#endif
+
+ locale->AddCatalog (wxT ("libdcpomatic2-wx"));
+ locale->AddCatalog (wxT ("dcpomatic2"));
+
if (!locale->IsOk()) {
delete locale;
locale = new wxLocale (wxLANGUAGE_ENGLISH);
}
wxString
-time_to_timecode (DCPTime t, float fps)
+time_to_timecode (DCPTime t, double fps)
{
double w = t.seconds ();
int const h = (w / 3600);
w -= m * 60;
int const s = floor (w);
w -= s;
- int const f = rint (w * fps);
+ int const f = lrint (w * fps);
return wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f);
}