Commit 2ca848df authored by Diego Giovane Pasqualin's avatar Diego Giovane Pasqualin
Browse files

Merge branch 'develop' into 'master'

Fix Issue/96

See merge request !2
parents fedec2c8 1cdf7e60
Pipeline #9061 passed with stages
in 8 minutes and 30 seconds
# Makefile for le-ubiquity-slideshow
#
# Copyright (C) 2017 Centro de Computacao Cientifica e Software Livre
# Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
#
......@@ -18,8 +20,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
# USA.
# Makefile for le-ubiquity-slideshow
SLIDESHOWS = \
ubuntu \
ubuntu-gnome
......
......@@ -8,7 +8,7 @@ distribution, meant to run on its installation.
When this package is built, it first runs the Makefile on the root directory and builds a set
of slideshow files for every po localization file found in the po/ directory. If the content
of any slide is changed, the pot file needs to be rebuild by running 'make pot' on the package
of any slide is changed, the pot file needs to be rebuilt by running 'make pot' on the package
root directory. The po files for all localizations must also be updated to reference the pot
file text. For more documentation, see the po4a man page. The original package also built a
different deb file for every linux distribution that was supported. This project only builds
......@@ -17,16 +17,16 @@ one package, based on the ubiquity-slideshow-ubuntu-gnome layout.
Useful commands (from the package root directory):
-make
Builds the slideshow
Builds the slideshow
-make pot
Updates the slideshow.pot localization file
Updates the slideshow.pot localization file
-make test
Tests the slideshow in an example GUI. The slideshow needs to be built first.
-make test
Tests the slideshow in an example GUI. The slideshow needs to be built first.
-make test.LOCALE
Tests the slideshow with the specified LOCALE (ex. make test.pt_BR)
-make test.LOCALE
Tests the slideshow with the specified LOCALE (ex. make test.pt_BR)
-make mtest
Cleans the build folder, rebuilds the slideshow and launches a test for it.
......
le-ubiquity-slideshow (0.0.4) testing; urgency=low
* Fixed the auto-scrolling in the slideshow, removed unused files.
-- Levi <lhgs15@inf.ufpr.br> Wed, 03 Apr 2017 11:41:22 -0200
le-ubiquity-slideshow (0.0.3) testing; urgency=low
* Updated the slideshow design and content, added pt_BR localization.
......
......@@ -9,13 +9,6 @@
</div>
</div>
<div class="bigicon">
<ul>
<li>
<img width=48px height=48px src="icons/FlatRemix/auto1.svg"/>
</li>
</ul>
</div>
<img class="screenshot" src="screenshots/autoupgrade.png" />
</div>
......@@ -17,6 +17,8 @@
SLIDESHOW_OPTIONS = {
timeout:20000,
speed:600,
autopause:false, // Stop slide auto-scrolling when the last slide is reached
manualTrump:false, //Allow user to override the slide moving animation
}
</script>
......
......@@ -8,13 +8,6 @@
<p>Computers in a local network automatically connect with each other. Teachers can use <strong>Epoptes</strong> to lock students' computers, share the screen, broadcast messages and much more. </p>
</div>
</div>
<div class="bigicon">
<ul>
<li>
<img width=72px height=48px src="icons/FlatRemix/lab3.png"/>
</li>
</ul>
</div>
<img class="screenshot" src="screenshots/laboratory.png"/>
</div>
#!/bin/bash
TITLE="Slideshow tester"
SOURCE=.
BUILD=$SOURCE/build
SOURCESLIDES=$SOURCE/slideshows
slideshow=$1
if [ -z "$slideshow" ]
then
slideshows=""
for show in $SOURCESLIDES/*; do
showname=$(basename $show)
#oddly placed files we need to ignore
[ $showname = "link-core" ] && continue
#if we're still going, add this slideshow to the list
select=FALSE
[ $showname = "ubuntu" ] && select=TRUE
slideshows="$slideshows $select $showname"
done
slideshow=$(zenity --list --radiolist --column="Pick" --column="Slideshow" $slideshows --title="$TITLE" --text="Choose a slideshow to test")
[ "$slideshow" = "" ] | [ "$slideshow" = "(null)" ] && exit
fi
language=$2
if [ -n "$language" ]
then
make test.$slideshow.$language
else
make clean
make test.$slideshow
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment