Merge lp:~mvo/software-center/tos-dialog into lp:software-center

[Michael Vogt]

This adds a terms-of-service dialog before the first purchase.

[Michael Vogt (mvo)]

This branch is ready for review now that the spec got updated. It implements the Terms of Use
functionality as speced.

[Gary Lasker (gary-lasker)]

Thanks Michael, this looks great! Very nice work and nice unit tests! :) Just noting that the content ToS page at https://apps.ubuntu.com/cat/tos isn't actually deployed yet, but that will come very soon and need not hold up this merge, which I will do now.

Thanks again!

review: Approve

[Michael Vogt (mvo)]

Thanks for the review! Yes, the tos link is currently 404 we wait for the server to deploy it. But we can not hold back the branch as it contains string fixes as well that need to get to the translators.

=== modified file 'data/ui/gtk3/SoftwareCenter.ui'
--- data/ui/gtk3/SoftwareCenter.ui	2011-11-29 18:52:13 +0000
+++ data/ui/gtk3/SoftwareCenter.ui	2012-03-19 14:40:27 +0000
@@ -503,6 +503,16 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="menuitem_tos">
+                        <property name="label" translatable="yes">Terms of Service</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_menuitem_tos_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="menuitem_about">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>

=== modified file 'data/ui/gtk3/dialogs.ui'
--- data/ui/gtk3/dialogs.ui	2011-10-11 12:02:00 +0000
+++ data/ui/gtk3/dialogs.ui	2012-03-19 14:40:27 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="dialog_broken_cache">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -23,6 +23,7 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label" translatable="yes">Cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -37,6 +38,7 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label" translatable="yes">Repair</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -64,8 +66,6 @@
             <property name="can_focus">False</property>
             <property name="row_spacing">24</property>
             <property name="column_spacing">12</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
             <child>
               <object class="GtkLabel" id="label_broken_cache">
                 <property name="visible">True</property>
@@ -162,6 +162,7 @@
             <child>
               <object class="GtkButton" id="button_deauthorize_cancel">
                 <property name="label" translatable="yes">Cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -176,6 +177,7 @@
             <child>
               <object class="GtkButton" id="button_deauthorize_do">
                 <property name="label" translatable="yes">Remove</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -212,6 +214,9 @@
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <child>
+                  <placeholder/>
+                </child>
+                <child>
                   <object class="GtkImage" id="image_icon">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -268,9 +273,6 @@
                     <property name="y_padding">6</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
           </object>
@@ -311,6 +313,7 @@
             <child>
               <object class="GtkButton" id="button_dependency_cancel">
                 <property name="label" translatable="yes">Cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -325,6 +328,7 @@
             <child>
               <object class="GtkButton" id="button_dependency_do">
                 <property name="label" translatable="yes">Remove</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -352,8 +356,6 @@
             <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
             <child>
               <object class="GtkImage" id="image_package_icon">
                 <property name="visible">True</property>
@@ -446,6 +448,7 @@
             <child>
               <object class="GtkButton" id="gwib_err_cancel_button">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -461,6 +464,7 @@
             <child>
               <object class="GtkButton" id="gwib_err_retry_button">
                 <property name="label" translatable="yes">Retry</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -505,6 +509,7 @@
             <child>
               <object class="GtkButton" id="button_install_error_ok">
                 <property name="label" translatable="yes">OK</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -541,6 +546,9 @@
                 <property name="n_rows">2</property>
                 <property name="n_columns">2</property>
                 <child>
+                  <placeholder/>
+                </child>
+                <child>
                   <object class="GtkImage" id="image_package_icon1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -604,9 +612,6 @@
                     <property name="bottom_attach">2</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
             </child>
           </object>

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-09 01:40:52 +0000
+++ po/POTFILES.in	2012-03-19 14:40:27 +0000
@@ -39,6 +39,7 @@
 softwarecenter/ui/gtk3/app.py
 softwarecenter/ui/gtk3/review_gui_helper.py
 softwarecenter/ui/gtk3/dialogs/__init__.py
+softwarecenter/ui/gtk3/dialogs/dialog_tos.py
 softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py
 softwarecenter/ui/gtk3/dialogs/dependency_dialogs.py
 softwarecenter/ui/gtk3/models/appstore2.py
@@ -55,6 +56,7 @@
 softwarecenter/ui/gtk3/views/appview.py
 softwarecenter/ui/gtk3/views/catview_gtk.py
 softwarecenter/ui/gtk3/views/purchaseview.py
+softwarecenter/ui/gtk3/views/webkit.py
 softwarecenter/ui/gtk3/widgets/apptreeview.py
 softwarecenter/ui/gtk3/widgets/backforward.py
 softwarecenter/ui/gtk3/widgets/buttons.py

=== modified file 'softwarecenter/backend/oneconfhandler/core.py'
--- softwarecenter/backend/oneconfhandler/core.py	2012-03-16 19:16:21 +0000
+++ softwarecenter/backend/oneconfhandler/core.py	2012-03-19 14:40:27 +0000
@@ -17,12 +17,12 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-
 from oneconf.dbusconnect import DbusConnect
 from oneconf.enums import MIN_TIME_WITHOUT_ACTIVITY
 
 from softwarecenter.backend.login_sso import get_sso_backend
 from softwarecenter.backend.ubuntusso import get_ubuntu_sso_backend
+from softwarecenter.enums import SOFTWARE_CENTER_NAME_KEYRING
 
 import datetime
 from gi.repository import GObject
@@ -31,8 +31,12 @@
 from gettext import gettext as _
 
 LOG = logging.getLogger(__name__)
-
-
+<<<<<<< TREE
+
+
+=======
+1
+>>>>>>> MERGE-SOURCE
 class OneConfHandler(GObject.GObject):
 
     __gsignals__ = {
@@ -51,10 +55,14 @@
 
         LOG.debug("OneConf Handler init")
         super(OneConfHandler, self).__init__()
+<<<<<<< TREE
 
         # FIXME: should be an enum common to OneConf and here
         self.appname = "Ubuntu Software Center"
 
+=======
+        
+>>>>>>> MERGE-SOURCE
         # OneConf stuff
         self.oneconf = DbusConnect()
         self.oneconf.hosts_dbus_object.connect_to_signal('hostlist_changed',
@@ -166,12 +174,19 @@
     def _try_login(self):
         '''Try to get the credential or login on ubuntu sso'''
         logging.debug("OneConf login()")
+<<<<<<< TREE
         help_text = _("With multiple Ubuntu computers, you can publish "
                       "their inventories online to compare the software "
                       "installed on each\nNo-one else will be able to see "
                       "what you have installed.")
         self.sso = get_sso_backend(0,
                                    self.appname, help_text)
+=======
+        help_text = _("With multiple Ubuntu computers, you can publish their inventories online to compare the software installed on each\n"
+                      "No-one else will be able to see what you have installed.")
+        self.sso = get_sso_backend(
+            0, SOFTWARE_CENTER_NAME_KEYRING, help_text)
+>>>>>>> MERGE-SOURCE
         self.sso.connect("login-successful", self._maybe_login_successful)
         self.sso.connect("login-canceled", self._login_canceled)
         self.sso.login_or_register()

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-03-15 20:56:56 +0000
+++ softwarecenter/enums.py	2012-03-19 14:40:27 +0000
@@ -52,6 +52,9 @@
 UBUNTU_SSO_SERVICE = os.environ.get(
     "USSOC_SERVICE_URL", "https://login.ubuntu.com/api/1.0")
 
+# the terms-of-service link
+SOFTWARE_CENTER_TOS_LINK = "http://apps.ubuntu.com/cat/tos"
+
 # version of the database, every time something gets added (like
 # terms for mime-type) increase this (but keep as a string!)
 DB_SCHEMA_VERSION = "6"

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-03-16 17:49:04 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-03-19 14:40:27 +0000
@@ -59,6 +59,7 @@
                                   DB_SCHEMA_VERSION,
                                   MOUSE_EVENT_FORWARD_BUTTON,
                                   MOUSE_EVENT_BACK_BUTTON,
+                                  SOFTWARE_CENTER_TOS_LINK,
                                   SOFTWARE_CENTER_NAME_KEYRING)
 from softwarecenter.utils import (clear_token_from_ubuntu_sso,
                                   get_http_proxy_string_from_gsettings,
@@ -1068,10 +1069,12 @@
         self.aboutdialog.show()
 
     def on_menuitem_help_activate(self, menuitem):
-        # run yelp
-        p = subprocess.Popen(["yelp", "ghelp:software-center"])
-        # collect the exit status (otherwise we leave zombies)
-        GObject.timeout_add_seconds(1, lambda p: p.poll() == None, p)
+        # run browser
+        (pid, stdin, stdout, stderr) = GObject.spawn_async(
+            ["yelp", "ghelp:software-center"], flags=GObject.SPAWN_SEARCH_PATH)
+
+    def on_menuitem_tos_activate(self, menuitem):
+        webbrowser.open_new_tab(SOFTWARE_CENTER_TOS_LINK)
 
     def on_menuitem_developer_activate(self, menuitem):
         webbrowser.open(self.distro.DEVELOPER_URL)

=== modified file 'softwarecenter/ui/gtk3/dialogs/__init__.py'
--- softwarecenter/ui/gtk3/dialogs/__init__.py	2012-03-15 01:39:09 +0000
+++ softwarecenter/ui/gtk3/dialogs/__init__.py	2012-03-19 14:40:27 +0000
@@ -21,9 +21,10 @@
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
-
 from gettext import gettext as _
 
+import softwarecenter.paths
+
 
 class SimpleGtkbuilderDialog(object):
     def __init__(self, datadir, domain):
@@ -37,10 +38,23 @@
                 name = Gtk.Buildable.get_name(o)
                 setattr(self, name, o)
 
+
 # for unitesting only
 _DIALOG = None
 
 
+def show_accept_tos_dialog(parent):
+    global _DIALOG
+    from dialog_tos import DialogTos
+    dialog = DialogTos(parent)
+    _DIALOG = dialog
+    result = dialog.run()
+    dialog.destroy()
+    if result == Gtk.ResponseType.YES:
+        return True
+    return False
+
+
 def confirm_repair_broken_cache(parent, datadir):
     glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
     dialog = glade_dialog.dialog_broken_cache
@@ -119,7 +133,11 @@
 
 
 if __name__ == "__main__":
-    print("Running remove dialog")
+    softwarecenter.paths.datadir = "./data"
+
+    print("Showing tos dialog")
+    res = show_accept_tos_dialog(None)
+    print "accepted: ", res
 
     print("Running broken apt-cache dialog")
     confirm_repair_broken_cache(None, "./data")

=== added file 'softwarecenter/ui/gtk3/dialogs/dialog_tos.py'
--- softwarecenter/ui/gtk3/dialogs/dialog_tos.py	1970-01-01 00:00:00 +0000
+++ softwarecenter/ui/gtk3/dialogs/dialog_tos.py	2012-03-19 14:40:27 +0000
@@ -0,0 +1,84 @@
+# Copyright (C) 2009 Canonical
+#
+# Authors:
+#  Michael Vogt
+#  Andrew Higginson (rugby471)
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk
+from gi.repository import WebKit
+
+from gettext import gettext as _
+
+from softwarecenter.ui.gtk3.views.webkit import ScrolledWebkitWindow
+from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
+
+
+class DialogTos(Gtk.Dialog):
+
+    def __init__(self, parent):
+        Gtk.Dialog.__init__(self)
+        self.set_default_size(420, 400)
+        self.set_transient_for(parent)
+        self.set_title(_("Terms of Use"))
+        # buttons
+        self.add_button(_("Decline"), Gtk.ResponseType.NO)
+        self.add_button(_("Accept"), Gtk.ResponseType.YES)
+        # label
+        self.label = Gtk.Label(_(u"One moment, please\u2026"))
+        self.label.show()
+        # add the label
+        box = self.get_action_area()
+        box.pack_start(self.label, False, False, 0)
+        box.set_child_secondary(self.label, True)
+        # hrm, hrm, there really should be a better way
+        for itm in box.get_children():
+            if itm.get_label() == _("Accept"):
+                self.button_accept = itm
+                break
+        self.button_accept.set_sensitive(False)
+        # webkit
+        wb = ScrolledWebkitWindow()
+        wb.show_all()
+        self.webkit = wb.webkit
+        self.webkit.connect(
+            "notify::load-status", self._on_load_status_changed)
+        # content
+        content = self.get_content_area()
+        self.spinner = SpinnerNotebook(wb)
+        self.spinner.show_all()
+        content.pack_start(self.spinner, True, True, 0)
+
+    def run(self):
+        self.spinner.show_spinner()
+        self.webkit.load_uri("http://apps.ubuntu.com/cat/tos")
+        return Gtk.Dialog.run(self)
+
+    def _on_load_status_changed(self, view, pspec):
+        prop = pspec.name
+        status = view.get_property(prop)
+        if (status == WebKit.LoadStatus.FINISHED or
+            status == WebKit.LoadStatus.FAILED):
+            self.spinner.hide_spinner()
+        if status == WebKit.LoadStatus.FINISHED:
+            self.label.set_text(_("Do you accept these terms?"))
+            self.button_accept.set_sensitive(True)
+
+if __name__ == "__main__":
+    d = DialogTos(None)
+    res = d.run()
+    print res

=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-03-16 10:36:55 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-03-19 14:40:27 +0000
@@ -236,11 +236,11 @@
             window.set_cursor(None)
 
     def on_purchase_requested(self, appmanager, app, iconname, url):
-        self.purchase_view.initiate_purchase(app, iconname, url)
-        vm = get_viewmanager()
-        vm.display_page(
-            self, AvailablePane.Pages.PURCHASE, self.state,
-            self.display_purchase)
+        if self.purchase_view.initiate_purchase(app, iconname, url):
+            vm = get_viewmanager()
+            vm.display_page(
+                self, AvailablePane.Pages.PURCHASE, self.state,
+                self.display_purchase)
 
     def on_purchase_needs_spinner(self, appmanager, active):
         vm = get_viewmanager()

=== modified file 'softwarecenter/ui/gtk3/review_gui_helper.py'
--- softwarecenter/ui/gtk3/review_gui_helper.py	2012-03-15 03:16:35 +0000
+++ softwarecenter/ui/gtk3/review_gui_helper.py	2012-03-19 14:40:27 +0000
@@ -48,7 +48,7 @@
 import piston_mini_client
 
 from softwarecenter.paths import SOFTWARE_CENTER_CONFIG_DIR
-from softwarecenter.enums import Icons
+from softwarecenter.enums import Icons, SOFTWARE_CENTER_NAME_KEYRING
 from softwarecenter.config import get_config
 from softwarecenter.distro import get_distro, get_current_arch
 from softwarecenter.backend.login_sso import get_sso_backend
@@ -379,9 +379,6 @@
         SimpleGtkbuilderApp.__init__(
             self, os.path.join(datadir, "ui/gtk3", uifile), "software-center")
         # generic data
-        # see bug #773214 for the rational
-        #self.appname = _("Ubuntu Software Center")
-        self.appname = "Ubuntu Software Center"
         self.token = None
         self.display_name = None
         self._login_successful = False
@@ -453,7 +450,7 @@
         help_text = _("To review software or to report abuse you need to "
                       "sign in to a Ubuntu Single Sign-On account.")
         self.sso = get_sso_backend(login_window_xid,
-                                       self.appname, help_text)
+                                   SOFTWARE_CENTER_NAME_KEYRING, help_text)
         self.sso.connect("login-successful", self._maybe_login_successful)
         self.sso.connect("login-canceled", self._login_canceled)
         if show_register:

=== modified file 'softwarecenter/ui/gtk3/utils.py'
--- softwarecenter/ui/gtk3/utils.py	2012-03-15 09:32:18 +0000
+++ softwarecenter/ui/gtk3/utils.py	2012-03-19 14:40:27 +0000
@@ -28,6 +28,20 @@
 LOG = logging.getLogger(__name__)
 
 
+def get_parent(widget):
+    while widget.get_parent():
+        widget = widget.get_parent()
+    return widget
+
+
+def get_parent_xid(widget):
+    window = get_parent(widget).get_window()
+    #print dir(window)
+    if hasattr(window, 'xid'):
+        return window.xid
+    return 0    # cannot figure out how to get the xid of gdkwindow under pygi
+
+
 def point_in(rect, px, py):
     return (rect.x <= px <= rect.x + rect.width and
             rect.y <= py <= rect.y + rect.height)

=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-03-14 16:34:56 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-03-19 14:40:27 +0000
@@ -20,112 +20,27 @@
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
-from gi.repository import Pango
+
+import ConfigParser
 import logging
 import os
 import json
 import sys
 import urllib
-import urlparse
+
 from gi.repository import WebKit as webkit
 
 from gettext import gettext as _
 
 from softwarecenter.backend import get_install_backend
-from softwarecenter.i18n import get_language
+from softwarecenter.ui.gtk3.dialogs import show_accept_tos_dialog
+from softwarecenter.config import get_config
+from softwarecenter.ui.gtk3.utils import get_parent
+from softwarecenter.ui.gtk3.views.webkit import ScrolledWebkitWindow
 
 LOG = logging.getLogger(__name__)
 
 
-class LocaleAwareWebView(webkit.WebView):
-
-    def __init__(self):
-        # actual webkit init
-        webkit.WebView.__init__(self)
-        self.connect("resource-request-starting",
-                     self._on_resource_request_starting)
-
-    def _on_resource_request_starting(self, view, frame, res, req, resp):
-        lang = get_language()
-        if lang:
-            message = req.get_message()
-            if message:
-                headers = message.get_property("request-headers")
-                headers.append("Accept-Language", lang)
-        #def _show_header(name, value, data):
-        #    print name, value
-        #headers.foreach(_show_header, None)
-
-
-class ScrolledWebkitWindow(Gtk.VBox):
-
-    def __init__(self, include_progress_ui=False):
-        super(ScrolledWebkitWindow, self).__init__()
-        # get webkit
-        self.webkit = LocaleAwareWebView()
-        settings = self.webkit.get_settings()
-        settings.set_property("enable-plugins", False)
-        # add progress UI if needed
-        if include_progress_ui:
-            self._add_progress_ui()
-        # create main webkitview
-        self.scroll = Gtk.ScrolledWindow()
-        self.scroll.set_policy(Gtk.PolicyType.AUTOMATIC,
-                               Gtk.PolicyType.AUTOMATIC)
-        self.pack_start(self.scroll, True, True, 0)
-        # embed the webkit view in a scrolled window
-        self.scroll.add(self.webkit)
-        self.show_all()
-
-    def _add_progress_ui(self):
-        # create toolbar box
-        self.header = Gtk.HBox()
-        # add spinner
-        self.spinner = Gtk.Spinner()
-        self.header.pack_start(self.spinner, False, False, 6)
-        # add a url to the toolbar
-        self.url = Gtk.Label()
-        self.url.set_ellipsize(Pango.EllipsizeMode.END)
-        self.url.set_alignment(0.0, 0.5)
-        self.url.set_text("")
-        self.header.pack_start(self.url, True, True, 0)
-        # frame around the box
-        self.frame = Gtk.Frame()
-        self.frame.set_border_width(3)
-        self.frame.add(self.header)
-        self.pack_start(self.frame, False, False, 6)
-        # connect the webkit stuff
-        self.webkit.connect("notify::uri", self._on_uri_changed)
-        self.webkit.connect("notify::load-status",
-            self._on_load_status_changed)
-
-    def _on_uri_changed(self, view, pspec):
-        prop = pspec.name
-        uri = view.get_property(prop)
-        # the full uri is irellevant for the purchase view, but it is
-        # interessting to know what protocol/netloc is in use so that the
-        # user can verify its https on sites he is expecting
-        scheme, netloc, path, params, query, frag = urlparse.urlparse(uri)
-        if scheme == "file" and netloc == "":
-            self.url.set_text("")
-        else:
-            self.url.set_text("%s://%s" % (scheme, netloc))
-        # start spinner when the uri changes
-        #self.spinner.start()
-
-    def _on_load_status_changed(self, view, pspec):
-        prop = pspec.name
-        status = view.get_property(prop)
-        #print status
-        if status == webkit.LoadStatus.PROVISIONAL:
-            self.spinner.start()
-            self.spinner.show()
-        if (status == webkit.LoadStatus.FINISHED or
-            status == webkit.LoadStatus.FAILED):
-            self.spinner.stop()
-            self.spinner.hide()
-
-
 class PurchaseView(Gtk.VBox):
     """
     View that displays the webkit-based UI for purchasing an item.
@@ -189,6 +104,7 @@
         self.wk = None
         self._wk_handlers_blocked = False
         self._oauth_token = None
+        self.config = get_config()
 
     def init_view(self):
         if self.wk is None:
@@ -209,11 +125,28 @@
         # completed or canceled
         self._unblock_wk_handlers()
 
+    def _ask_for_tos_acceptance_if_needed(self):
+        try:
+            accepted_tos = self.config.getboolean("general", "accepted_tos")
+        except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+            accepted_tos = False
+        if not accepted_tos:
+            # show the dialog and ensure the user accepts it
+            res = show_accept_tos_dialog(get_parent(self))
+            if not res:
+                return False
+            self.config.set("general", "accepted_tos", "yes")
+            return True
+        return True
+
     def initiate_purchase(self, app, iconname, url=None, html=None):
         """
         initiates the purchase workflow inside the embedded webkit window
         for the item specified
         """
+        if not self._ask_for_tos_acceptance_if_needed():
+            return False
+
         self.init_view()
         self.app = app
         self.iconname = iconname
@@ -231,6 +164,7 @@
         # only for debugging
         if os.environ.get("SOFTWARE_CENTER_DEBUG_BUY"):
             GObject.timeout_add_seconds(1, _generate_events, self)
+        return True
 
     def _on_new_window(self, view, frame, request, action, policy):
         LOG.debug("_on_new_window")
@@ -477,8 +411,8 @@
     #GObject.timeout_add_seconds(1, _generate_events, d)
 
     widget = PurchaseView()
-    widget.initiate_purchase(app=None, iconname=None, url=url)
-    #widget.initiate_purchase(app=None, iconname=None, html=DUMMY_HTML)
+    from mock import Mock
+    widget.config = Mock()
 
     win = Gtk.Window()
     win.set_data("view", widget)
@@ -487,8 +421,14 @@
     win.set_position(Gtk.WindowPosition.CENTER)
     win.show_all()
     win.connect('destroy', Gtk.main_quit)
+
+    widget.initiate_purchase(app=None, iconname=None, url=url)
+    #widget.initiate_purchase(app=None, iconname=None, html=DUMMY_HTML)
+
     return win
 
 if __name__ == "__main__":
+    import softwarecenter.paths
+    softwarecenter.paths.datadir = "./data"
     win = get_test_window_purchaseview()
     Gtk.main()

=== added file 'softwarecenter/ui/gtk3/views/webkit.py'
--- softwarecenter/ui/gtk3/views/webkit.py	1970-01-01 00:00:00 +0000
+++ softwarecenter/ui/gtk3/views/webkit.py	2012-03-19 14:40:27 +0000
@@ -0,0 +1,114 @@
+# Copyright (C) 2010 Canonical
+#
+# Authors:
+#  Michael Vogt
+#  Gary Lasker
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gi.repository import WebKit as webkit
+from gi.repository import Gtk
+from gi.repository import Pango
+import urlparse
+
+from softwarecenter.i18n import get_language
+
+
+class LocaleAwareWebView(webkit.WebView):
+
+    def __init__(self):
+        # actual webkit init
+        webkit.WebView.__init__(self)
+        self.connect("resource-request-starting",
+                     self._on_resource_request_starting)
+
+    def _on_resource_request_starting(self, view, frame, res, req, resp):
+        lang = get_language()
+        if lang:
+            message = req.get_message()
+            if message:
+                headers = message.get_property("request-headers")
+                headers.append("Accept-Language", lang)
+        #def _show_header(name, value, data):
+        #    print name, value
+        #headers.foreach(_show_header, None)
+
+
+class ScrolledWebkitWindow(Gtk.VBox):
+
+    def __init__(self, include_progress_ui=False):
+        super(ScrolledWebkitWindow, self).__init__()
+        # get webkit
+        self.webkit = LocaleAwareWebView()
+        settings = self.webkit.get_settings()
+        settings.set_property("enable-plugins", False)
+        # add progress UI if needed
+        if include_progress_ui:
+            self._add_progress_ui()
+        # create main webkitview
+        self.scroll = Gtk.ScrolledWindow()
+        self.scroll.set_policy(Gtk.PolicyType.AUTOMATIC,
+                               Gtk.PolicyType.AUTOMATIC)
+        self.pack_start(self.scroll, True, True, 0)
+        # embed the webkit view in a scrolled window
+        self.scroll.add(self.webkit)
+        self.show_all()
+
+    def _add_progress_ui(self):
+        # create toolbar box
+        self.header = Gtk.HBox()
+        # add spinner
+        self.spinner = Gtk.Spinner()
+        self.header.pack_start(self.spinner, False, False, 6)
+        # add a url to the toolbar
+        self.url = Gtk.Label()
+        self.url.set_ellipsize(Pango.EllipsizeMode.END)
+        self.url.set_alignment(0.0, 0.5)
+        self.url.set_text("")
+        self.header.pack_start(self.url, True, True, 0)
+        # frame around the box
+        self.frame = Gtk.Frame()
+        self.frame.set_border_width(3)
+        self.frame.add(self.header)
+        self.pack_start(self.frame, False, False, 6)
+        # connect the webkit stuff
+        self.webkit.connect("notify::uri", self._on_uri_changed)
+        self.webkit.connect("notify::load-status",
+            self._on_load_status_changed)
+
+    def _on_uri_changed(self, view, pspec):
+        prop = pspec.name
+        uri = view.get_property(prop)
+        # the full uri is irellevant for the purchase view, but it is
+        # interessting to know what protocol/netloc is in use so that the
+        # user can verify its https on sites he is expecting
+        scheme, netloc, path, params, query, frag = urlparse.urlparse(uri)
+        if scheme == "file" and netloc == "":
+            self.url.set_text("")
+        else:
+            self.url.set_text("%s://%s" % (scheme, netloc))
+        # start spinner when the uri changes
+        #self.spinner.start()
+
+    def _on_load_status_changed(self, view, pspec):
+        prop = pspec.name
+        status = view.get_property(prop)
+        #print status
+        if status == webkit.LoadStatus.PROVISIONAL:
+            self.spinner.start()
+            self.spinner.show()
+        if (status == webkit.LoadStatus.FINISHED or
+            status == webkit.LoadStatus.FAILED):
+            self.spinner.stop()
+            self.spinner.hide()

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-03-16 17:22:59 +0000
+++ softwarecenter/utils.py	2012-03-19 14:40:27 +0000
@@ -218,16 +218,6 @@
     return html
 
 
-def get_parent_xid(widget):
-    while widget.get_parent():
-        widget = widget.get_parent()
-    window = widget.get_window()
-    #print dir(window)
-    if hasattr(window, 'xid'):
-        return window.xid
-    return 0    # cannot figure out how to get the xid of gdkwindow under pygi
-
-
 def get_http_proxy_string_from_libproxy(url):
     """Helper that uses libproxy to get the http proxy for the given url """
     import libproxy

=== modified file 'test/gtk3/test_dialogs.py'
--- test/gtk3/test_dialogs.py	2012-01-16 14:42:49 +0000
+++ test/gtk3/test_dialogs.py	2012-03-19 14:40:27 +0000
@@ -33,6 +33,12 @@
         res = softwarecenter.ui.gtk3.dialogs.error(
             parent=None, primary="primary", secondary="secondary")
         self.assertEqual(res, False)
+
+    def test_accept_tos_dialog(self):
+        GObject.timeout_add(TIMEOUT, self._close_dialog)
+        res = softwarecenter.ui.gtk3.dialogs.show_accept_tos_dialog(
+            parent=None)
+        self.assertEqual(res, False)
         
     # helper
     def _close_dialog(self):

=== modified file 'test/gtk3/test_purchase.py'
--- test/gtk3/test_purchase.py	2012-01-16 14:42:49 +0000
+++ test/gtk3/test_purchase.py	2012-03-19 14:40:27 +0000
@@ -3,11 +3,12 @@
 import time
 import unittest
 
-from mock import Mock
+from mock import Mock,patch
 
-from testutils import setup_test_env, do_events
+from testutils import setup_test_env
 setup_test_env()
 
+from softwarecenter.testutils import do_events
 from softwarecenter.ui.gtk3.app import SoftwareCenterAppGtk3
 from softwarecenter.ui.gtk3.panes.availablepane import AvailablePane
 import softwarecenter.paths
@@ -38,6 +39,23 @@
         # run another one
         win.destroy()
 
+    def test_purchase_view_tos(self):
+        from softwarecenter.ui.gtk3.views.purchaseview import get_test_window_purchaseview
+        win = get_test_window_purchaseview()
+        view = win.get_data("view")
+        # install the mock
+        mock_config = Mock()
+        mock_config.has_option.return_value = False
+        mock_config.getboolean.return_value = False
+        view.config = mock_config
+        func = "softwarecenter.ui.gtk3.views.purchaseview.show_accept_tos_dialog"
+        with patch(func) as mock_func:
+            mock_func.return_value = False
+            res = view.initiate_purchase(None, None)
+            self.assertFalse(res)
+            self.assertTrue(mock_func.called)
+        win.destroy()
+
     def test_spinner_emits_signals(self):
         from softwarecenter.ui.gtk3.views.purchaseview import get_test_window_purchaseview
         win = get_test_window_purchaseview()