Merge branch 'translation' into statesaving

.gitignore

@@ -17,11 +17,11 @@ prototypes/wx-04-gst/run
 Debug/
 Release/
 libremapping
-moc_DestinationGLCanvas.cpp
-moc_MapperGLCanvas.cpp
-moc_MainWindow.cpp
-moc_SourceGLCanvas.cpp
+moc_*.cpp
 prototypes/gst/
 prototypes/wx-02-input-output/run
-qrc_libremapping.cpp
+qrc_*.cpp
+qteditorfactory.moc
+qtpropertymanager.moc
+qttreepropertybrowser.moc
 html/

MainWindow.cpp

@@ -160,7 +160,7 @@ void MainWindow::open()
   if (okToContinue())
   {
     QString fileName = QFileDialog::getOpenFileName(this,
-        tr("Open mapping"), ".", tr("Libremapping files (*.lmp)"));
+        tr("Open project"), ".", tr("LibreMapping files (*.lmp)"));
     if (!fileName.isEmpty())
       loadFile(fileName);
   }
@@ -180,7 +180,7 @@ bool MainWindow::save()
 
 bool MainWindow::saveAs()
 {
-  QString fileName = QFileDialog::getSaveFileName(this, tr("Save mapping project"),
+  QString fileName = QFileDialog::getSaveFileName(this, tr("Save project"),
       ".", tr("LibreMapping files (*.lmp)"));
   if (fileName.isEmpty())
     return false;
@@ -193,7 +193,7 @@ void MainWindow::import()
   if (okToContinue())
   {
     QString fileName = QFileDialog::getOpenFileName(this,
-        tr("Import resource"), ".");
+        tr("Import media source file"), ".");
     if (!fileName.isEmpty())
       importMediaFile(fileName);
   }
@@ -255,8 +255,7 @@ void MainWindow::about()
           "<p>Copyright &copy; 2013 Sofian Audry"
           "<p>Copyright &copy; 2013 Alexandre Quessy"
           "<p>Copyright &copy; 2013 Vasilis Liaskovitis"
-          "<p>Copyright &copy; 2013 Sylvain Cormier"
-          "<p>Libremapping is a free software for video mapping. "
+          "<p>LibreMapping is a free software for video mapping. "
           "<p>Projection mapping, also known as video mapping and spatial augmented reality, "
           "is a projection technology used to turn objects, often irregularly shaped, into "
           "a display surface for video projection. These objects may be complex industrial "
@@ -345,7 +344,7 @@ void MainWindow::createLayout()
   // Upon resizing window, give some extra stretch expansion to canvasSplitter.
   //mainSplitter->setStretchFactor(0, 1);
 
-  setWindowTitle(tr("Libremapping"));
+  setWindowTitle(tr("LibreMapping"));
   resize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
   setCentralWidget(mainSplitter);
 
@@ -388,30 +387,30 @@ void MainWindow::createActions()
   newAction = new QAction(tr("&New"), this);
   newAction->setIcon(QIcon(":/images/document-new-4.png"));
   newAction->setShortcut(QKeySequence::New);
-  newAction->setStatusTip(tr("Create a new mapping file"));
+  newAction->setStatusTip(tr("Create a new project"));
   connect(newAction, SIGNAL(triggered()), this, SLOT(newFile()));
 
   openAction = new QAction(tr("&Open..."), this);
   openAction->setIcon(QIcon(":/images/document-open-3.png"));
   openAction->setShortcut(QKeySequence::Open);
-  openAction->setStatusTip(tr("Open an existing mapping file"));
+  openAction->setStatusTip(tr("Open an existing project"));
   connect(openAction, SIGNAL(triggered()), this, SLOT(open()));
 
   saveAction = new QAction(tr("&Save"), this);
   saveAction->setIcon(QIcon(":/images/document-save-2.png"));
   saveAction->setShortcut(QKeySequence::Save);
-  saveAction->setStatusTip(tr("Save the mapping to disk"));
+  saveAction->setStatusTip(tr("Save the project"));
   connect(saveAction, SIGNAL(triggered()), this, SLOT(save()));
 
   saveAsAction = new QAction(tr("Save &As..."), this);
   saveAsAction->setIcon(QIcon(":/images/document-save-as-2.png"));
-  saveAsAction->setStatusTip(tr("Save the mapping under a new name"));
+  saveAsAction->setStatusTip(tr("Save the project as..."));
   connect(saveAsAction, SIGNAL(triggered()), this, SLOT(saveAs()));
 
-  importAction = new QAction(tr("&Import media source..."), this);
+  importAction = new QAction(tr("&Import media source file..."), this);
   importAction->setIcon(QIcon(":/images/document-import-2.png"));
   importAction->setShortcut(QKeySequence::Open);
-  importAction->setStatusTip(tr("Import a media source file"));
+  importAction->setStatusTip(tr("Import a media source file..."));
   connect(importAction, SIGNAL(triggered()), this, SLOT(import()));
 
   exitAction = new QAction(tr("E&xit"), this);
@@ -572,7 +571,7 @@ bool MainWindow::okToContinue()
 {
   if (isWindowModified())
   {
-    int r = QMessageBox::warning(this, tr("Libremapping"),
+    int r = QMessageBox::warning(this, tr("LibreMapping"),
         tr("The document has been modified.\n"
             "Do you want to save your changes?"),
         QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);

README

@@ -38,4 +38,15 @@ Contributors
 * Mike Latona
 * Maxime Damecourt
 * Christian Ambaud
+* Sylvain Cormier
+
+To edit translations
+--------------------
+You might need to update the files::
+  
+  lupdate libremapping.pro 
+
+Then, do this::
+  
+  linguist libremapping_fr.ts
 

build.sh

@@ -2,3 +2,4 @@
 # qt4-default qt4-qmake
 qmake-qt4
 make
+lrelease libremapping_fr.ts

libremapping.pro

@@ -35,6 +35,8 @@ SOURCES  = \
 QT      += gui opengl xml
 RESOURCES = libremapping.qrc
 
+TRANSLATIONS = libremapping_fr.ts
+
 include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
 
 docs.depends = $(HEADERS) $(SOURCES)

libremapping_fr.ts

@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr">
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Save mapping project</source>
+        <translation type="obsolete">Sauvegarder le projet</translation>
+    </message>
+    <message>
+        <source>LibreMapping files (*.lmp)</source>
+        <translation>Fichiers LibreMapping (*.lmp)</translation>
+    </message>
+    <message>
+        <source>Import resource</source>
+        <translation type="obsolete">Importer une ressource</translation>
+    </message>
+    <message>
+        <source>About LibreMapping</source>
+        <translation>À propos de LibreMapping</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Nouveau</translation>
+    </message>
+    <message>
+        <source>Create a new mapping file</source>
+        <translation type="unfinished">Créer un nouveau projet</translation>
+    </message>
+    <message>
+        <source>&amp;Open...</source>
+        <translation type="unfinished">&amp;Ouvrir</translation>
+    </message>
+    <message>
+        <source>Open an existing mapping file</source>
+        <translation type="unfinished">Ouvrir un projet existant</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sauvegarder</translation>
+    </message>
+    <message>
+        <source>Save the mapping to disk</source>
+        <translation type="unfinished">Sauvegarder le projet</translation>
+    </message>
+    <message>
+        <source>Save &amp;As...</source>
+        <translation type="unfinished">S&amp;auvegarder sous...</translation>
+    </message>
+    <message>
+        <source>Save the mapping under a new name</source>
+        <translation type="unfinished">Sauvegarder sous un nouveau nom</translation>
+    </message>
+    <message>
+        <source>&amp;Import media source...</source>
+        <translation type="unfinished">Importer un média</translation>
+    </message>
+    <message>
+        <source>Import a media source file</source>
+        <translation type="unfinished">Importer un fichier média</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">Quitter</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exit the application</source>
+        <translation>Quitter l&apos;application</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;À propos</translation>
+    </message>
+    <message>
+        <source>Show the application&apos;s About box</source>
+        <translation>Afficher le dialogue À propos de l&apos;application</translation>
+    </message>
+    <message>
+        <source>&amp;Add quad</source>
+        <translation>&amp;Ajouter un mesh</translation>
+    </message>
+    <message>
+        <source>Add quad</source>
+        <translation>Ajouter un mesh</translation>
+    </message>
+    <message>
+        <source>&amp;Add triangle</source>
+        <translation>Ajouter un triangle</translation>
+    </message>
+    <message>
+        <source>Add triangle</source>
+        <translation>Ajouter un triangle</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fichier</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
+        <source>The document has been modified.
+Do you want to save your changes?</source>
+        <translation>Ce document a été modifié. Voulez-vous sauvegarder vos changements?</translation>
+    </message>
+    <message>
+        <source>Error reading mapping project file</source>
+        <translation>Erreur de lecture de projet</translation>
+    </message>
+    <message>
+        <source>Cannot read file %1:
+%2.</source>
+        <translation>Impossible de lire le fichier %1: %2</translation>
+    </message>
+    <message>
+        <source>Parse error in file %1:
+
+%2</source>
+        <translation>Erreur de syntaxe dans le fichier %1: %2</translation>
+    </message>
+    <message>
+        <source>File loaded</source>
+        <translation>Fichier chargé</translation>
+    </message>
+    <message>
+        <source>Error saving mapping project</source>
+        <translation>Erreur en sauvegardant le fichier de projet</translation>
+    </message>
+    <message>
+        <source>Cannot write file %1:
+%2.</source>
+        <translation>Impossible d&apos;écrire le fichier %1: %2</translation>
+    </message>
+    <message>
+        <source>File saved</source>
+        <translation>Fichier sauvegardé</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation>Sans titre</translation>
+    </message>
+    <message>
+        <source>%1[*] - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LibreMapping Project</source>
+        <translation>Projet LibreMapping</translation>
+    </message>
+    <message>
+        <source>File imported</source>
+        <translation>Fichier importé</translation>
+    </message>
+    <message>
+        <source>Open project</source>
+        <translation>Ouvrir un projet</translation>
+    </message>
+    <message>
+        <source>Save project</source>
+        <translation>Sauvegarder le projet</translation>
+    </message>
+    <message>
+        <source>Import media resource</source>
+        <translation>Importer une source média</translation>
+    </message>
+    <message>
+        <source>&lt;h2&gt;LibreMapping </source>
+        <translation>&lt;h2&gt;LibreMapping</translation>
+    </message>
+    <message>
+        <source>LibreMapping</source>
+        <translation>LibreMapping</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Texture mapping</source>
+        <translation>Mapping texturé</translation>
+    </message>
+    <message>
+        <source>Input shape</source>
+        <translation>Forme en entrée</translation>
+    </message>
+    <message>
+        <source>Output shape</source>
+        <translation>Forme en sortie</translation>
+    </message>
+    <message>
+        <source>Point %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The file is not a libremapping version 1.0 file.</source>
+        <translation>Ce fichier n&apos;est pas un projet LibreMapping version 1.0</translation>
+    </message>
+    <message>
+        <source>%1
+Line %2, column %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtBoolEdit</name>
+    <message>
+        <source>True</source>
+        <translation>vrai</translation>
+    </message>
+    <message>
+        <source>False</source>
+        <translation>faux</translation>
+    </message>
+</context>
+<context>
+    <name>QtBoolPropertyManager</name>
+    <message>
+        <source>True</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>False</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtCharEdit</name>
+    <message>
+        <source>Clear Char</source>
+        <translation>Effacer le charactère</translation>
+    </message>
+</context>
+<context>
+    <name>QtColorEditWidget</name>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtColorPropertyManager</name>
+    <message>
+        <source>Red</source>
+        <translation>Rouge</translation>
+    </message>
+    <message>
+        <source>Green</source>
+        <translation>Vert</translation>
+    </message>
+    <message>
+        <source>Blue</source>
+        <translation>Bleu</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Transparence</translation>
+    </message>
+</context>
+<context>
+    <name>QtCursorDatabase</name>
+    <message>
+        <source>Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cross</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IBeam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size Backslash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size Slash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blank</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Split Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Split Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pointing Hand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forbidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Hand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closed Hand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What&apos;s This</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtFontEditWidget</name>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtFontPropertyManager</name>
+    <message>
+        <source>Family</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Point Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Underline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strikeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kerning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtKeySequenceEdit</name>
+    <message>
+        <source>Clear Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtLocalePropertyManager</name>
+    <message>
+        <source>%1, %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtPointFPropertyManager</name>
+    <message>
+        <source>(%1, %2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtPointPropertyManager</name>
+    <message>
+        <source>(%1, %2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtPropertyBrowserUtils</name>
+    <message>
+        <source>[%1, %2, %3] (%4)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[%1, %2]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRectFPropertyManager</name>
+    <message>
+        <source>[(%1, %2), %3 x %4]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRectPropertyManager</name>
+    <message>
+        <source>[(%1, %2), %3 x %4]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtSizeFPropertyManager</name>
+    <message>
+        <source>%1 x %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtSizePolicyPropertyManager</name>
+    <message>
+        <source>&lt;Invalid&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[%1, %2, %3, %4]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal Stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical Stretch</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtSizePropertyManager</name>
+    <message>
+        <source>%1 x %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtTreePropertyBrowser</name>
+    <message>
+        <source>Property</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

main.cpp

@@ -2,6 +2,7 @@
 
 #include <iostream>
 #include <QApplication>
+#include <QTranslator>
 #include <QtGui>
 #include "Common.h"
 #include "MainWindow.h"
@@ -18,9 +19,16 @@ int main(int argc, char *argv[])
     std::cerr << "This system has no OpenGL support" << std::endl;
     return 1;
   }
+
+  QTranslator translator;
+  translator.load("libremapping_fr");
+  app.installTranslator(&translator);
+
   MainWindow win;
   MainWindow::setInstance(&win);
 
+  //win.setLocale(QLocale("fr"));
+
   win.show();
 
   return app.exec();