Merge lp:~kelemeng/software-center/bug640969 into lp:ubuntu/maverick/software-center

Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~kelemeng/software-center/bug640969
Merge into: lp:ubuntu/maverick/software-center
Diff against target: 37 lines (+4/-3)
2 files modified
softwarecenter/view/dependency_dialogs.py (+1/-1)
softwarecenter/view/dialogs.py (+3/-2)
To merge this branch: bzr merge lp:~kelemeng/software-center/bug640969
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+35819@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/view/dependency_dialogs.py'
--- softwarecenter/view/dependency_dialogs.py 2010-09-09 17:07:29 +0000
+++ softwarecenter/view/dependency_dialogs.py 2010-09-17 12:28:59 +0000
@@ -69,7 +69,7 @@
69 return _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache)69 return _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache)
7070
71def _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache):71def _confirm_remove_internal(parent, datadir, app, db, icons, primary, button_text, depends, cache):
72 glade_dialog = SimpleGtkbuilderDialog(datadir)72 glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
73 dialog = glade_dialog.dialog_dependency_alert73 dialog = glade_dialog.dialog_dependency_alert
74 dialog.set_resizable(True)74 dialog.set_resizable(True)
75 dialog.set_transient_for(parent)75 dialog.set_transient_for(parent)
7676
=== modified file 'softwarecenter/view/dialogs.py'
--- softwarecenter/view/dialogs.py 2010-09-09 09:11:23 +0000
+++ softwarecenter/view/dialogs.py 2010-09-17 12:28:59 +0000
@@ -21,9 +21,10 @@
21from gettext import gettext as _21from gettext import gettext as _
2222
23class SimpleGtkbuilderDialog(object):23class SimpleGtkbuilderDialog(object):
24 def __init__(self, datadir):24 def __init__(self, datadir, domain):
25 # setup ui25 # setup ui
26 self.builder = gtk.Builder()26 self.builder = gtk.Builder()
27 self.builder.set_translation_domain(domain)
27 self.builder.add_from_file(datadir+"/ui/dialogs.ui")28 self.builder.add_from_file(datadir+"/ui/dialogs.ui")
28 self.builder.connect_signals(self)29 self.builder.connect_signals(self)
29 for o in self.builder.get_objects():30 for o in self.builder.get_objects():
@@ -35,7 +36,7 @@
3536
3637
37def confirm_repair_broken_cache(parent, datadir):38def confirm_repair_broken_cache(parent, datadir):
38 glade_dialog = SimpleGtkbuilderDialog(datadir)39 glade_dialog = SimpleGtkbuilderDialog(datadir, domain="software-center")
39 dialog = glade_dialog.dialog_broken_cache40 dialog = glade_dialog.dialog_broken_cache
40 dialog.set_default_size(380, -1)41 dialog.set_default_size(380, -1)
41 dialog.set_transient_for(parent)42 dialog.set_transient_for(parent)

Subscribers

People subscribed via source and target branches

to all changes: