projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of in-place i18n with support for wxStaticText and wxCheckBox.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_server.cc
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index 84a7dbe56f1b4b92cfa209b902d6949f12964501..1a3a8de1a1b06c95703ee65461c001349e4ce720 100644
(file)
--- a/
src/tools/dcpomatic_server.cc
+++ b/
src/tools/dcpomatic_server.cc
@@
-1,33
+1,36
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
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.
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
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/>.
*/
#include "wx/wx_util.h"
#include "wx/wx_signal_manager.h"
*/
#include "wx/wx_util.h"
#include "wx/wx_signal_manager.h"
+#include "wx/static_text.h"
#include "lib/util.h"
#include "lib/encoded_log_entry.h"
#include "lib/encode_server.h"
#include "lib/config.h"
#include "lib/log.h"
#include "lib/util.h"
#include "lib/encoded_log_entry.h"
#include "lib/encode_server.h"
#include "lib/config.h"
#include "lib/log.h"
-#include "lib/raw_convert.h"
#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/signaller.h"
#include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
#include <wx/taskbar.h>
#include <wx/taskbar.h>
+#include <wx/splash.h>
#include <wx/icon.h>
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
#include <wx/icon.h>
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
@@
-145,7
+148,7
@@
public:
wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
- _fps = new
wxStaticText (this, wxID_ANY
, wxT(""));
+ _fps = new
StaticText (this
, wxT(""));
state_sizer->Add (_fps);
wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
state_sizer->Add (_fps);
wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@
-190,9
+193,7
@@
private:
void update_state ()
{
void update_state ()
{
- SafeStringStream s;
- s << fixed << setprecision(1) << server_log->fps ();
- _fps->SetLabel (std_to_wx (s.str()));
+ _fps->SetLabel (wxString::Format ("%.1f", server_log->fps()));
}
wxTextCtrl* _text;
}
wxTextCtrl* _text;
@@
-207,18
+208,23
@@
public:
: _status (0)
{
#ifdef DCPOMATIC_WINDOWS
: _status (0)
{
#ifdef DCPOMATIC_WINDOWS
- wxIcon icon (std_to_wx ("
taskbar_icon
"));
+ wxIcon icon (std_to_wx ("
id
"));
#else
wxInitAllImageHandlers();
#else
wxInitAllImageHandlers();
+#ifdef DCPOMATIC_LINUX
wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+#ifdef DCPOMATIC_OSX
+ wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
- Bind (wxEVT_
COMMAND_MENU_SELECTED
, boost::bind (&TaskBarIcon::status, this), ID_status);
- Bind (wxEVT_
COMMAND_MENU_SELECTED
, boost::bind (&TaskBarIcon::quit, this), ID_quit);
+ Bind (wxEVT_
MENU
, boost::bind (&TaskBarIcon::status, this), ID_status);
+ Bind (wxEVT_
MENU
, boost::bind (&TaskBarIcon::quit, this), ID_quit);
}
wxMenu* CreatePopupMenu ()
}
wxMenu* CreatePopupMenu ()
@@
-264,6
+270,12
@@
private:
}
server_log.reset (new ServerLog);
}
server_log.reset (new ServerLog);
+ dcpomatic_log = server_log;
+
+ Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+ wxSplashScreen* splash = maybe_show_splash ();
dcpomatic_setup_path_encoding ();
dcpomatic_setup_i18n ();
dcpomatic_setup_path_encoding ();
dcpomatic_setup_i18n ();
@@
-280,6
+292,10
@@
private:
_timer.reset (new wxTimer (this));
_timer->Start (1000);
_timer.reset (new wxTimer (this));
_timer->Start (1000);
+ if (splash) {
+ splash->Destroy ();
+ }
+
return true;
}
return true;
}
@@
-291,7
+307,7
@@
private:
void main_thread ()
try {
void main_thread ()
try {
- EncodeServer server (
server_log, false, Config::instance()->num_local
_encoding_threads());
+ EncodeServer server (
false, Config::instance()->server
_encoding_threads());
server.run ();
} catch (...) {
store_current ();
server.run ();
} catch (...) {
store_current ();
@@
-315,6
+331,16
@@
private:
signal_manager->ui_idle ();
}
signal_manager->ui_idle ();
}
+ void config_failed_to_load ()
+ {
+ message_dialog (0, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ }
+
+ void config_warning (string m)
+ {
+ message_dialog (0, std_to_wx (m));
+ }
+
boost::thread* _thread;
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;
boost::thread* _thread;
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;