Merge lp:~xnox/ubiquity/no-bubbles into lp:ubiquity

[Dimitri John Ledkov]

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-14 17:19:29 +0000
+++ debian/changelog	2013-10-16 08:35:09 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.15.25) UNRELEASED; urgency=low
+
+  * Remove all cairo styling from partition boxes in automatic
+    partitioning, instead use gtk3/css styling. (LP: #947107)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 15 Oct 2013 00:29:41 +0100
+
 ubiquity (2.15.24) saucy; urgency=low
 
   [ Colin Watson ]

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2013-07-11 18:23:07 +0000
+++ ubiquity/frontend/gtk_ui.py	2013-10-16 08:35:09 +0000
@@ -268,6 +268,11 @@
               -GtkProgressBar-min-horizontal-bar-height : 10;
               -GtkProgressBar-min-horizontal-bar-width : 10;
             }
+            GtkEventBox.fancy {
+                background-color: alpha (@selected_bg_color, 0.5);
+                border-width: 1px;
+                border-radius: 10px;
+            }
             ''')
         Gtk.StyleContext.add_provider_for_screen(
             Gdk.Screen.get_default(),

=== modified file 'ubiquity/gtkwidgets.py'
--- ubiquity/gtkwidgets.py	2013-04-15 08:09:11 +0000
+++ ubiquity/gtkwidgets.py	2013-10-16 08:35:09 +0000
@@ -128,10 +128,14 @@
         # for the linear gradient?
         self.existing_part = existing_part or PartitionBox()
         eb = Gtk.EventBox()
+        style = eb.get_style_context()
+        style.add_class('fancy')
         eb.add(self.existing_part)
         self.pack1(eb, resize=False, shrink=False)
         self.new_part = new_part or PartitionBox()
         eb = Gtk.EventBox()
+        style = eb.get_style_context()
+        style.add_class('fancy')
         eb.add(self.new_part)
         self.pack2(eb, resize=False, shrink=False)
         self.show_all()
@@ -201,7 +205,7 @@
 GObject.type_register(DiskBox)
 
 
-class PartitionBox(StylizedFrame):
+class PartitionBox(Gtk.Alignment):
     __gtype_name__ = 'PartitionBox'
     __gproperties__ = {
         'title': (
@@ -243,7 +247,7 @@
         # 4 px between the title and the extra heading
         # 5 px between the extra heading and the size
         # 12 px below the bottom-most element
-        StylizedFrame.__init__(self)
+        Gtk.Alignment.__init__(self)
         vbox = Gtk.Box()
         vbox.set_orientation(Gtk.Orientation.VERTICAL)
         self.logo = Gtk.Image.new_from_icon_name(icon_name,
@@ -284,33 +288,6 @@
         size = misc.format_size(size)
         self.size.set_markup('<span size="x-large">%s</span>' % size)
 
-    def render_dots(self):
-        # FIXME: Dots are rendered over the frame.
-        s = cairo.ImageSurface(cairo.FORMAT_ARGB32, 2, 2)
-        cr = cairo.Context(s)
-        cr.set_source_rgb(*gtk_to_cairo_color('#b6b0a9'))
-        cr.rectangle(1, 1, 1, 1)
-        cr.fill()
-        pattern = cairo.SurfacePattern(s)
-        return pattern
-
-    def paint_background(self, c):
-        StylizedFrame.paint_background(self, c)
-        a = self.get_allocation()
-        pattern = self.render_dots()
-        pattern.set_extend(cairo.EXTEND_REPEAT)
-        c.set_source(pattern)
-        c.fill_preserve()
-
-        g = cairo.RadialGradient(a.width / 2, a.height / 2, 0, a.width / 2,
-                                 a.height / 2,
-                                 a.width > a.height and a.width or a.height)
-        g.add_color_stop_rgba(0.00, 1, 1, 1, 1.00)
-        g.add_color_stop_rgba(0.25, 1, 1, 1, 0.75)
-        g.add_color_stop_rgba(0.40, 1, 1, 1, 0.00)
-        c.set_source(g)
-        c.fill_preserve()
-
 GObject.type_register(PartitionBox)