Merge lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu into lp:ubiquity-slideshow-ubuntu

[Julien Lavergne]

Proposed branch add support for lubuntu slideshow (see also bug 614721)

[Dylan McCall (dylanmccall)]

Sorry this is taking me a while, Julien. I'll be reviewing it (and probably merging it) in a few days!

Is there a blueprint or a discussion on the Lubuntu mailing lists on this? I like to be sure a package is in a derivative's plan before releasing something with its name on it :)

[Julien Lavergne (gilir)]

Thanks Dylan.

I announced it on the mailing sometimes ago : https://lists.launchpad.net/lubuntu-desktop/msg01857.html

Also, the first version is in the Alpha 3 : https://lists.launchpad.net/lubuntu-desktop/msg02126.html . It's not something completely secret :)

If you need more information, or any modifications, just let me know :)

[Dylan McCall (dylanmccall)]

Okay, looks like you got everything! I just merged it and updated the .pot files! :)

review: Approve

[Julien Lavergne (gilir)]

Thank you Dylan :)

=== modified file 'Makefile'
--- Makefile	2010-03-13 04:27:06 +0000
+++ Makefile	2010-08-09 17:57:46 +0000
@@ -4,7 +4,7 @@
 BUILD=$(SOURCE)/build
 SOURCESLIDES=$(SOURCE)/slideshows
 
-all: clean build_ubuntu build_kubuntu build_xubuntu build_ubuntu-upgrade translations
+all: clean build_ubuntu build_kubuntu build_xubuntu build_ubuntu-upgrade build_lubuntu translations
 
 build_init:
 	mkdir -p $(BUILD)
@@ -21,11 +21,15 @@
 build_xubuntu: build_init
 	cp -rL $(SOURCESLIDES)/xubuntu $(BUILD)
 
+build_lubuntu: build_init
+	cp -rL $(SOURCESLIDES)/lubuntu $(BUILD)
+
 translations:
 	./generate-local-slides.sh ubuntu
 	./generate-local-slides.sh ubuntu-upgrade
 	./generate-local-slides.sh kubuntu
 	./generate-local-slides.sh xubuntu
+	./generate-local-slides.sh lubuntu
 
 .PHONY : clean
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-06-25 16:33:43 +0000
+++ debian/changelog	2010-08-09 17:57:46 +0000
@@ -1,3 +1,9 @@
+ubiquity-slideshow-ubuntu (24~ppa1) maverick; urgency=low
+
+  * Add a slideshow for Lubuntu.
+
+ -- Julien Lavergne <[e-mail]>  Fri, 09 Jul 2010 19:28:07 +0200
+
 ubiquity-slideshow-ubuntu (23) maverick; urgency=low
 
   * Bump version numbers to 10.10.  Many slides still need to be rewritten;
 
=== modified file 'debian/control'
--- debian/control	2010-06-25 16:32:44 +0000
+++ debian/control	2010-08-09 17:57:46 +0000
@@ -47,3 +47,13 @@
 Description: Ubiquity slideshow for Xubuntu
  A slideshow intended for the Ubiquity installer, designed as a quick 
  introduction to Xubuntu.
+
+Package: ubiquity-slideshow-lubuntu
+Architecture: all
+Provides: ubiquity-slideshow
+Conflicts: ubiquity-slideshow
+Replaces: ubiquity-slideshow
+Depends: ${misc:Depends}
+Description: Ubiquity slideshow for Lubuntu
+ A slideshow intended for the Ubiquity installer, designed as a quick 
+ introduction to Lubuntu.
 
