diff --git a/.gitignore b/.gitignore index 2811ff9..805e582 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.gz *.tar *.rar +*.qm Makefile prototypes/sdl/run prototypes/wx-01-simple/run @@ -16,7 +17,7 @@ prototypes/wx-03-polyline/run prototypes/wx-04-gst/run Debug/ Release/ -libremapping +mapmap moc_*.cpp prototypes/gst/ prototypes/wx-02-input-output/run diff --git a/Common.h b/Common.h index 49d5c77..a557131 100644 --- a/Common.h +++ b/Common.h @@ -30,7 +30,7 @@ #define LIBREMAPPING_VERSION "0.1" /** - * The main LibreMapping engine that deals with video mapping projects. + * The main MapMap engine that deals with video mapping projects. */ class Common { diff --git a/Doxyfile b/Doxyfile index f4765a9..1c87315 100644 --- a/Doxyfile +++ b/Doxyfile @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "LibreMapping" +PROJECT_NAME = "MapMap" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/MainWindow.cpp b/MainWindow.cpp index 5a8d17e..cbed161 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -162,7 +162,7 @@ void MainWindow::open() if (okToContinue()) { QString fileName = QFileDialog::getOpenFileName(this, - tr("Open project"), ".", tr("LibreMapping files (*.lmp)")); + tr("Open project"), ".", tr("MapMap files (*.lmp)")); if (!fileName.isEmpty()) loadFile(fileName); } @@ -183,7 +183,7 @@ bool MainWindow::save() bool MainWindow::saveAs() { QString fileName = QFileDialog::getSaveFileName(this, tr("Save project"), - ".", tr("LibreMapping files (*.lmp)")); + ".", tr("MapMap files (*.lmp)")); if (fileName.isEmpty()) return false; @@ -319,14 +319,14 @@ void MainWindow::addEllipse() void MainWindow::about() { - QMessageBox::about(this, tr("About LibreMapping"), - tr("

LibreMapping " + QMessageBox::about(this, tr("About MapMap"), + tr("

MapMap " LIBREMAPPING_VERSION "

" "

Copyright © 2013 Sofian Audry" "

Copyright © 2013 Alexandre Quessy" "

Copyright © 2013 Vasilis Liaskovitis" - "

LibreMapping is a free software for video mapping. " + "

MapMap is a free software for video mapping. " "

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 " @@ -689,7 +689,7 @@ void MainWindow::createLayout() // Upon resizing window, give some extra stretch expansion to canvasSplitter. //mainSplitter->setStretchFactor(0, 1); - setWindowTitle(tr("LibreMapping")); + setWindowTitle(tr("MapMap")); resize(DEFAULT_WIDTH, DEFAULT_HEIGHT); setCentralWidget(mainSplitter); @@ -897,7 +897,7 @@ void MainWindow::createStatusBar() void MainWindow::readSettings() { - QSettings settings("LibreMapping", "LibreMapping"); + QSettings settings("MapMap", "MapMap"); restoreGeometry(settings.value("geometry").toByteArray()); mainSplitter->restoreState(settings.value("mainSplitter").toByteArray()); @@ -908,7 +908,7 @@ void MainWindow::readSettings() void MainWindow::writeSettings() { - QSettings settings("LibreMapping", "LibreMapping"); + QSettings settings("MapMap", "MapMap"); settings.setValue("geometry", saveGeometry()); settings.setValue("mainSplitter", mainSplitter->saveState()); @@ -921,7 +921,7 @@ bool MainWindow::okToContinue() { if (isWindowModified()) { - int r = QMessageBox::warning(this, tr("LibreMapping"), + int r = QMessageBox::warning(this, tr("MapMap"), tr("The document has been modified.\n" "Do you want to save your changes?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel); @@ -1005,7 +1005,7 @@ void MainWindow::setCurrentFile(const QString &fileName) shownName = strippedName(curFile); } - setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("LibreMapping Project"))); + setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("MapMap Project"))); } // TODO @@ -1017,7 +1017,7 @@ bool MainWindow::importMediaFile(const QString &fileName) { QFile file(fileName); if (!file.open(QIODevice::ReadOnly)) { - QMessageBox::warning(this, tr("LibreMapping Project"), + QMessageBox::warning(this, tr("MapMap Project"), tr("Cannot read file %1:\n%2.") .arg(file.fileName()) .arg(file.errorString())); diff --git a/OscInterface.h b/OscInterface.h index d539c98..f6616a0 100644 --- a/OscInterface.h +++ b/OscInterface.h @@ -31,7 +31,7 @@ class Facade; // forward decl /** - * Open Sound Control sending and receiving for LibreMapping. + * Open Sound Control sending and receiving for MapMap. */ class OscInterface { diff --git a/ProjectReader.cpp b/ProjectReader.cpp index 6e4568e..9caeee9 100644 --- a/ProjectReader.cpp +++ b/ProjectReader.cpp @@ -42,7 +42,7 @@ bool ProjectReader::readFile(QIODevice *device) QDomElement root = doc.documentElement(); if (root.tagName() != "project" || root.attribute("version") != "1.0") { - _xml.raiseError(QObject::tr("The file is not a libremapping version 1.0 file.")); + _xml.raiseError(QObject::tr("The file is not a mapmap version 1.0 file.")); return false; } diff --git a/ProjectWriter.cpp b/ProjectWriter.cpp index 0b89e3f..f82a4f7 100644 --- a/ProjectWriter.cpp +++ b/ProjectWriter.cpp @@ -31,7 +31,7 @@ bool ProjectWriter::writeFile(QIODevice *device) _xml.setDevice(device); _xml.writeStartDocument(); - _xml.writeDTD(""); + _xml.writeDTD(""); _xml.writeStartElement("project"); _xml.writeAttribute("version", "1.0"); diff --git a/README b/README index b36ed3e..2d53cac 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -LibreMapping +MapMap ============ -LibreMapping is a free video mapping software. +MapMap is a free video mapping software. Projection mapping, also known as video mapping and spatial augmented reality, is a projection technology used to turn objects, often irregularly shaped, into @@ -44,9 +44,9 @@ To edit translations -------------------- You might need to update the files:: - lupdate libremapping.pro + lupdate mapmap.pro Then, do this:: - linguist libremapping_fr.ts + linguist mapmap_fr.ts diff --git a/build.sh b/build.sh index 70cdc21..0919c0b 100755 --- a/build.sh +++ b/build.sh @@ -2,4 +2,4 @@ # qt4-default qt4-qmake qmake-qt4 make -lrelease libremapping_fr.ts +lrelease mapmap_fr.ts diff --git a/index.dox b/index.dox index 21cb9ae..7e362ad 100644 --- a/index.dox +++ b/index.dox @@ -1,8 +1,8 @@ -/*! \mainpage LibreMapping is a free video mapping software. +/*! \mainpage MapMap is a free video mapping software. * * \section intro_sec Introduction * - * With LibreMapping, you can paint shapes in the space. + * With MapMap, you can paint shapes in the space. * * Authors and contributors: Sofian Audry, Alexandre Quessy, Sylvain Cormier, Mike Latona, Christian Ambaud, Maxime Damecourt. * diff --git a/main.cpp b/main.cpp index 526bdc5..55983ad 100644 --- a/main.cpp +++ b/main.cpp @@ -1,15 +1,12 @@ // NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability. #include - #include #include #include "Common.h" #include "MainWindow.h" #include "MainApplication.h" -#include - int main(int argc, char *argv[]) { // TODO: avoid segfaults when OSC port is busy @@ -22,7 +19,7 @@ int main(int argc, char *argv[]) } QTranslator translator; - translator.load("libremapping_fr"); + translator.load("mapmap_fr"); app.installTranslator(&translator); MainWindow win; @@ -35,4 +32,3 @@ int main(int argc, char *argv[]) return app.exec(); } - diff --git a/libremapping.pro b/mapmap.pro similarity index 94% rename from libremapping.pro rename to mapmap.pro index fefe88a..610837b 100644 --- a/libremapping.pro +++ b/mapmap.pro @@ -40,9 +40,9 @@ SOURCES = \ main.cpp QT += gui opengl xml -RESOURCES = libremapping.qrc +RESOURCES = mapmap.qrc -TRANSLATIONS = libremapping_fr.ts +TRANSLATIONS = mapmap_fr.ts include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri) @@ -56,3 +56,4 @@ macx:QMAKE_CXXFLAGS += -D__MACOSX_CORE__ # not mac !macx:LIBS += -lglut -lGLU + diff --git a/libremapping.qrc b/mapmap.qrc similarity index 100% rename from libremapping.qrc rename to mapmap.qrc diff --git a/libremapping_fr.ts b/mapmap_fr.ts similarity index 96% rename from libremapping_fr.ts rename to mapmap_fr.ts index d1a13d1..79482f5 100644 --- a/libremapping_fr.ts +++ b/mapmap_fr.ts @@ -8,16 +8,16 @@ Sauvegarder le projet - LibreMapping files (*.lmp) - Fichiers LibreMapping (*.lmp) + MapMap files (*.lmp) + Fichiers MapMap (*.lmp) Import resource Importer une ressource - About LibreMapping - À propos de LibreMapping + About MapMap + À propos de MapMap &New @@ -149,8 +149,8 @@ Do you want to save your changes? - LibreMapping Project - Projet LibreMapping + MapMap Project + Projet MapMap File imported @@ -169,12 +169,12 @@ Do you want to save your changes? Importer une source média - <h2>LibreMapping - <h2>LibreMapping + <h2>MapMap + <h2>MapMap - LibreMapping - LibreMapping + MapMap + MapMap @@ -201,7 +201,7 @@ Do you want to save your changes? The file is not a libremapping version 1.0 file. - Ce fichier n'est pas un projet LibreMapping version 1.0 + Ce fichier n'est pas un projet MapMap version 1.0 %1