Merge branch 'develop' into release-0.2.0

This commit is contained in:
Alexandre Quessy
2014-12-28 19:50:03 -05:00
7 changed files with 60 additions and 898 deletions
+2 -2
View File
@@ -65,13 +65,13 @@ if [[ $unamestr == "Darwin" ]]; then
make
macdeployqt MapMap.app
#cp -R /Library/Frameworks/GStreamer.framework ./MapMap.app/Contents/Frameworks/
lrelease mapmap_fr.ts
lrelease resources/texts/mapmap_fr.ts
# do_fix_qt_plugins_in_app
do_create_dmg
elif [[ $unamestr == "Linux" ]]; then
qmake
# -qt4
make
lrelease mapmap_fr.ts
lrelease resources/texts/mapmap_fr.ts
fi
+21 -2
View File
@@ -77,6 +77,9 @@ int main(int argc, char *argv[])
QCommandLineOption oscPortOption(QStringList() << "p" << "osc-port", "Use OSC port number <osc-port>.", "osc-port", "");
parser.addOption(oscPortOption);
// Positional argument: file
parser.addPositionalArgument("file", "Load project from that file.");
parser.process(app);
if (parser.isSet(versionOption) || parser.isSet(helpOption))
{
@@ -86,7 +89,8 @@ int main(int argc, char *argv[])
{
Util::eraseSettings();
}
#endif
#endif // USING_QT_5
if (! QGLFormat::hasOpenGL())
qFatal("This system has no OpenGL support.");
@@ -127,7 +131,22 @@ int main(int argc, char *argv[])
//win.setLocale(QLocale("fr"));
#if USING_QT_5
QString projectFileValue = parser.value("file");
// read positional argument:
const QStringList args = parser.positionalArguments();
QString projectFileValue = QString();
// there are two ways to specify the project file name.
// The 2nd overrides the first:
// read the file option value: (overrides the positional argument)
projectFileValue = parser.value("file");
// read the first positional argument:
if (! args.isEmpty())
{
projectFileValue = args.first();
}
// finally, load the project file.
if (projectFileValue != "")
{
win.loadFile(projectFileValue);
+19 -2
View File
@@ -54,7 +54,7 @@ SOURCES = \
main.cpp
RESOURCES = mapmap.qrc
TRANSLATIONS = mapmap_fr.ts mapmap_ar.ts
TRANSLATIONS = resources/texts/mapmap_fr.ts
include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri)
@@ -76,9 +76,26 @@ unix:!mac {
mapmapfile.files = mapmap
mapmapfile.path = /usr/bin
INSTALLS += mapmapfile
desktopfile.files = mapmap.desktop
desktopfile.files = resources/texts/mapmap.desktop
desktopfile.path = /usr/share/applications
INSTALLS += desktopfile
iconfile.files = resources/images/logo/mapmap.svg
iconfile.path = /usr/share/icons/hicolor/scalable/apps
INSTALLS += iconfile
mimetypesfile.files = resources/texts/mapmap.xml
mimetypesfile.path = /usr/share/mime/packages
INSTALLS += mimetypesfile
updatemimetypes.path = /usr/share/mime/packages
updatemimetypes.commands = update-mime-database /usr/share/mime
INSTALLS += updatemimetypes
updatemimeappdefault.path = /usr/share/applications
updatemimeappdefault.commands='grep mapmap.desktop /usr/share/applications/defaults.list >/dev/null|| sudo echo "application/mapmap=mapmap.desktop;" >> /usr/share/applications/defaults.list'
INSTALLS += updatemimeappdefault
# Add the docs target:
docs.depends = $(HEADERS) $(SOURCES)
docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
QMAKE_EXTRA_TARGETS += docs
}
# Mac OS X-specific:
-889
View File
@@ -1,889 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="ar_SA">
<context>
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="206"/>
<source>Open project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="209"/>
<source>All files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="238"/>
<source>Save project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="240"/>
<source>MapMap files (*.%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="269"/>
<source>Import media source file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="398"/>
<source>About MapMap</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="399"/>
<source>&lt;h2&gt;MapMap </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="741"/>
<location filename="MainWindow.cpp" line="838"/>
<location filename="MainWindow.cpp" line="1119"/>
<source>MapMap</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="742"/>
<source>Remove this paint and all its associated mappings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="852"/>
<source>&amp;New</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="855"/>
<source>Create a new project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="859"/>
<source>&amp;Open...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="862"/>
<source>Open an existing project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="866"/>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="869"/>
<source>Save the project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="873"/>
<source>Save &amp;As...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="875"/>
<source>Save the project as...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="879"/>
<source>&amp;Import media source file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="881"/>
<source>Import a media source file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="885"/>
<source>Add &amp;Color paint...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="887"/>
<source>Add a color paint...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="891"/>
<source>E&amp;xit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="892"/>
<source>Ctrl+Q</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="893"/>
<source>Exit the application</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="920"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="921"/>
<source>Show the application&apos;s About box</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="925"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="926"/>
<source>CTRL+DEL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="927"/>
<source>Delete item</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="931"/>
<source>Add Quad/&amp;Mesh</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="932"/>
<source>CTRL+M</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="934"/>
<source>Add quad/mesh</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="939"/>
<source>Add &amp;Triangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="940"/>
<source>CTRL+T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="942"/>
<source>Add triangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="947"/>
<source>Add &amp;Ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="948"/>
<source>CTRL+E</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="950"/>
<source>Add ellipse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="955"/>
<source>&amp;Display output window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="956"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="957"/>
<source>Display output window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="966"/>
<source>&amp;Full screen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="967"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="968"/>
<source>Full screen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="980"/>
<source>&amp;Display canvas controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="982"/>
<source>Display canvas controls</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="994"/>
<location filename="MainWindow.cpp" line="1051"/>
<source>&amp;File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1006"/>
<source>&amp;Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1013"/>
<source>&amp;View</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1036"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1120"/>
<source>The document has been modified.
Do you want to save your changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1141"/>
<location filename="MainWindow.cpp" line="1155"/>
<source>Error reading mapping project file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1142"/>
<location filename="MainWindow.cpp" line="1216"/>
<source>Cannot read file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1156"/>
<source>Parse error in file %1:
%2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1162"/>
<source>File loaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1174"/>
<source>Error saving mapping project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1175"/>
<source>Cannot write file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1185"/>
<source>File saved</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1197"/>
<source>Untitled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1203"/>
<source>%1[*] - %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1203"/>
<location filename="MainWindow.cpp" line="1215"/>
<source>MapMap Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1236"/>
<source>File imported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="1254"/>
<source>Color paint added</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="Mapper.cpp" line="36"/>
<source>Texture mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Mapper.cpp" line="43"/>
<source>Output shape</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Mapper.cpp" line="81"/>
<source>Input shape</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Mapper.cpp" line="109"/>
<source>Point %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Mapper.cpp" line="163"/>
<location filename="Mapper.cpp" line="393"/>
<source>Dimensions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="47"/>
<source>The file is not a mapmap version 0.1 file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="58"/>
<source>%1
Line %2, column %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="101"/>
<source>Cannot create media with uri %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="110"/>
<source>Cannot create color with RGB hex code %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="114"/>
<source>Unsupported paint type: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="141"/>
<source>Cannot create triangle texture mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="158"/>
<source>Cannot create mesh texture mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="174"/>
<source>Cannot create ellipse texture mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="184"/>
<source>Cannot create triangle color mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="194"/>
<source>Cannot create quad color mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="204"/>
<source>Cannot create ellipse color mapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="207"/>
<source>Unsupported mapping type: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="215"/>
<source>Wrong shape type &quot;%1&quot; for destination: expected &quot;%2&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="229"/>
<source>Shape of type &apos;%1&apos; has %2 vertices: expected %3.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="246"/>
<source>Shape has %1 vertices: expected 4 or 5.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="254"/>
<source>Wrong shape type for destination: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ProjectReader.cpp" line="272"/>
<source>Shape has wrong number of vertices.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="55"/>
<source>Initiating program...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="83"/>
<source>Done.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtBoolEdit</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="233"/>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="243"/>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="268"/>
<source>True</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="243"/>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="268"/>
<source>False</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtBoolPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="1696"/>
<source>True</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="1697"/>
<source>False</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtCharEdit</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qteditorfactory.cpp" line="1700"/>
<source>Clear Char</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtColorEditWidget</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qteditorfactory.cpp" line="2314"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtColorPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6421"/>
<source>Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6429"/>
<source>Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6437"/>
<source>Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6445"/>
<source>Alpha</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtCursorDatabase</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="58"/>
<source>Arrow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="60"/>
<source>Up Arrow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="62"/>
<source>Cross</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="64"/>
<source>Wait</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="66"/>
<source>IBeam</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="68"/>
<source>Size Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="70"/>
<source>Size Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="72"/>
<source>Size Backslash</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="74"/>
<source>Size Slash</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="76"/>
<source>Size All</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="78"/>
<source>Blank</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="80"/>
<source>Split Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="82"/>
<source>Split Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="84"/>
<source>Pointing Hand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="86"/>
<source>Forbidden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="88"/>
<source>Open Hand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="90"/>
<source>Closed Hand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="92"/>
<source>What&apos;s This</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="94"/>
<source>Busy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtFontEditWidget</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qteditorfactory.cpp" line="2523"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qteditorfactory.cpp" line="2543"/>
<source>Select Font</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtFontPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6095"/>
<source>Family</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6108"/>
<source>Point Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6116"/>
<source>Bold</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6123"/>
<source>Italic</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6130"/>
<source>Underline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6137"/>
<source>Strikeout</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="6144"/>
<source>Kerning</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtKeySequenceEdit</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="328"/>
<source>Clear Shortcut</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtLocalePropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2611"/>
<source>%1, %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2664"/>
<source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2672"/>
<source>Country</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtPointFPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3081"/>
<source>(%1, %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3152"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3160"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtPointPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2841"/>
<source>(%1, %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2878"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="2885"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtPropertyBrowserUtils</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="187"/>
<source>[%1, %2, %3] (%4)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="214"/>
<source>[%1, %2]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtRectFPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4586"/>
<source>[(%1, %2), %3 x %4]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4742"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4750"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4758"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4767"/>
<source>Height</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtRectPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4156"/>
<source>[(%1, %2), %3 x %4]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4276"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4283"/>
<source>Y</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4290"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="4298"/>
<source>Height</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtSizeFPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3764"/>
<source>%1 x %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3894"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3903"/>
<source>Height</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtSizePolicyPropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5607"/>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5608"/>
<source>&lt;Invalid&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5609"/>
<source>[%1, %2, %3, %4]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5654"/>
<source>Horizontal Policy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5663"/>
<source>Vertical Policy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5672"/>
<source>Horizontal Stretch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="5680"/>
<source>Vertical Stretch</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtSizePropertyManager</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3400"/>
<source>%1 x %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3496"/>
<source>Width</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qtpropertymanager.cpp" line="3504"/>
<source>Height</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QtTreePropertyBrowser</name>
<message>
<location filename="contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp" line="478"/>
<source>Property</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp" line="479"/>
<source>Value</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
@@ -5,9 +5,10 @@ GenericName=Video Mapping editor
GenericName[fr]=Éditeur pour le video mapping
Comment=MapMap is a free/libre video projection mapping editor
Comment[fr]=MapMap est un éditeur pour la projection video mapping
Icon=mapmap
Exec=mapmap %U
TryExec=mapmap
Exec=mapmap %f
Terminal=false
StartupNotify=true
Type=Application
Categories=Qt;AudioVideo;Video;
Icon=/usr/share/icons/hicolor/scalable/apps/mapmap.svg
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/mapmap">
<comment>MapMap file type</comment>
<magic priority="50">
<match value="search-string" type="string" offset="10:140"/>
<match type="string" value="#N " offset="0"/>
</magic>
<glob pattern="*.mmp"/>
<comment>Pure Data Document</comment>
<comment xml:lang="en">MapMap Document</comment>
<comment xml:lang="fr">Document MapMap</comment>
</mime-type>
</mime-info>