Merge lp:~quadrispro/ubiquity/fix-690912 into lp:ubiquity

[Alessio Treglia]

See bug #690912

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2010-12-09 12:22:52 +0000
+++ debian/ubiquity.templates	2010-12-17 14:07:59 +0000
@@ -885,6 +885,11 @@
  If you do not go back to the partitioner and increase the size of these
  partitions, the installation may fail.
 
+Template: ubiquity/hide_slideshow
+Type: boolean
+Default: false
+Description: for internal use; hide the slideshow while installing.
+
 Template: ubiquity/text/oem_user_config_title
 Type: text
 _Description: System Configuration

=== modified file 'ubiquity/frontend/base.py'
--- ubiquity/frontend/base.py	2010-12-16 16:12:36 +0000
+++ ubiquity/frontend/base.py	2010-12-17 14:07:59 +0000
@@ -134,6 +134,13 @@
         except debconf.DebconfError:
             pass
 
+        self.hide_slideshow = False
+        try:
+            if self.db.get('ubiquity/hide_slideshow') == 'true':
+                self.hide_slideshow = True
+        except debconf.DebconfError:
+            pass
+
         # Load plugins
         plugins = plugin_manager.load_plugins()
         modules = plugin_manager.order_plugins(plugins)

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2010-12-16 16:12:36 +0000
+++ ubiquity/frontend/gtk_ui.py	2010-12-17 14:07:59 +0000
@@ -731,7 +731,9 @@
 
         #Parse the slideshow size early to prevent the window from growing
         self.slideshow = '/usr/share/ubiquity-slideshow'
-        if os.path.exists(self.slideshow):
+        if 'UBIQUITY_AUTOMATIC' in os.environ and self.hide_slideshow == True:
+            self.slideshow = None
+        elif os.path.exists(self.slideshow):
             try:
                 cfg = ConfigParser.ConfigParser()
                 cfg.read(os.path.join(self.slideshow, 'slideshow.conf'))

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2010-12-16 16:12:36 +0000
+++ ubiquity/frontend/kde_ui.py	2010-12-17 14:07:59 +0000
@@ -504,10 +504,13 @@
 
     def start_slideshow(self):
         slideshow_dir = '/usr/share/ubiquity-slideshow'
+        if 'UBIQUITY_AUTOMATIC' in os.environ and self.hide_slideshow == True:
+            self.slideshow = None
         slideshow_locale = self.slideshow_get_available_locale(slideshow_dir,
                                                                self.locale)
         slideshow_main = slideshow_dir + '/slides/index.html'
-        if not os.path.exists(slideshow_main):
+        if (not os.path.exists(slideshow_main)) or
+            ('UBIQUITY_AUTOMATIC' in os.environ and self.hide_slideshow == True):
             self.ui.pageMode.hide()
             return