=== added file 'debian/ubiquity-slideshow-lubuntu.install'
--- debian/ubiquity-slideshow-lubuntu.install	1970-01-01 00:00:00 +0000
+++ debian/ubiquity-slideshow-lubuntu.install	2010-08-09 17:57:46 +0000
@@ -0,0 +1,1 @@
+build/lubuntu/* /usr/share/ubiquity-slideshow
 
=== modified file 'generate-pot-files.sh'
--- generate-pot-files.sh	2010-02-26 12:38:43 +0000
+++ generate-pot-files.sh	2010-08-09 17:57:46 +0000
@@ -19,3 +19,4 @@
 mkpo "ubuntu-upgrade"
 mkpo "kubuntu"
 mkpo "xubuntu"
+mkpo "lubuntu"
 
=== added directory 'po/lubuntu'
=== added directory 'slideshows/lubuntu'
=== added directory 'slideshows/lubuntu/slides'
=== added file 'slideshows/lubuntu/slides/abiword-gnumeric.html'
--- slideshows/lubuntu/slides/abiword-gnumeric.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/abiword-gnumeric.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,14 @@
+<div class="header"><h1 class="title">Abiword and Gnumeric</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives for OpenOffice.</li>
+	<li>You can create and edit documents like spreadsheets and letters.</li>
+	<li>More information on <a href="http://www.abisource.com/">Abiword</a> and <a href="http://projects.gnome.org/gnumeric/">Gnumeric websites</a>.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/office.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/chromium-browser.html'
--- slideshows/lubuntu/slides/chromium-browser.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/chromium-browser.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,14 @@
+<div class="header"><h1 class="title">Internet with Chromium</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>Lubuntu is shipped with <em>Chromium</em>, the open-source version of Chrome, a browser developed by Google.</li>
+	<li>It's fast with a clean user interface.</li>
+	<li>More information on the <a href="http://sites.google.com/a/chromium.org/dev/Home">Chromium website</a>.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/chromium.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/gnome-mplayer.html'
--- slideshows/lubuntu/slides/gnome-mplayer.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/gnome-mplayer.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,15 @@
+<div class="header"><h1 class="title">Videos with gnome-mplayer</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>You will be able to watch videos with <em>gnome-mplayer</em>, a fast video player using mplayer.</li>
+	<li>Support for many formats is included.</li>
+	<li>You can also obtain additional non-free support by installing the lubuntu-restricted-extras package. </li>
+	<li>More information on <a href="http://sites.google.com/site/kdekorte2/gnomemplayer">gnome-mplayer website.</a></li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/gnome-mplayer.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/help.html'
--- slideshows/lubuntu/slides/help.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/help.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,15 @@
+<div class="header"><h1 class="title">Getting Help</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>If you need help, you can contact us :</li>
+	<li><!-- The url should not be translated -->Using the <a href="https://wiki.ubuntu.com/Lubuntu/ContactUs">wiki page</a>.</li>
+	<li>On the mailing list, subscribe on <a href="https://launchpad.net/~lubuntu-desktop">the page</a>.</li>
+	<li>On the IRC chan #lubuntu on irc.freenode.net.</li>
+</ul>
+
+<p class="footer">The installation will finish soon. We hope you enjoy Lubuntu.</p></div>
+</div>
+
+<img class="icon" src="icons/help.png" alt="" />
 
=== added directory 'slideshows/lubuntu/slides/icons'
=== added file 'slideshows/lubuntu/slides/icons/chromium.png'
 Binary files slideshows/lubuntu/slides/icons/chromium.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/chromium.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/gnome-mplayer.png'
 Binary files slideshows/lubuntu/slides/icons/gnome-mplayer.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/gnome-mplayer.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/help.png'
 Binary files slideshows/lubuntu/slides/icons/help.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/help.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/lxde.png'
 Binary files slideshows/lubuntu/slides/icons/lxde.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/lxde.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/office.png'
 Binary files slideshows/lubuntu/slides/icons/office.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/office.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/pidgin.png'
 Binary files slideshows/lubuntu/slides/icons/pidgin.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/pidgin.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/sylpheed.png'
 Binary files slideshows/lubuntu/slides/icons/sylpheed.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/sylpheed.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/synaptic.png'
 Binary files slideshows/lubuntu/slides/icons/synaptic.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/synaptic.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/icons/welcome.png'
 Binary files slideshows/lubuntu/slides/icons/welcome.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/welcome.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/index.html'
--- slideshows/lubuntu/slides/index.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/index.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+<html lang="en">
+
+<head>
+	<title>ubiquity-slideshow-lubuntu</title>
+	
+	<link href="link/general.css" rel="stylesheet" type="text/css" />
+	
+	<base target="_blank" />
+	
+	<script type="text/javascript" src="link-core/prototype.js"></script>
+	<script type="text/javascript" src="link-core/effects.js"></script>
+	<script type="text/javascript" src="link-core/fastinit.js"></script>
+	<script type="text/javascript" src="link-core/crossfade.js"></script>
+	<script type="text/javascript" src="directory.js"></script>
+	<script type="text/javascript" src="link-core/slideshow.js"></script>
+</head>
+
+<body>
+
+<div id="container">
+	<div id="slideshow">
+		
+		<!-- Slides go here. Simply place the following snippet
+		in the order you wish it to appear, replacing "MY SLIDE"
+		with the filename of your slide.
+		<div><a href="MY SLIDE" class="load"></a></div> -->
+		<div><a href="welcome.html" class="load"></a></div>
+		<div><a href="lxde.html" class="load"></a></div>
+		<div><a href="chromium-browser.html" class="load"></a></div>
+		<div><a href="abiword-gnumeric.html" class="load"></a></div>
+		<div><a href="gnome-mplayer.html" class="load"></a></div>
+		<div><a href="pidgin.html" class="load"></a></div>
+		<div><a href="sylpheed.html" class="load"></a></div>
+		<div><a href="synaptic.html" class="load"></a></div>
+		<div><a href="help.html" class="load"></a></div>
+	</div>
+</div>
+
+<div id="debug-controls">
+<input type="button" id="prev-slide" value="&lt;"/>
+<input type="text"   id="current-slide" />
+<input type="button" id="next-slide" value="&gt;"/>
+</div>
+
+</body>
+
+</html>
 
=== added directory 'slideshows/lubuntu/slides/link'
=== added symlink 'slideshows/lubuntu/slides/link-core'
=== target is u'../../link-core'
=== added file 'slideshows/lubuntu/slides/link/background.png'
 Binary files slideshows/lubuntu/slides/link/background.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/background.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/link/background.rtl.png'
 Binary files slideshows/lubuntu/slides/link/background.rtl.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/background.rtl.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/link/bullet-point.png'
 Binary files slideshows/lubuntu/slides/link/bullet-point.png	1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/link/bullet-point.png	2010-08-09 17:57:46 +0000 differ
=== added file 'slideshows/lubuntu/slides/link/general.css'
--- slideshows/lubuntu/slides/link/general.css	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/link/general.css	2010-08-09 17:57:46 +0000
@@ -0,0 +1,216 @@
+html, body {
+	margin:0;
+	padding:0;
+	
+	background-color:#F0F2F4;
+	
+	font-family:sans-serif;
+	color:#000000;
+}
+
+/*
+Hyperlink-style text
+*/
+a {
+	color:#731444;
+	font-style:italic;
+	text-decoration:none;
+}
+
+#container {
+	position:absolute;
+	
+	width:798px;
+	height:451px;
+	
+	overflow:hidden;
+	
+	background-image:url('background.png');
+	background-repeat:no-repeat;
+	background-position:top right;
+	
+	background-color:#F0F2F4;
+	
+	/*cursor:default;*/
+}
+
+#debug-controls {
+	display:none;
+	position:absolute;
+	top:470px;
+	width:798px;
+	text-align:center;
+}
+
+#debug-controls input {
+	width:40px;
+}
+
+#debug-controls input#current-slide {
+	width:680px;
+}
+
+/* fixed container to align title */
+.header {
+	position:fixed; /* FIXME: This is a terrible hack to keep the header from moving during a transition */
+	top:0px;
+	height:176px;
+}
+
+/* title block is positioned at the bottom of its parent, which should be .header */
+.title {
+	position:absolute;
+	
+	bottom:12px;
+	width:385px; /* the ideal width would leave more space on the right */
+	left:36px; /* matches padding of .content and .content ul: 16 + 20 */
+	
+	font-size:20px; /* applies to all lines except first */
+	font-weight:normal;
+	
+	letter-spacing:-1px;
+	
+	color:#ffffff;
+	
+	padding:0px;
+	margin:0px;
+}
+.title:first-line {
+	font-size:28px;
+}
+
+/*
+Typically an image. This is positioned at the top right of a slide.
+Icons should be 215x156 pixels tall, though some can overflow with a height
+of 215px. The actual content should be 128x128px. (The rest is padding).
+*/
+.icon {
+	/* FIXME: This is a horrible hack to keep the title from moving during slide transition */
+	position:fixed; /* was position:absolute */
+	
+	top:20px;
+	left:549px;
+	width:215px;
+	height:auto;
+	
+	z-index:11;
+	border:0px;
+}
+.icon#firefox {
+	top:47px;
+	left:590px;
+	width:128px;
+	height:auto;
+}
+
+/*
+.content expects to be contained in here. .main
+creates a nice, plain surface upon which it can
+appear, spaced appropriately from .title.
+*/
+.main {
+	position:absolute;
+	
+	top:163px;
+	left:0px;
+	
+	width:100%;
+	height:288px;
+	
+	padding-right:60px;
+	
+	z-index:12;
+}
+
+/*
+Slide's body text goes inside here.
+*/
+.content {
+	padding:16px;
+	padding-top:32px;
+	
+	font-size:14px;
+	color:#484848;
+}
+
+.content ul {
+	margin-top:0px;
+	padding-left:20px;
+	
+	width:726px; /* was 650px */
+	height:223px;
+
+	line-height:1.4em;
+	
+	overflow:auto;
+	
+	list-style-type:none;
+	list-style-image:url("bullet-point.png");
+}
+
+.content li {
+	padding:8px;
+	padding-left:0px;
+}
+/* hack to get the text wrapping around the icon. If we could do this for
+ul :first-line, there would be less room for failure. */
+.content.wrap-top li:first-child {
+	width:550px;
+}
+
+.content .footer {
+	position:relative;
+	width:100%;
+	padding:0px;
+	margin:0px;
+	bottom:10px;
+	text-align:right;
+	
+	font-weight:bold;
+	color:#333333;
+}
+
+.content img.inline {
+	height:14px;
+	width:auto;
+}
+
+/*
+This rule disables drag-and-drop for images.  See bug #448703.
+*/
+img {
+ 	-webkit-user-drag: none;
+}
+
+
+
+/* RTL stuff */
+.rtl {
+	direction:rtl;
+}
+.rtl #container {
+	background-image:url('background.rtl.png');
+	background-repeat:no-repeat;
+	background-position:top left;
+}
+/* TODO: NEED reversed title and icon for RTL */
+.rtl .title {
+	left:377px;
+}
+.rtl .icon {
+	/* FIXME: This is a horrible hack to keep the title from moving during slide transition */
+	position:fixed; /* was position:absolute */
+	
+	left:34px;
+}
+.rtl .icon#firefox {
+	left:80px;
+}
+.rtl .main {
+	right:0px;
+	padding-right:0px;
+	padding-left:60px;
+}
+.rtl .content .footer {
+    text-align:left;
+}
 
