1
=== modified file 'lib/commands.py'
2
--- lib/commands.py	2010-03-07 04:51:24 +0000
3
+++ lib/commands.py	2010-08-09 14:56:47 +0000
4
@@ -133,6 +133,14 @@
5
133
133
6
134
    def run(self, location=None, hat=None, dry_run=False,
134
    def run(self, location=None, hat=None, dry_run=False,
7
135
            desktop=None, zzz=False, experimental=False, screenshots=False):
135
            desktop=None, zzz=False, experimental=False, screenshots=False):
8
136
        
9
137
        required_qbzr_version = (0, 19)
10
138
        from bzrlib.plugins import qbzr
11
139
        if qbzr.version_info < required_qbzr_version:
12
140
            from bzrlib.errors import IncompatibleAPI
13
141
            raise IncompatibleAPI(qbzr, required_qbzr_version,
14
142
                                  qbzr.version_info, qbzr.version_info)
15
143
        
16
136
        from bzrlib.plugins.qbzr.lib import uifactory
144
        from bzrlib.plugins.qbzr.lib import uifactory
17
137
        _init_explorer_command(zzz, experimental)
145
        _init_explorer_command(zzz, experimental)
18
138
146
19
139
147
20
=== modified file 'lib/wt_browser.py'
21
--- lib/wt_browser.py	2010-02-15 12:41:51 +0000
22
+++ lib/wt_browser.py	2010-08-09 14:56:47 +0000
23
@@ -591,85 +591,25 @@
24
591
    def __init__(self, *args):
591
    def __init__(self, *args):
25
592
        treewidget.TreeFilterProxyModel.__init__(self, *args)
592
        treewidget.TreeFilterProxyModel.__init__(self, *args)
26
593
        self.text_to_match = None
593
        self.text_to_match = None
27
594
        self._interesting = None
28
595
        self._all_data_loaded = False
29
596
        self._text_match_count = 0
30
597
594
31
598
    def setTextToMatch(self, text):
595
    def setTextToMatch(self, text):
32
599
        self.text_to_match = text
596
        self.text_to_match = text
33
600
        self._update_interesting()
34
601
        self.invalidateFilter()
597
        self.invalidateFilter()
35
602
598
103
603
    def _update_interesting(self):
599
    def filter_id(self, id, item_data):
104
604
        if not self.text_to_match:
600
        """Determines wether a item should be displayed.
105
605
            self._interesting = None
601
        Returns :
106
606
            return
602
            * True: Show the item
107
607
        text = self.text_to_match
603
            * False: Donot show the item
108
608
        interesting = set([''])
604
            * None: Show the item if there are any children that are visible.
42
609
        directories = set()
43
610
        for path in self._iter_paths():
44
611
            if path.find(text) >= 0:
45
612
                interesting.add(path)
46
613
                directories.update(parent_directories(path))
47
614
        self._text_match_count = len(interesting)
48
615
        interesting.update(directories)
49
616
        #print "\ninteresting for %s ...\n%s\n" % (text,
50
617
        #    "\n".join(sorted(interesting)))
51
618
        self._interesting = interesting
52
619
53
620
    def _iter_paths(self):
54
621
        # The source model loads data lazily. We need everything loaded
55
622
        # to find the complete set of paths though
56
623
        self._ensure_all_data_loaded()
57
624
        return iter(self.source_model.inventory_data_by_path.keys())
58
625
59
626
    def _ensure_all_data_loaded(self):
60
627
        if self._all_data_loaded:
61
628
            return
62
629
        model = self.source_model
63
630
        for id in range(0, len(model.inventory_data)):
64
631
            self._load_dirs(model, id)
65
632
        self._all_data_loaded = True
66
633
67
634
    def _load_dirs(self, model, id):
68
635
        item_data = model.inventory_data[id]
69
636
        if item_data.item.kind == "directory":
70
637
            if item_data.children_ids is None:
71
638
                # This locks and unlocks the tree each time.
72
639
                # I wonder how that impacts performance?
73
640
                model.load_dir(id)
74
641
            for child_id in item_data.children_ids:
75
642
                self._load_dirs(model, child_id)
76
643
77
644
    def filterAcceptsRow(self, source_row, source_parent):
78
645
        result = treewidget.TreeFilterProxyModel.filterAcceptsRow(
79
646
            self, source_row, source_parent)
80
647
        if result and self._interesting:
81
648
            # Apply the text filter (matches found earlier)
82
649
            path, kind = self._get_path_info(source_row, source_parent)
83
650
            result = path in self._interesting
84
651
        return result
85
652
86
653
    def _get_path_info(self, source_row, source_parent):
87
654
        """Return path, kind for a model item."""
88
655
        model = self.source_model
89
656
        parent_id = source_parent.internalId()
90
657
        children_ids = model.inventory_data[parent_id].children_ids
91
658
        # Why is this check required?
92
659
        if len(children_ids) <= source_row:
93
660
            return None, None
94
661
        id = children_ids[source_row]
95
662
        data = model.inventory_data[id]
96
663
        return data.path, data.item.kind
97
664
98
665
    def text_match_count(self):
99
666
        """Number of items matching text or 0 if unknown.
