/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-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchbox.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from gi.repository import Gtk
18
 
from gi.repository import GObject
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
19
22
 
20
23
from bzrlib.branch import Branch
21
24
from bzrlib.config import GlobalConfig
22
 
 
23
 
from bzrlib.plugins.gtk.history import UrlHistory
24
 
 
25
 
 
26
 
class BranchSelectionBox(Gtk.HBox):
27
 
 
 
25
import gtk
 
26
from history import UrlHistory
 
27
from olive import Preferences
 
28
import gobject
 
29
 
 
30
class BranchSelectionBox(gtk.HBox):
28
31
    def __init__(self, path=None):
29
32
        super(BranchSelectionBox, self).__init__()
30
 
        self._combo = Gtk.ComboBox.new_with_entry()
31
 
        self._combo.get_child().connect(
32
 
            'focus-out-event', self._on_combo_changed)
33
 
 
 
33
        self._combo = gtk.ComboBoxEntry()
 
34
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
 
35
        
34
36
        # Build branch history
35
37
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
36
38
        self._build_history()
37
39
 
38
40
        self.add(self._combo)
39
41
 
 
42
        gobject.signal_new('branch-changed', BranchSelectionBox, 
 
43
                           gobject.SIGNAL_RUN_LAST,
 
44
                           gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
 
45
 
40
46
        if path is not None:
41
47
            self.set_url(path)
42
48
 
51
57
 
52
58
    def _build_history(self):
53
59
        """ Build up the branch history. """
54
 
        self._combo_model = Gtk.ListStore(str)
55
 
 
 
60
        self._combo_model = gtk.ListStore(str)
 
61
        
56
62
        for item in self._history.get_entries():
57
63
            self._combo_model.append([ item ])
58
 
 
 
64
        
 
65
        pref = Preferences()
 
66
        for item in pref.get_bookmarks():
 
67
            self._combo_model.append([ item ])
 
68
        
59
69
        self._combo.set_model(self._combo_model)
60
 
        self._combo.set_entry_text_column(0)
 
70
        self._combo.set_text_column(0)
61
71
 
62
72
    def _on_combo_changed(self, widget, event):
63
73
        self.emit('branch-changed', widget)
64
 
 
65
 
 
66
 
GObject.signal_new('branch-changed', BranchSelectionBox,
67
 
                   GObject.SignalFlags.RUN_LAST,
68
 
                   None, (GObject.TYPE_OBJECT,))
69
 
GObject.type_register(BranchSelectionBox)
 
74