No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 218b24b02dee1943f05ae8ca387a94a4fb8f7557..40e72543a7e374495057f8872c792b68f1ed71e8 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,12 +22,12 @@
  *  @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;
@@ -52,7 +53,7 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
                flags |= wxALIGN_RIGHT;
                t += wxT (":");
        }
-#endif 
+#endif
        wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
        s->Add (m, prop, flags, 6);
        return m;
@@ -60,9 +61,9 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
 
 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;
@@ -71,7 +72,7 @@ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, w
                flags |= wxALIGN_RIGHT;
                t += wxT (":");
        }
-#endif 
+#endif
        wxStaticText* m = new wxStaticText (p, wxID_ANY, t);
        s->Add (m, pos, span, flags);
        return m;
@@ -84,7 +85,19 @@ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, w
 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 ();
 }
@@ -97,7 +110,7 @@ confirm_dialog (wxWindow* parent, wxString m)
        d->Destroy ();
        return r == wxID_YES;
 }
-       
+
 
 /** @param s wxWidgets string.
  *  @return Corresponding STL string.
@@ -124,16 +137,16 @@ string_client_data (wxClientData* o)
 }
 
 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()));
        }
 }
 
@@ -169,7 +182,7 @@ checked_set (wxChoice* widget, string value)
        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) {
@@ -269,7 +282,7 @@ dcpomatic_setup_i18n ()
 
 #ifdef DCPOMATIC_WINDOWS
                locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
-#endif         
+#endif
 
 #ifdef DCPOMATIC_LINUX
                locale->AddCatalogLookupPathPrefix (LINUX_LOCALE_PREFIX);
@@ -279,11 +292,11 @@ dcpomatic_setup_i18n ()
                   of wxWidgets.
                */
                locale->AddCatalog (wxT ("dcpomatic2-wxstd"));
-#endif         
-               
+#endif
+
                locale->AddCatalog (wxT ("libdcpomatic2-wx"));
                locale->AddCatalog (wxT ("dcpomatic2"));
-               
+
                if (!locale->IsOk()) {
                        delete locale;
                        locale = new wxLocale (wxLANGUAGE_ENGLISH);
@@ -332,7 +345,7 @@ context_translation (wxString s)
 }
 
 wxString
-time_to_timecode (DCPTime t, float fps)
+time_to_timecode (DCPTime t, double fps)
 {
        double w = t.seconds ();
        int const h = (w / 3600);
@@ -341,6 +354,6 @@ time_to_timecode (DCPTime t, float fps)
        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);
 }