~ubuntu-branches/ubuntu/raring/software-center/raring-proposed

« back to all changes in this revision

Viewing changes to softwarecenter/ui/gtk3/utils.py

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2012-10-11 15:33:05 UTC
  • mfrom: (195.1.18 quantal)
  • Revision ID: package-import@ubuntu.com-20121011153305-fm5ln7if3rpzts4n
Tags: 5.4.1.1
* lp:~mvo/software-center/reinstall-previous-purchase-token-fix:
  - fix reinstall previous purchases that have a system-wide
    license key LP: #1065481
* lp:~mvo/software-center/lp1060106:
  - Add missing gettext init for utils/update-software-center-agent
    (LP: #1060106)

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
 
24
24
from gi.repository import Gtk
25
25
 
 
26
import softwarecenter.paths
26
27
from softwarecenter.paths import ICON_PATH, SOFTWARE_CENTER_ICON_CACHE_DIR
27
28
 
28
29
LOG = logging.getLogger(__name__)
47
48
            rect.y <= py <= rect.y + rect.height)
48
49
 
49
50
 
50
 
def init_sc_css_provider(toplevel, settings, screen, datadir):
 
51
def init_sc_css_provider(toplevel, settings, screen):
 
52
    datadir = softwarecenter.paths.datadir
51
53
    context = toplevel.get_style_context()
52
54
    theme_name = settings.get_property("gtk-theme-name").lower()
53
55
 
60
62
            context.remove_provider_for_screen(screen, toplevel._css_provider)
61
63
 
62
64
    # munge css path for theme-name
63
 
    css_path = os.path.join(datadir,
64
 
                            "ui/gtk3/css/softwarecenter.%s.css" % \
65
 
                            theme_name)
 
65
    css_path = os.path.join(
 
66
        datadir, "ui/gtk3/css/softwarecenter.%s.css" % theme_name)
66
67
 
67
68
    # if no css for theme-name try fallback css
68
69
    if not os.path.exists(css_path):
90
91
    return css_path
91
92
 
92
93
 
93
 
def get_sc_icon_theme(datadir):
 
94
def get_sc_icon_theme():
94
95
    # additional icons come from app-install-data
 
96
    datadir = softwarecenter.paths.datadir
95
97
    icons = Gtk.IconTheme.get_default()
96
98
    icons.append_search_path(ICON_PATH)
97
99
    icons.append_search_path(os.path.join(datadir, "icons"))