...
 
Commits (30)
Version 2.0.1 20131205
Version 2.1 20140209
This diff is collapsed.
......@@ -2,7 +2,7 @@
REM ======================================================================
REM This file is part of ffDiaporama
REM ffDiaporama is a tools to make diaporama as video
REM Copyright (C) 2011-2013 Dominique Levray <domledom@laposte.net>
REM Copyright (C) 2011-2014 Dominique Levray <domledom@laposte.net>
REM
REM This program is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
......@@ -25,7 +25,7 @@ cd %1
rd wiki_img
mklink /J wiki_img ..\wiki_img
rd img
mklink /J img ..\..\img
mklink /J img ..\..\src\ffDiaporama\img
copy ..\wiki.css wiki.css
qhelpgenerator -c "wiki_%1.qhp" -o "wiki_%1.qch"
qcollectiongenerator "wiki_%1.qhcp" -o "wiki_%1.qhc"
......
......@@ -2,7 +2,7 @@
# ======================================================================
# This file is part of ffDiaporama
# ffDiaporama is a tools to make diaporama as video
# Copyright (C) 2011-2013 Dominique Levray <domledom@laposte.net>
# Copyright (C) 2011-2014 Dominique Levray <domledom@laposte.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -26,7 +26,7 @@ PREPLANGUAGE() {
rm wiki_img
ln -s ../wiki_img wiki_img
rm img
ln -s ../../img img
ln -s ../../src/ffDiaporama/img img
cp ../wiki.css wiki.css
qhelpgenerator -c "wiki_"$1".qhp" -o "wiki_"$1".qch"
qcollectiongenerator "wiki_"$1".qhcp" -o "wiki_"$1".qhc"
......@@ -36,7 +36,8 @@ PREPLANGUAGE() {
}
cd fake
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease fake.pro
lrelease fake.pro >~/ffdtr.log
cd ..
PREPLANGUAGE "en"
PREPLANGUAGE "fr"
......@@ -47,3 +48,79 @@ PREPLANGUAGE "it"
PREPLANGUAGE "el"
PREPLANGUAGE "de"
TODAY=`/bin/date +%Y%m%d`
echo $TODAY >../locale/WIKIVERSION.TXT
#decode log file
CURLANG=""
FINISHED=0
UNFINISHED=0
UNTRANSLATED=0
while read line
do
if [[ $line == Updating* ]];then
if [[ $CURLANG != "" ]];then
#compute
TOTAL=`echo $(($FINISHED+$UNFINISHED))`
RESTE=0
#display
echo -e "$CURLANG = 100% ($FINISHED/$TOTAL)" >>../locale/WIKIVERSION.TXT
fi
DEB=`expr index "$line" '_'`
CURLANG=${line:$DEB}
POS=`expr index "$CURLANG" '.'`
POS=$POS-1
CURLANG=${CURLANG:0:$POS}
FINISHED=0
UNFINISHED=0
UNTRANSLATED=0
elif [[ $line == Generated* ]];then
POS=`expr index "$line" '\('`
SUBS=${line:POS}
POS=`expr index "$SUBS" '\('`
SUBS=${SUBS:POS}
POS=`expr index "$SUBS" ' '`
POS=$POS-1
FINISHED=${SUBS:0:POS}
POS=$POS+1
SUBS=${SUBS:POS}
POS=`expr index "$SUBS" ' '`
SUBS=${SUBS:POS}
POS=`expr index "$SUBS" ' '`
SUBS=${SUBS:POS}
POS=`expr index "$SUBS" ' '`
POS=$POS-1
UNFINISHED=${SUBS:0:POS}
#trim all
FINISHED=`echo $FINISHED`
UNFINISHED=`echo $UNFINISHED`
elif [[ $line == Ignored* ]];then
POS=`expr index "$line" ' '`
SUBS=${line:POS}
POS=`expr index "$SUBS" ' '`
UNTRANSLATED=${SUBS:0:POS}
#trim
UNTRANSLATED=`echo $UNTRANSLATED`
#compute
TOTAL=`echo $(($FINISHED+$UNFINISHED+$UNTRANSLATED))`
RESTE=`echo $(($UNFINISHED+$UNTRANSLATED))`
PCT=`echo $(($FINISHED*100))`
PCT=`echo $(($PCT/$TOTAL))`
#display
echo -e "$CURLANG = $PCT% ($FINISHED/$TOTAL) $RESTE to translate" >>../locale/WIKIVERSION.TXT
CURLANG=""
fi
done < ~/ffdtr.log
rm ~/ffdtr.log
cp ../locale/wiki_* ~/.ffDiaporama
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/fr_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/es_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/pt_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/ru_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/it_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/el_WIKIVERSION.TXT
cp ../locale/WIKIVERSION.TXT ~/.ffDiaporama/de_WIKIVERSION.TXT
cat ../locale/WIKIVERSION.TXT
......@@ -2,7 +2,7 @@ rem @ECHO OFF
REM ======================================================================
REM This file is part of ffDiaporama
REM ffDiaporama is a tools to make diaporama as video
REM Copyright (C) 2011-2013 Dominique Levray <domledom@laposte.net>
REM Copyright (C) 2011-2014 Dominique Levray <domledom@laposte.net>
REM
REM This program is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
......
......@@ -2,7 +2,7 @@
# ======================================================================
# This file is part of ffDiaporama
# ffDiaporama is a tools to make diaporama as video
# Copyright (C) 2011-2013 Dominique Levray <domledom@laposte.net>
# Copyright (C) 2011-2014 Dominique Levray <domledom@laposte.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -23,7 +23,7 @@
retval=$?
if [ "${retval}" -eq 0 ]; then
cd fake
/usr/lib/x86_64-linux-gnu/qt5/bin/lupdate -no-obsolete fake.pro
lupdate -no-obsolete fake.pro
cd ..
fi
......@@ -2,7 +2,7 @@
REM ======================================================================
REM This file is part of ffDiaporama
REM ffDiaporama is a tools to make diaporama as video
REM Copyright (C) 2011-2013 Dominique Levray <domledom@laposte.net>
REM Copyright (C) 2011-2014 Dominique Levray <domledom@laposte.net>
REM
REM This program is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
......
**************************************************
* FFDIAPORAMA 2.0.1 - trunk
* FFDIAPORAMA 2.1 - trunk
*
* Translation state on 04/12/2013
* WIKI state on 06/12/2013
**************************************************
Local Interface / WIKI
-------------------------------------------
EN 100% - 1686 / 100% - 2249
FR 100% - 1686 / 100% - 2249
RU 100% - 1686 / 100% - 2249
PT 100% - 1686 / 100% - 2249
IT 100% - 1686 / 100% - 2249
ES 100% - 1686 / 100% - 2249
DE 99% - 1663 / 100% - 2249
EL 100% - 1686 / 31% - 685
NL 63% - 1081 / 0% No contributor for this version
ZH-TW 38% - 647 / 0% No contributor for this version
CZ 17% - 287 / 0% No contributor for this version
------------------------------------------------------------------------------------------------------------------------------
WIKI
------------------------------------------------------------------------------------------------------------------------------
ok wiki_en.qhcp
ok wiki_en.qhp
ok main.html Welcome to the ffDiaporama WIKI
......@@ -59,6 +41,7 @@ ok 0122.html Transition properties
ok 0121.html Select transition duration for a set of slides
ok 0110.html Correct, reframe or cut image or video
ok 0120.html Edit text
ok 0123.html Add or modify a location
// Dialog boxes related to the project
ok 0108.html Project properties
......@@ -88,3 +71,4 @@ ok 0041.html ffDiaporama command line arguments
ok 0042.html ffDiaporama project files
ok 0043.html The configuration files for ffDiaporama
ok 0044.html XBMC nfo files
-- 0045.html Types of objects in ffDiaporama
No preview for this file type
This diff is collapsed.
......@@ -23,7 +23,6 @@ HEADERS += fake.h
TRANSLATIONS += ../wikifake_fr.ts \
../wikifake_it.ts \
../wikifake_de.ts \
# ../wikifake_nl.ts \
../wikifake_es.ts \
../wikifake_pt.ts \
../wikifake_ru.ts \
......
......@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="wiki.css"/>
</head>
<body>
<div><img src="../../src/ffDiaporama/img/logo_big.png"></div>
<div><img src="img/logo_big.png"></div>
<br>
<div>
This section contains general information on the concepts and methods of use of ffDiaporama
......
......@@ -14,24 +14,24 @@
<br>
<br>ffDiaporama included many Predefined title slides, but you can also define your own Predefined title slides.
<br>To do this, create a standard slide using the <a href="0119.html">Slide properties dialog box</a> and save your slide as a model using:
<ul><li><img src="../../src/ffDiaporama/img/db_menu_big.png"> Save as model function.</li></ul>
<ul><li><img src="img/db_menu_big.png"> Save as model function.</li></ul>
</div>
<h4>Remarks:</h4>
<div><ul>
<li>Predefined title slides are defined according to the following three categories:
<table border="1" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/object_text.png">Project title</td>
<td nowrap valign="top"><img src="img/object_text.png">Project title</td>
<td>This type of slide is usually used early in the project as the opening credits.
<br>The texts variables that are used by the models of this slide type are based only on project information. For more information on project information, see: <a href="0108.html">Project properties dialog</a></td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/Chapter_big.png">Chapter title</td>
<td nowrap valign="top"><img src="img/Chapter_big.png">Chapter title</td>
<td>This type of slide is usually used several times in the project to mark the beginning of the chapter.
<br>The texts variables that are used by the models of this slide type are based on project information and on chapter information.</td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/medal.png">Credit title</td>
<td nowrap valign="top"><img src="img/medal.png">Credit title</td>
<td>This type of slide is usually used at the end of the project as the end credits.
<br>The texts variables that are used by the models of this slide type are generally computed. For more information on texts variables, see: <a href="0013.html">Dynamic variables</a></td>
</tr>
......@@ -57,7 +57,7 @@
</li>
<li><div>The resources used by the models you create are not moved. So, if you include a photo in a model, the model will only be valid until the picture will not move. This is why it is recommended, to think resources included before creating a new model.</div>
<div>&nbsp;</div></li>
<li>It will always be possible to create slides from a model using the <a href="0103.html">Add or modify a predefined title slide dialog box</a> then convert it to a standard slide using this function: <ul><li><img src="../../src/ffDiaporama/img/transparent.png"> Convert to standard slide</li></ul></li>
<li>It will always be possible to create slides from a model using the <a href="0103.html">Add or modify a predefined title slide dialog box</a> then convert it to a standard slide using this function: <ul><li><img src="img/transparent.png"> Convert to standard slide</li></ul></li>
</ul></div>
</body>
</html>
......@@ -11,7 +11,8 @@
<div>The big interest of variables is that they are inserted into text (see: <a href="0120.html">Edit text dialog</a>) and are transformed into values ​​only when they are used.</div>
<div>It's why variables are used in many parts of the application (slide, thumbnails, predefined titles slides, video tags, xbmc nfo, etc...)</div>
<div>&nbsp;</div>
<div>The following table lists all the available variables:
<div>The following table lists all the available variables:</div>
<div>&nbsp;</div>
<table border="1" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td style="background-color: rgb(0, 0, 102); color: white;"><span style="font-weight: bold;">Category</span></td>
......@@ -19,7 +20,7 @@
<td style="background-color: rgb(0, 0, 102); color: white;"><span style="font-weight: bold;">Content</span></td>
</tr>
<tr>
<td style="vertical-align: top;" rowspan="15">Project properties values</td>
<td style="vertical-align: top;" rowspan="17">Project properties values</td>
<td style="vertical-align: top;">%PTT%</td>
<td style="vertical-align: top;">Value of the <b><i>Project title</i></b> field of the <a href="0108.html">Project properties</a></td>
</tr>
......@@ -39,6 +40,14 @@
<td style="vertical-align: top;">%PAL%</td>
<td style="vertical-align: top;">Value of the <b><i>Project album</i></b> field of the <a href="0108.html">Project properties</a></td>
</tr>
<tr>
<td style="vertical-align: top;">%PLN%</td>
<td style="vertical-align: top;">Value of the <b><i>Project location name</i></b> field of the <a href="0108.html">Project properties</a></td>
</tr>
<tr>
<td style="vertical-align: top;">%PLA%</td>
<td style="vertical-align: top;">Value of the <b><i>Project location address</i></b> field of the <a href="0108.html">Project properties</a></td>
</tr>
<tr>
<td style="vertical-align: top;">%PCT%</td>
<td style="vertical-align: top;">Value of the <b><i>Project comment</i></b> field of the <a href="0108.html">Project properties</a></td>
......@@ -90,7 +99,7 @@
<td style="vertical-align: top;">Current slide number</td>
</tr>
<tr>
<td style="vertical-align: top;" rowspan="12">Chapters values</td>
<td style="vertical-align: top;" rowspan="14">Chapters values</td>
<td style="vertical-align: top;">%CCN%</td>
<td style="vertical-align: top;">Value of the <b><i>Chapter name</i></b> field of the latest slide which defined <u>Chapters information</u>. (Chapters information may be defined in <a href="0105.html">Chapter properties dialog</a> or in <a href="0103.html">Predefined title slide dialog</a>).</td>
</tr>
......@@ -110,6 +119,14 @@
<td style="vertical-align: top;">%CCT%</td>
<td style="vertical-align: top;">Chapter count (Number of chapter in the project)</td>
</tr>
<tr>
<td style="vertical-align: top;">%CLN%</td>
<td style="vertical-align: top;">Current chapter location name (if one is defined or project's location name).</td>
</tr>
<tr>
<td style="vertical-align: top;">%CLA%</td>
<td style="vertical-align: top;">Current chapter location address (if one is defined or project's location address).</td>
</tr>
<tr>
<td style="vertical-align: top;">%CLD%</td>
<td style="vertical-align: top;">Long date of the chapter (if one is defined or project's date). (The form of the display depends on geographical information provided by the computer, depending on the current language)</td>
......@@ -192,6 +209,6 @@
<td style="vertical-align: top;">Current date's day of week as a a name (depending on the current language: Monday, Thuesday, etc...)</td>
</tr>
</tbody></table>
</div>
<div>&nbsp;</div>
</body>
</html>
......@@ -17,13 +17,13 @@
<li>Formatting text, which includes the parameters of font, character attributes, alignment and text shadow.</li>
<li>Controlling text background, which includes the parameters of background (color, brush, etc.).</li>
</ul>
<div><img src="../../src/ffDiaporama/img/db_menu.png"> Open the style menu:</div>
<div><img src="img/db_menu.png"> Open the style menu:</div>
<ul>
<li>The first part of the menu lists the known styles.
<ul>
<li>If the current settings correspond to a known style, this style is marked with an asterisk.</li>
<li>The standard styles of ffDiaporama are marked with this icon: <img src="../../src/ffDiaporama/img/db.png"></li>
<li>Standard styles that you have modified and styles which you created are marked with this icon: <img src="../../src/ffDiaporama/img/db_update.png"></li>
<li>The standard styles of ffDiaporama are marked with this icon: <img src="img/db.png"></li>
<li>Standard styles that you have modified and styles which you created are marked with this icon: <img src="img/db_update.png"></li>
</ul>
<br>
</li>
......
......@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="wiki.css"/>
</head>
<body>
<div><img src="../../src/ffDiaporama/img/logo_big.png"></div>
<div><img src="img/logo_big.png"></div>
<br>
<div>
This section contains information about using ffDiaporama.
......@@ -41,6 +41,7 @@
<div><a href="0121.html">Select transition duration for a set of slides</a></div>
<div><a href="0110.html">Correct, reframe or cut image or video</a></div>
<div><a href="0120.html">Edit text</a></div>
<div><a href="0123.html">Add or modify a location</a></div>
</div>
<h4>Dialog boxes related to the project</h4>
<div style="margin-left: 40px;">
......
......@@ -64,9 +64,9 @@
<div><br>To change display mode, use the buttons located in the status bar, to the right, at the bottom of the main window.</div>
<ul>
<li><img src="../../src/ffDiaporama/img/FolderOpen.png"> Switch display to file mode</li>
<li><img src="../../src/ffDiaporama/img/journal.png"> Switch display to sheet mode</li>
<li><img src="../../src/ffDiaporama/img/player_play_small.png"> Switch display to preview mode</li>
<li><img src="img/FolderOpen.png"> Switch display to file mode</li>
<li><img src="img/journal.png"> Switch display to sheet mode</li>
<li><img src="img/player_play_small.png"> Switch display to preview mode</li>
</ul>
<div>The editing of slides is done:</div>
<ul>
......
This diff is collapsed.
......@@ -18,19 +18,19 @@
<li>An icon corresponding to the transition selected to pass from the previous background to this slide (if a new background is defined). .</li>
<li>A thumbnail representing the background associated with this slide.</li>
<li>The slide number.</li>
<li><img src="../../src/ffDiaporama/img/Chapter.png"> Possibly this icon may appear at the upper left if the slide is used as chapter start</li>
<li><img src="img/Chapter.png"> Possibly this icon may appear at the upper left if the slide is used as chapter start</li>
</ul>
<h4>The mounting track:</h4>
<ul>
<li>An icon corresponding to the transition selected to pass from the previous slide to this slide, under which is indicated the duration of the transition in seconds.</li>
<li>A thumbnail in the form of a static image for slides consisting of title or photo, or in the form of a video (under which is placed a soundtrack).</li>
<li><img src="../../src/ffDiaporama/img/TimelineBlocks.png"> Possibly this icon may appear at the upper left if the slide is composed of several blocks.</li>
<li><img src="../../src/ffDiaporama/img/TimelineShots.png"> Possibly this icon may appear at the upper right if the slide is animated (that is consisting of more than one shot).</li>
<li><img src="../../src/ffDiaporama/img/Transform.png"> Possibly this icon may appear at the bottom right if the slide contains at least an image for which you defined a transformation.</li>
<li><img src="../../src/ffDiaporama/img/AutoTS.png"> Possibly this icon may appear at the bottom left if the slide is an automatic predefined slide.</li>
<li><img src="../../src/ffDiaporama/img/object_text.png"> Possibly this icon may appear at the bottom right if the predefined slide is a project title slide.</li>
<li><img src="../../src/ffDiaporama/img/Chapter.png"> Possibly this icon may appear at the bottom right if the predefined slide is a chapter title slide.</li>
<li><img src="../../src/ffDiaporama/img/medal.png"> Possibly this icon may appear at the bottom right if the predefined slide is a generic title slide.</li>
<li><img src="img/TimelineBlocks.png"> Possibly this icon may appear at the upper left if the slide is composed of several blocks.</li>
<li><img src="img/TimelineShots.png"> Possibly this icon may appear at the upper right if the slide is animated (that is consisting of more than one shot).</li>
<li><img src="img/Transform.png"> Possibly this icon may appear at the bottom right if the slide contains at least an image for which you defined a transformation.</li>
<li><img src="img/AutoTS.png"> Possibly this icon may appear at the bottom left if the slide is an automatic predefined slide.</li>
<li><img src="img/object_text.png"> Possibly this icon may appear at the bottom right if the predefined slide is a project title slide.</li>
<li><img src="img/Chapter.png"> Possibly this icon may appear at the bottom right if the predefined slide is a chapter title slide.</li>
<li><img src="img/medal.png"> Possibly this icon may appear at the bottom right if the predefined slide is a generic title slide.</li>
</ul>
<div style="margin-left: 40px;">Remark: The thumbnail represents the first image on the slide.</div>
<br>
......@@ -39,8 +39,9 @@
<li>Every play-list is shown by a change of color.</li>
<li>The track is more or less filled according to the sound volume selected, displaying the variation in volume.</li>
<li>The musical transitions (fade in/out) are shown as crossings.</li>
<li>On slide associated with the music, the cover, artist and song title are displayed</li>
</ul>
<div style="margin-left: 40px;">Remark: Possible pauses are symbolized by a change in the volume to zero and the display of this icon: <img src="../../src/ffDiaporama/img/player_pause_small.png"></div>
<div style="margin-left: 40px;">Remark: Possible pauses are symbolized by a change in the volume to zero and the display of this icon: <img src="img/player_pause_small.png"></div>
<br>
</div>
<h2>To select the current slide:</h2>
......@@ -82,11 +83,17 @@
<div style="margin-left: 40px;">Simply drag the slide to a new position with the mouse (drag &amp; drop)</div>
<br>
<h2>To move the music or the background associated to a slide to another slide:</h2>
<div style="margin-left: 40px;">Simply drag the music or background to a new position with the mouse (drag &amp; drop)</div>
<br>
<h2>To modify the display of the timeline:</h2>
<div style="margin-left: 40px;">
<div>The timeline settings commands are in the status bar, to the right, at the bottom of the main window.</div>
<div><img src="../../src/ffDiaporama/img/zoomup.png"> Increases the size of the thumbnails but reduces the number of thumbnails shown in the timeline.</div>
<div><img src="../../src/ffDiaporama/img/zoomdown.png"> Reduces the size of the thumbnails and increases the number of thumbnails shown in the timeline.</div>
<div><img src="img/zoomup.png"> Increases the size of the thumbnails but reduces the number of thumbnails shown in the timeline.</div>
<div><img src="img/zoomdown.png"> Reduces the size of the thumbnails and increases the number of thumbnails shown in the timeline.</div>
</div>
<br>
</body>
</html>
This diff is collapsed.
......@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="wiki.css"/>
</head>
<body>
<div><img src="../../src/ffDiaporama/img/logo_big.png"></div>
<div><img src="img/logo_big.png"></div>
<br>
<div>
This section contains information about generating video with ffDiaporama.
......
......@@ -43,7 +43,8 @@
<div>ffDiaporama uses specific settings for encoding with x264. This settings are including:
<br>- <b>High Quality</b> for "Home Cinema" devices based on x264 <u>main</u> profile, with 3 refs and 3 bframes.
<br>- <b>Phone Quality</b> for mobile devices based on x264 <u>baseline</u> profile, with 3 refs and 0 bframes.
<br>Both settings are using <u>veryfast</u> preset</div>
<br>Both settings are using <u>veryfast</u> preset.
<br>Note: Variable bitrate is used with these two codecs. For more information on variable bitrate, see: <a href="0115.html">Render video</a></div>
</td>
</tr>
<tr>
......
......@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="wiki.css"/>
</head>
<body>
<div><img src="../../src/ffDiaporama/img/logo_big.png"></div>
<div><img src="img/logo_big.png"></div>
<br>
<div>
This section contains technical information about ffDiaporama.
......@@ -18,6 +18,7 @@
<div><a href="0042.html">ffDiaporama project files</a></div>
<div><a href="0043.html">The configuration files for ffDiaporama</a></div>
<div><a href="0044.html">XBMC nfo files</a></div>
<div><a href="0045.html">Types of objects in ffDiaporama</a></div>
</div>
</div>
</body>
......
This diff is collapsed.
......@@ -128,6 +128,32 @@
</tbody>
</table>
<br>
<h3>Network settings</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tbody>
<tr>
<td style="vertical-align: top;">Use a proxy to access the Internet</td>
<td style="vertical-align: top;">Check this box if your network requires that you use a proxy.</td>
</tr>
<tr>
<td style="vertical-align: top;">Proxy address</td>
<td style="vertical-align: top;">Enter address of the proxy host.</td>
</tr>
<tr>
<td style="vertical-align: top;">Proxy port</td>
<td style="vertical-align: top;">Enter the port number to access the proxy or nothing to use default port.</td>
</tr>
<tr>
<td style="vertical-align: top;">Login</td>
<td style="vertical-align: top;">Enter the login name to access the proxy or nothing if no login is required.</td>
</tr>
<tr>
<td style="vertical-align: top;">Password</td>
<td style="vertical-align: top;">Enter the login password to access the proxy or nothing if no login is required.</td>
</tr>
</tbody>
</table>
<br>
<h3>Various options</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tbody>
......@@ -136,6 +162,10 @@
<td style="vertical-align: top;">This option allows you to specify the format in which computed dates are displayed.
<br>Normally this format depends on the language used on your system, but it can be useful to change it especially if the interface is not available for your language.</td>
</tr>
<tr>
<td style="vertical-align: top;">Distance unit</td>
<td style="vertical-align: top;">This option lets you specify the unit to be used for distances.</td>
</tr>
</tbody>
</table>
<br>
......@@ -157,6 +187,10 @@
</ul>
</td>
</tr>
<tr>
<td style="vertical-align: top;">Album</td>
<td style="vertical-align: top;">Defines the default value for the field Album</td>
</tr>
<tr>
<td style="vertical-align: top;">Author</td>
<td style="vertical-align: top;">Defines the default value for the field Author that is often so called Artist by <a href="http://en.wikipedia.org/wiki/Media_center">Media Center Systems</a></td>
......@@ -202,9 +236,9 @@
<td style="vertical-align: top;">Default transition</td>
<td style="vertical-align: top;">Defines the transition to be inserted between inserted slides :
<ul>
<li><img src="../../src/ffDiaporama/img/random.png"> A transition chosen randomly from the library</li>
<li><img src="../../src/ffDiaporama/img/Transitions/tr-00-00.png"> No transition</li>
<li><img src="../../src/ffDiaporama/img/Transitions/tr-00-01.png"> Cross-fade transition</li>
<li><img src="img/random.png"> A transition chosen randomly from the library</li>
<li><img src="img/Transitions/tr-00-00.png"> No transition</li>
<li><img src="img/Transitions/tr-00-01.png"> Cross-fade transition</li>
</ul>
</td>
</tr>
......@@ -230,7 +264,7 @@
</table>
<br>
<h3>Default options for new text block</h3>
<div margin-left: 40px;>This group of settings applies to the new text blocks created in slide dialogue by means of this button: <img src="../../src/ffDiaporama/img/add_text.png"></div>
<div margin-left: 40px;>This group of settings applies to the new text blocks created in slide dialogue by means of this button: <img src="img/add_text.png"></div>
<table border="1" cellpadding="2" cellspacing="0">
<tbody>
<tr>
......@@ -263,7 +297,7 @@
<br>
<h3>Default options for new image or video block (when creating slide)</h3>
<div style="margin-left: 40px;">
<div>This group of settings applies to the new image or video blocks created from the main window by means of this button: <img src="../../src/ffDiaporama/img/add_image.png"></div>
<div>This group of settings applies to the new image or video blocks created from the main window by means of this button: <img src="img/add_image.png"></div>
<div>The following settings apply to all image formats:</div>
<table border="1" cellpadding="2" cellspacing="0">
<tbody>
......@@ -286,7 +320,7 @@
</ul>
</div>
<h3>Default options for new image or video block (when adding block in slide dialog)</h3>
<div style="margin-left: 40px;">This group of settings applies to the new image or video blocks created in slide dialogue by means of this button: <img src="../../src/ffDiaporama/img/add_image.png"></div>
<div style="margin-left: 40px;">This group of settings applies to the new image or video blocks created in slide dialogue by means of this button: <img src="img/add_image.png"></div>
<div style="margin-left: 40px;">The same selection that when creating slides apply.</div>
<br>
</div>
......@@ -414,8 +448,8 @@
<div style="margin-left: 40px;">
<div>At the bottom of the dialog these buttons allow you to:</div>
<ul>
<li><img src="../../src/ffDiaporama/img/config.png"> Check configuration allows to open the <a href="0106.html">Check configuration dialog</a></li>
<li><img src="../../src/ffDiaporama/img/db.png"> Manage device allows to open the <a href="0102.html">Manage device dialog</a></li>
<li><img src="img/config.png"> Check configuration allows to open the <a href="0106.html">Check configuration dialog</a></li>
<li><img src="img/db.png"> Manage device allows to open the <a href="0102.html">Manage device dialog</a></li>
</ul>
</div>
</body>
......
......@@ -13,11 +13,11 @@
<div>The database is actually composed of two parts:</div>
<table border="0" cellpadding="2" cellspacing="10"><tbody>
<tr>
<td><img src="../../src/ffDiaporama/img/db.png"></td>
<td><img src="img/db.png"></td>
<td>The default database (supplied with ffDiaporama). These devices are registered in the global ffDiaporama configuration file.</td>
</tr>
<tr>
<td><img src="../../src/ffDiaporama/img/db_update.png"></td>
<td><img src="img/db_update.png"></td>
<td>The devices which you modify or add. These are registered in your personal configuration file.</td>
</tr>
</tbody></table>
......@@ -25,18 +25,18 @@
<div><br>The list shows the categories and the device types present in the database.</div>
<table border="0" cellpadding="2" cellspacing="10"><tbody>
<tr>
<td><img src="../../src/ffDiaporama/img/db.png"></td>
<td><img src="img/db.png"></td>
<td>Devices preceded by this icon are defined in the default database.</td>
</tr>
<tr>
<td><img src="../../src/ffDiaporama/img/db_update.png"></td>
<td><img src="img/db_update.png"></td>
<td>Devices preceded by this icon are those that you defined yourself, or those from the default database that you have modified.</td>
</tr>
</tbody></table>
<div><br>The following buttons allow you to act on the database:</div>
<table border="0" cellpadding="2" cellspacing="10"><tbody>
<tr>
<td><img src="../../src/ffDiaporama/img/db_add.png"></td>
<td><img src="img/db_add.png"></td>
<td>Add device: Allows you to create a new device which will be added to the database.
<br>The creation of a new device is made in 3 steps:
<ol>
......@@ -46,12 +46,12 @@
</ol></td>
</tr>
<tr>
<td><img src="../../src/ffDiaporama/img/db_remove.png"></td>
<td><img src="img/db_remove.png"></td>
<td>Remove device: Allows you to delete a device.
<br>Note that you can delete only devices which you created - those shown with this icon: <img src="../../src/ffDiaporama/img/db_update.png"></td>
<br>Note that you can delete only devices which you created - those shown with this icon: <img src="img/db_update.png"></td>
</tr>
<tr>
<td><img src="../../src/ffDiaporama/img/db_status.png"></td>
<td><img src="img/db_status.png"></td>
<td>Reset to default: Cancels the modifications that you made on a device defined in the default ffDiaporama database</td>
</tr>
</tbody></table>
......
......@@ -19,17 +19,17 @@
<td>You can select between:
<table border="1" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/object_text.png">Project title</td>
<td nowrap valign="top"><img src="img/object_text.png">Project title</td>
<td>This type of slide is usually used early in the project as the opening credits.
<br>The texts variables that are used by the models of this slide type are based only on project information. For more information on project information, see: <a href="0108.html">Project properties dialog</a></td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/Chapter_big.png">Chapter title</td>
<td nowrap valign="top"><img src="img/Chapter_big.png">Chapter title</td>
<td>This type of slide is usually used several times in the project to mark the beginning of the chapter.
<br>The texts variables that are used by the models of this slide type are based on project information and on chapter information.</td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/medal.png">Credit title</td>
<td nowrap valign="top"><img src="img/medal.png">Credit title</td>
<td>This type of slide is usually used at the end of the project as the end credits.
<br>The texts variables that are used by the models of this slide type are generally computed. For more information on texts variables, see: <a href="0013.html">Dynamic variables</a></td>
</tr>
......@@ -74,7 +74,7 @@
<td nowrap valign="top">Chapter date different from project date</td>
<td>If this box is checked, the date of the chapter is different from the date of the project.
<br>Remark: It is often useful to differentiate the date of the chapter of the date of the project.
<br>For example, if the project is "My vacation from 1 to 15", the chapter may be limited to the 3.</td>
<br>For example, if the project is <u>My vacation from 1 to 15</u>, the chapter may be limited to the <u>3</u>.</td>
</tr>
<tr>
<td nowrap valign="top">Event date</td>
......@@ -86,16 +86,30 @@
<td>Check this box to override the date and offer you to enter the date as a free multi-line text.
<br>Remark: This field is enabled only if the <i><b>Chapter date different from project date</b></i> check box is checked.</td>
</tr>
<tr>
<td style="vertical-align: top;">Chapter location different from project location</td>
<td>If this box is checked, the location of the chapter is different from the location of the project.
<br>Remark: It is often useful to differentiate the location of the chapter of the location of the project.
<br>For example, if the project location is <u>where I rented for the holidays</u>, the chapter location may be <u>where I went on tour</u>.</td>
</tr>
<tr>
<td nowrap valign="top">Event location</td>
<td>The location where the chapter's event took place<ul>
<li>Click on this <img src="img/EditGMaps.png"> button to select a location from the <a href="0123.html">Add or modify a location</a> dialog or using a favorite</li>
<li>Click on this <img src="img/trash.png"> button to remove actual location (set to empty)</li>
</ul>
<br>Remark: These fields and buttons are enabled only if the <i><b>Chapter location different from project location</b></i> check box is checked.</td>
</tr>
</tbody></table>
<div>&nbsp;</div>
<div>Under these settings, the following two buttons allow you:</div>
<table border="1" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/PrjProperties.png"> Project properties</td>
<td nowrap valign="top"><img src="img/PrjProperties.png"> Project properties</td>
<td>This button allows you to open <a href="0108.html">Project properties dialog</a>.</td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/transparent.png"> Convert to standard slide</td>
<td nowrap valign="top"><img src="img/transparent.png"> Convert to standard slide</td>
<td>This button allows you to convert this slide to a standard slide which are fully customizable.</td>
</tr>
</tbody></table>
......
......@@ -52,13 +52,13 @@
<td>Indicates the name of the current file</td>
</tr>
<tr>
<td nowrap valign="top"><img src="../../src/ffDiaporama/img/FolderOpen.png"></td>
<td nowrap valign="top"><img src="img/FolderOpen.png"></td>
<td>Allow you to selects an image file</td>
</tr>
<tr>
<td nowrap valign="top">Keep aspect ratio</td>
<td>If this box is checked, then the image will not be deformed, and:
<br><img src="../../src/ffDiaporama/img/EditImage.png"> Open the <a href="0110.html">Image framing and correction dialog</a> to regulate framing and image corrections
<br><img src="img/EditImage.png"> Open the <a href="0110.html">Image framing and correction dialog</a> to regulate framing and image corrections
</td>
</tr>
<tr>
......
......@@ -32,7 +32,7 @@
<td style="vertical-align: top;">Chapter date different from project date</td>
<td>If this box is checked, the date of the chapter is different from the date of the project.
<br>Remark: It is often useful to differentiate the date of the chapter of the date of the project.
<br>For example, if the project is "My vacation from 1 to 15", the chapter may be limited to the 3.</td>
<br>For example, if the project is <u>My vacation from 1 to 15</u>, the chapter may be limited to the <u>3</u>.</td>
</tr>
<tr>
<td style="vertical-align: top;">Event date</td>
......@@ -44,6 +44,20 @@
<td>Check this box to override the date and offer you to enter the date as a free multi-line text.
<br>Remark: This field is enabled only if the <i><b>Chapter date different from project date</b></i> check box is checked.</td>
</tr>
<tr>
<td style="vertical-align: top;">Chapter location different from project location</td>
<td>If this box is checked, the location of the chapter is different from the location of the project.
<br>Remark: It is often useful to differentiate the location of the chapter of the location of the project.
<br>For example, if the project location is <u>where I rented for the holidays</u>, the chapter location may be <u>where I went on tour</u>.</td>
</tr>
<tr>
<td nowrap valign="top">Event location</td>
<td>The location where the chapter's event took place<ul>
<li>Click on this <img src="img/EditGMaps.png"> button to select a location from the <a href="0123.html">Add or modify a location</a> dialog or using a favorite</li>
<li>Click on this <img src="img/trash.png"> button to remove actual location (set to empty)</li>
</ul>
<br>Remark: These fields and buttons are enabled only if the <i><b>Chapter location different from project location</b></i> check box is checked.</td>
</tr>
</tbody></table>
</body>
</html>
......@@ -20,9 +20,7 @@
</div>
<br>
<h2>The Project tab</h2>
<div style="margin-left: 40px;">
<h3>Settable fields</h3>
<h2>Settable fields</h2>
<table border="1" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td style="background-color: rgb(0, 0, 65); font-weight: bold; color: white;">Fields</td>
......@@ -42,14 +40,6 @@
<li>If the id3v2 compatibility option is set in <a href="0101.html">option dialog</a>, this fields is limited to 30 characters</li>
</ul></div></td>
</tr>
<tr>
<td nowrap valign="top">Event date</td>
<td>The date of the event of the project</td>
</tr>
<tr>
<td nowrap valign="top">Override date</td>
<td>Check this box to override the date and offer you to enter the date as a free multi-line text</td>
</tr>
<tr>
<td nowrap valign="top">Author</td>
<td>The name of the author of the project.
......@@ -69,6 +59,40 @@
<td nowrap valign="top">Language</td>
<td>The language of the audio track <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">(ISO 639 standard - 3 characters)</a></td>
</tr>
<tr>
<td nowrap valign="top">Thumbnail</td>
<td>These options allow you to define the thumbnail that will be attached to the video file when rendering
<table border="0" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td nowrap valign="top"><img src="img/AutoTS.png"></td>
<td>Create a new model from this thumbnail or edit custom thumbnail. Opens the <a href="0117.html">Edit thumbnail dialog</a>.</td>
</tr>
<tr>
<td nowrap valign="top"><img src="img/action_edit.png"></td>
<td>Customize the thumbnail only for this project (without creating a new thumbnail model). Opens the <a href="0117.html">Edit thumbnail dialog</a>.</td>
</tr>
<tr>
<td nowrap valign="top"><img src="img/filesave.png"></td>
<td>Expor thumbnail to a jpeg file. By default, the proposed file name is "folder.jpg". ffDiaporama and many <a href="http://en.wikipedia.org/wiki/Media_center">Media Center Systems</a> recognize this file as the icon to be used for the directory that contains it.</td>
</tr>
</tbody></table>
</td>
</tr>
<tr>
<td nowrap valign="top">Event date</td>
<td>The date of the event of the project</td>
</tr>
<tr>
<td nowrap valign="top">Override date</td>
<td>Check this box to override the date and offer you to enter the date as a free multi-line text</td>
</tr>
<tr>
<td nowrap valign="top">Event location</td>
<td>The location where the project's event took place<ul>
<li>Click on this <img src="img/EditGMaps.png"> button to select a location from the <a href="0123.html">Add or modify a location</a> dialog or using a favorite</li>
<li>Click on this <img src="img/trash.png"> button to remove actual location (set to empty)</li>
</ul></td>
</tr>
<tr>
<td nowrap valign="top">Comment</td>
<td>A free comment which can spread out on several lines.
......@@ -76,6 +100,25 @@
<li>Numerous indexing systems or <a href="http://en.wikipedia.org/wiki/Media_center">Media Center Systems</a> will read only the 1<sup>st</sup> line.</li>
</ul></div></td>
</tr>
<tr>
<td nowrap valign="top">Options for speed waves</td>
<td>These options sets the value of the velocity curves for use whenever the corresponding options are set to &quot;Project Default&quot;
<table border="0" cellpadding="2" cellspacing="0"><tbody>
<tr>
<td nowrap valign="top">Transition</td>
<td>Defined default speed curve for transitions</td>
</tr>
<tr>
<td nowrap valign="top">Block animations</td>
<td>Defined default speed curve for block animations</td>
</tr>
<tr>
<td nowrap valign="top">Image animations</td>
<td>Defined default speed curve for image animations</td>
</tr>
</tbody></table>
</td>
</tr>
</tbody></table>
<br>
<div style="margin-left: 40px;">
......@@ -150,56 +193,6 @@
</tr>
</tbody></table>