=== added file 'slideshows/lubuntu/slides/lxde.html'
--- slideshows/lubuntu/slides/lxde.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/lxde.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,13 @@
+<div class="header"><h1 class="title">Based on LXDE Desktop</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>Lubuntu is based on <em>LXDE Desktop Environment</em>, a fast-performing and energy-saving desktop environment.</li>
+	<li><!-- The url "lxde.org" should not be translated -->More information on the <a href="http://lxde.org">LXDE website</a>.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/lxde.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/pidgin.html'
--- slideshows/lubuntu/slides/pidgin.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/pidgin.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,14 @@
+<div class="header"><h1 class="title">Chatting with your friends</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>With <em>Pidgin</em>, you will be able to chat with your friends.</li>
+	<li>Go to the menu, and click on Pidgin icon to connect to many Instant Message services, such as Jabber or Windows Live.</li>
+	<li>More information on <a href="http://pidgin.im/">Pidgin website</a>.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/pidgin.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/sylpheed.html'
--- slideshows/lubuntu/slides/sylpheed.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/sylpheed.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,14 @@
+<div class="header"><h1 class="title">Checking your emails</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>Lubuntu provides a mail client named <em>Sylpheed</em>.</li>
+	<li>It will allow you to check your email messages, and read them even if you are offline.</li>
+	<li>More information on <a href="http://sylpheed.sraoss.jp/en/">Sylpheed website</a>.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/sylpheed.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/synaptic.html'
--- slideshows/lubuntu/slides/synaptic.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/synaptic.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,14 @@
+<div class="header"><h1 class="title">Installing softwares</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>With Lubuntu, you have access to the whole Ubuntu repository and all the software included.</li>
+	<li>Go to the menu, click on Preferences and <em>Synaptic Software Manager</em>.</li>
+	<li>You can search for software by clicking on the Search button.</li>
+</ul>
+</div>
+
+</div>
+
+<img class="icon" src="icons/synaptic.png" alt="" />
 
=== added file 'slideshows/lubuntu/slides/welcome.html'
--- slideshows/lubuntu/slides/welcome.html	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slides/welcome.html	2010-08-09 17:57:46 +0000
@@ -0,0 +1,12 @@
+<div class="header"><h1 class="title">Welcome</h1></div>
+
+<div class="main">
+
+<div class="content wrap-top"><ul>
+	<li>Thank you for choosing Lubuntu 10.10.</li>
+</ul>
+<p class="footer">Lubuntu is designed to be easy and fast. Feel free to explore!</p></div>
+
+</div>
+
+<img class="icon" src="icons/welcome.png" alt="" />
 
=== added file 'slideshows/lubuntu/slideshow.conf'
--- slideshows/lubuntu/slideshow.conf	1970-01-01 00:00:00 +0000
+++ slideshows/lubuntu/slideshow.conf	2010-08-09 17:57:46 +0000
@@ -0,0 +1,3 @@
+[Slideshow]
+width:798
+height:451