100
667
        
101
668
        Note: The number is across the WHOLE tree, not just those displayed
102
669
        after applying the combined filtering.
109
670
        """
605
        """
112
671
        return self._text_match_count
606
        show = treewidget.TreeFilterProxyModel.filter_id(self, id, item_data)
113
672
607
        if self.text_to_match and show:
114
608
            if item_data.path.find(self.text_to_match) >=1:
115
609
                return True
116
610
            else:
117
611
                return None
118
612
        return show
119
673
613
120
674
class _QBrowseTreeWidget(treewidget.TreeWidget):
614
class _QBrowseTreeWidget(treewidget.TreeWidget):
121
675
    """Subclass the standard QBzr TreeWidget to patch in more features.
615
    """Subclass the standard QBzr TreeWidget to patch in more features.
122
@@ -781,9 +721,21 @@
123
781
            # Automatically expand the tree if the match count is small.
721
            # Automatically expand the tree if the match count is small.
124
782
            # The number could be configurable one day provided the doc
722
            # The number could be configurable one day provided the doc
125
783
            # was very clear about potential vs actual match counts
723
            # was very clear about potential vs actual match counts
129
784
            matches = self._tree_viewer.tree_filter_model.text_match_count()
724
            parents = [QtCore.QModelIndex()] # start at the root
130
785
            if matches <= 10:
725
            next_parents = []
131
786
                self._tree_viewer.expandAll()
726
            expanded = 0
132
727
            while parents and expanded <= 15:
133
728
                for parent in parents:
134
729
                    matches = self._tree_viewer.tree_filter_model.rowCount(parent)
135
730
                    if matches and matches <= 5:
136
731
                        self._tree_viewer.expand(parent)
137
732
                    if (self._tree_viewer.isExpanded(parent) or
138
733
                        parent == QtCore.QModelIndex()):
139
734
                        expanded += matches
140
735
                        for i in range(matches):
141
736
                            next_parents.append(
142
737
                                self._tree_viewer.tree_filter_model.index(i, 0, parent))
143
738
                parents = next_parents
144
787
        # Reset our memory wrt what's expanded. This is perhaps a little
739
        # Reset our memory wrt what's expanded. This is perhaps a little
145
788
        # heavy handed wrt text matching as that isn't remembered across
740
        # heavy handed wrt text matching as that isn't remembered across
146
789
        # tree switches. (Then again, perhaps it should be.)
741
        # tree switches. (Then again, perhaps it should be.)
Status:	Merged
Merged at revision:	481
Proposed branch:	lp:~garyvdm/bzr-explorer/better_tree_filter
Merge into:	lp:bzr-explorer
Diff against target:	146 lines (+36/-76) 2 files modified lib/commands.py (+8/-0) lib/wt_browser.py (+28/-76)
To merge this branch:	bzr merge lp:~garyvdm/bzr-explorer/better_tree_filter
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Bazaar Explorer Developers		2010-03-03	Pending
Review via email: mp+20519@code.launchpad.net