Merge lp:~laney/ubiquity/gtk320 into lp:ubiquity

[Iain Lane]

Port the CSS to work with GTK 3.20, which changed how the selectors work.

The biggest change was to the progress pill thingies. Please see if you think they look good enough now.

[Iain Lane (laney)]

I forgot to say - to test this, add ppa:ubuntu-desktop/gtk320 in a live session, install this ubiquity, and restart lightdm.

=== modified file 'debian/control'
--- debian/control	2016-03-15 14:18:44 +0000
+++ debian/control	2016-07-22 14:16:39 +0000
@@ -45,7 +45,7 @@
 Package: ubiquity-frontend-gtk
 Architecture: amd64 arm64 armhf i386 powerpc ppc64el
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit2-4.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0 (>= 3.20), gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit2-4.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
 Suggests: gnome-control-center | feh
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)

=== modified file 'tests/test_usersetup.py'
--- tests/test_usersetup.py	2013-02-19 11:33:07 +0000
+++ tests/test_usersetup.py	2016-07-22 14:16:39 +0000
@@ -91,6 +91,7 @@
     def test_unicode(self):
         # i18n needs to be imported to register ascii_transliterate
         from ubiquity import i18n
+        assert i18n  # silence, pyflakes
 
         self.gtk.controller.get_string = mock_get_string
         heart = '♥'

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2016-04-06 03:08:53 +0000
+++ ubiquity/frontend/gtk_ui.py	2016-07-22 14:16:39 +0000
@@ -256,18 +256,24 @@
         # Make a thin Progress bar
         provider = Gtk.CssProvider()
         provider.load_from_data(b'''\
-            .inline-toolbar.toolbar {
+            toolbar {
                 background: @theme_bg_color;
                 border-color: transparent;
                 border-width: 0px;
                 padding: 0px;
             }
-            GtkProgressBar {
-              -GtkProgressBar-min-horizontal-bar-height : 10;
-              -GtkProgressBar-min-horizontal-bar-width : 10;
-            }
-            GtkPaned {
-                -GtkPaned-handle-size: 10;
+            progressbar trough {
+              min-height: 10px;
+              min-width: 11px;
+              border: none;
+            }
+            progressbar progress {
+              min-height: 10px;
+              border-radius: 4px;
+              border: none;
+            }
+            paned separator {
+                min-width: 10px;
             }
             ''')
         Gtk.StyleContext.add_provider_for_screen(

=== modified file 'ubiquity/plugins/ubi-wireless.py'
--- ubiquity/plugins/ubi-wireless.py	2014-06-30 13:09:16 +0000
+++ ubiquity/plugins/ubi-wireless.py	2016-07-22 14:16:39 +0000
@@ -62,6 +62,7 @@
         # as importing it as the side effect of registering
         # NetworkManagerWidget which we DO use in the Wireless step UI.
         from ubiquity.frontend.gtk_components import nmwidgets
+        assert nmwidgets  # silence, pyflakes
 
         if self.is_automatic:
             self.page = None