/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to branchbox.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchbox.py
24
24
from bzrlib.config import GlobalConfig
25
25
import gtk
26
26
from history import UrlHistory
 
27
from olive import Preferences
27
28
import gobject
28
29
 
29
30
class BranchSelectionBox(gtk.HBox):
30
31
    def __init__(self, path=None):
31
 
        gobject.GObject.__init__(self)
 
32
        super(BranchSelectionBox, self).__init__()
32
33
        self._combo = gtk.ComboBoxEntry()
33
34
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
34
35
        
38
39
 
39
40
        self.add(self._combo)
40
41
 
 
42
        gobject.signal_new('branch-changed', BranchSelectionBox, 
 
43
                           gobject.SIGNAL_RUN_LAST,
 
44
                           gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
 
45
 
41
46
        if path is not None:
42
47
            self.set_url(path)
43
48
 
57
62
        for item in self._history.get_entries():
58
63
            self._combo_model.append([ item ])
59
64
        
 
65
        pref = Preferences()
 
66
        for item in pref.get_bookmarks():
 
67
            self._combo_model.append([ item ])
 
68
        
60
69
        self._combo.set_model(self._combo_model)
61
70
        self._combo.set_text_column(0)
62
71
 
63
72
    def _on_combo_changed(self, widget, event):
64
73
        self.emit('branch-changed', widget)
65
 
 
66
 
gobject.signal_new('branch-changed', BranchSelectionBox, 
67
 
                   gobject.SIGNAL_RUN_LAST,
68
 
                   gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
69
 
gobject.type_register(BranchSelectionBox)
 
74