# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: spec4d@gmail.com-20140317060303-9vby6lqkpmbswq6j # target_branch: bzr+ssh://bazaar.launchpad.net/+branch/software-\ # center/ # testament_sha1: 100db466c75cab21e7e6e4fbe69ccd3aa757c2d5 # timestamp: 2014-03-16 23:04:58 -0700 # base_revision_id: tarmac-20140113152629-o6832oucgrwf3dl8 # # Begin patch === modified file 'data/ui/gtk3/SoftwareCenter.ui' --- data/ui/gtk3/SoftwareCenter.ui 2013-04-17 14:08:45 +0000 +++ data/ui/gtk3/SoftwareCenter.ui 2014-03-17 06:03:03 +0000 @@ -451,6 +451,28 @@ + + Help With _Payments + True + False + False + False + True + + + + + + _Terms of Use + True + False + False + False + True + + + + True False @@ -474,16 +496,6 @@ - - Terms of Use - True - False - False - False - - - - gtk-about True === modified file 'softwarecenter/enums.py' --- softwarecenter/enums.py 2012-12-17 09:01:00 +0000 +++ softwarecenter/enums.py 2014-03-17 06:03:03 +0000 @@ -52,6 +52,9 @@ UBUNTU_SSO_SERVICE = os.environ.get( "USSOC_SERVICE_URL", "https://login.ubuntu.com/api/1.0") +# the Help With Payments Link +SOFTWARE_CENTER_PAY_HELP_LINK = "https://help.ubuntu.com/community/Pay/" + # the terms-of-service links (the first is for display in a web browser # as it has the header and footer, the second is for display in a dialog # as it lacks them and so looks better) === modified file 'softwarecenter/ui/gtk3/app.py' --- softwarecenter/ui/gtk3/app.py 2013-07-24 15:01:22 +0000 +++ softwarecenter/ui/gtk3/app.py 2014-03-17 06:03:03 +0000 @@ -72,6 +72,7 @@ SearchSeparators, SOFTWARE_CENTER_DEBUG_TABS, SOFTWARE_CENTER_NAME_KEYRING, + SOFTWARE_CENTER_PAY_HELP_LINK, SOFTWARE_CENTER_TOS_LINK, ViewPages, ) @@ -1151,6 +1152,9 @@ (pid, stdin, stdout, stderr) = GLib.spawn_async( ["yelp", "help:software-center"], flags=GObject.SPAWN_SEARCH_PATH) + def on_menuitem_pay_help_activate(self, menuitem): + webbrowser.open_new_tab(SOFTWARE_CENTER_PAY_HELP_LINK) + def on_menuitem_tos_activate(self, menuitem): webbrowser.open_new_tab(SOFTWARE_CENTER_TOS_LINK) # Begin bundle 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