summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dvdomatic.cc12
-rw-r--r--src/tools/po/es_ES.po20
-rw-r--r--src/tools/po/fr_FR.po20
-rw-r--r--src/tools/po/it_IT.po20
-rw-r--r--src/tools/po/sv_SE.po21
-rw-r--r--src/tools/servomatic_gui.cc24
6 files changed, 85 insertions, 32 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index a0e7f0de8..6c27892b0 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -314,8 +314,16 @@ private:
void file_open (wxCommandEvent &)
{
wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
- int const r = c->ShowModal ();
-
+ int r;
+ while (1) {
+ r = c->ShowModal ();
+ if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
+ error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open."));
+ } else {
+ break;
+ }
+ }
+
if (r == wxID_OK) {
maybe_save_then_delete_film ();
try {
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 777a86519..4a3710eb8 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DVDOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
"PO-Revision-Date: 2013-03-23 21:08-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -65,7 +65,7 @@ msgstr "&Guardar"
msgid "&Send DCP to TMS"
msgstr "&Enviar DCP al TMS"
-#: src/tools/dvdomatic.cc:409
+#: src/tools/dvdomatic.cc:417
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
@@ -75,18 +75,18 @@ msgstr ""
msgid "About"
msgstr "Acerca de"
-#: src/tools/dvdomatic.cc:517
+#: src/tools/dvdomatic.cc:527
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "No se pudo cargar la película %s (%s)"
-#: src/tools/dvdomatic.cc:331
+#: src/tools/dvdomatic.cc:339
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "No se pudo cargar la película en %s (%s)"
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:521
+#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
+#: src/tools/dvdomatic.cc:531
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
@@ -94,7 +94,7 @@ msgstr "DVD-o-matic"
msgid "Film changed"
msgstr "Película cambiada"
-#: src/tools/dvdomatic.cc:408
+#: src/tools/dvdomatic.cc:416
msgid "Free, open-source DCP generation from almost anything."
msgstr ""
"Generación de DCP a partir de casi cualquier fuente, libre y de código "
@@ -120,3 +120,9 @@ msgstr "Selecciona la película a abrir"
#, fuzzy
msgid "The directory %1 already exists."
msgstr "La carpeta %s ya existe."
+
+#: src/tools/dvdomatic.cc:324
+msgid ""
+"You did not select a folder. Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index fc9c670fc..3c4cc79c5 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DVD-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
"PO-Revision-Date: 2013-03-13 22:33+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -64,7 +64,7 @@ msgstr "&Enregistrer"
msgid "&Send DCP to TMS"
msgstr "&Envoyer le DCP dans le TMS"
-#: src/tools/dvdomatic.cc:409
+#: src/tools/dvdomatic.cc:417
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
@@ -74,18 +74,18 @@ msgstr ""
msgid "About"
msgstr "A Propos"
-#: src/tools/dvdomatic.cc:517
+#: src/tools/dvdomatic.cc:527
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "Impossible de charger le film %s (%s)"
-#: src/tools/dvdomatic.cc:331
+#: src/tools/dvdomatic.cc:339
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Impossible d'ouvrir le film à %s (%s)"
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:521
+#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
+#: src/tools/dvdomatic.cc:531
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
@@ -93,7 +93,7 @@ msgstr "DVD-o-matic"
msgid "Film changed"
msgstr "Film changé"
-#: src/tools/dvdomatic.cc:408
+#: src/tools/dvdomatic.cc:416
msgid "Free, open-source DCP generation from almost anything."
msgstr "Création de DCP libre et open-source à partir de presque tout."
@@ -117,3 +117,9 @@ msgstr "Sélectionner le film à ouvrir"
#, fuzzy
msgid "The directory %1 already exists."
msgstr "Le dossier %s existe déjà."
+
+#: src/tools/dvdomatic.cc:324
+msgid ""
+"You did not select a folder. Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 0f9de5e36..850fd9b1f 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
"PO-Revision-Date: 2013-03-22 18:03+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
@@ -65,7 +65,7 @@ msgstr "&Salva"
msgid "&Send DCP to TMS"
msgstr "&Invia DCP a TMS"
-#: src/tools/dvdomatic.cc:409
+#: src/tools/dvdomatic.cc:417
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
@@ -75,18 +75,18 @@ msgstr ""
msgid "About"
msgstr "Informazioni"
-#: src/tools/dvdomatic.cc:517
+#: src/tools/dvdomatic.cc:527
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "Non posso caricare il film %s (%s)"
-#: src/tools/dvdomatic.cc:331
+#: src/tools/dvdomatic.cc:339
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Non posso aprire il film in %s (%s)"
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:521
+#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
+#: src/tools/dvdomatic.cc:531
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
@@ -94,7 +94,7 @@ msgstr "DVD-o-matic"
msgid "Film changed"
msgstr "Film modificato"
-#: src/tools/dvdomatic.cc:408
+#: src/tools/dvdomatic.cc:416
msgid "Free, open-source DCP generation from almost anything."
msgstr "Genera DCP da quasi tutto, free e open-source."
@@ -118,3 +118,9 @@ msgstr "Seleziona il film da aprire"
#, fuzzy
msgid "The directory %1 already exists."
msgstr "La directory %s esiste gia'."
+
+#: src/tools/dvdomatic.cc:324
+msgid ""
+"You did not select a folder. Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index c007785f3..dd45c3baa 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: DVD-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
"PO-Revision-Date: 2013-04-04 10:11+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -64,7 +65,7 @@ msgstr "&Spara"
msgid "&Send DCP to TMS"
msgstr "&Skicka DCP till TMS"
-#: src/tools/dvdomatic.cc:409
+#: src/tools/dvdomatic.cc:417
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
@@ -74,17 +75,17 @@ msgstr ""
msgid "About"
msgstr "Om"
-#: src/tools/dvdomatic.cc:517
+#: src/tools/dvdomatic.cc:527
msgid "Could not load film %1 (%2)"
msgstr "Kunde inte öppna filmen %1 (%2)"
-#: src/tools/dvdomatic.cc:331
+#: src/tools/dvdomatic.cc:339
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Kunde inte öppna filmen vid %s (%s)"
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:521
+#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
+#: src/tools/dvdomatic.cc:531
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
@@ -92,7 +93,7 @@ msgstr "DVD-o-matic"
msgid "Film changed"
msgstr "Film ändrad"
-#: src/tools/dvdomatic.cc:408
+#: src/tools/dvdomatic.cc:416
msgid "Free, open-source DCP generation from almost anything."
msgstr ""
"Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
@@ -116,3 +117,9 @@ msgstr "Välj film att öppna"
#: src/tools/dvdomatic.cc:303
msgid "The directory %1 already exists."
msgstr "Katalogen %1 finns redan."
+
+#: src/tools/dvdomatic.cc:324
+msgid ""
+"You did not select a folder. Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index dd169725f..52ec0a3a3 100644
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -94,7 +94,15 @@ class TaskBarIcon : public wxTaskBarIcon
public:
TaskBarIcon ()
{
+#ifdef __WXMSW__
wxIcon icon (std_to_wx ("taskbar_icon"));
+#endif
+#ifdef __WXGTK__
+ wxInitAllImageHandlers();
+ wxBitmap bitmap (wxString::Format ("%s/taskbar_icon.png", POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
+ wxIcon icon;
+ icon.CopyFromBitmap (bitmap);
+#endif
SetIcon (icon, std_to_wx ("DVD-o-matic encode server"));
Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
@@ -128,20 +136,31 @@ public:
App ()
: wxApp ()
, _thread (0)
+ , _icon (0)
{}
private:
bool OnInit ()
{
+ if (!wxApp::OnInit ()) {
+ return false;
+ }
+
dvdomatic_setup ();
- new TaskBarIcon;
-
+ _icon = new TaskBarIcon;
_thread = new thread (bind (&App::main_thread, this));
+
return true;
}
+ int OnExit ()
+ {
+ delete _icon;
+ return wxApp::OnExit ();
+ }
+
void main_thread ()
{
Server server (memory_log);
@@ -149,6 +168,7 @@ private:
}
boost::thread* _thread;
+ TaskBarIcon* _icon;
};
IMPLEMENT_APP (App)
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-14 21:25:33 +0000