/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 status.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:
status.py
21
21
    pass
22
22
 
23
23
import gtk
24
 
import gtk.glade
25
 
 
26
 
from olive import gladefile
27
 
 
28
 
class OliveStatus:
 
24
from bzrlib.plugins.gtk import _i18n
 
25
 
 
26
 
 
27
class StatusDialog(gtk.Dialog):
29
28
    """ Display Status window and perform the needed actions. """
30
 
    def __init__(self, wt, wtpath):
 
29
    def __init__(self, wt, wtpath, revision=None):
31
30
        """ Initialize the Status window. """
32
 
        self.glade = gtk.glade.XML(gladefile, 'window_status')
33
 
        
34
 
        # Get the Status window widget
35
 
        self.window = self.glade.get_widget('window_status')
36
 
        
 
31
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
32
        self.set_title("Working tree changes")
 
33
        self._create()
37
34
        self.wt = wt
38
35
        self.wtpath = wtpath
39
36
        
40
 
        # Check if current location is a branch
41
 
        file_id = self.wt.path2id(wtpath)
42
 
 
 
37
        if revision is None:
 
38
            revision = self.wt.branch.last_revision()
 
39
            
43
40
        # Set the old working tree
44
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
45
 
        
46
 
        # Dictionary for signal_autoconnect
47
 
        dic = { "on_button_status_close_clicked": self.close }
48
 
        
49
 
        # Connect the signals to the handlers
50
 
        self.glade.signal_autoconnect(dic)
51
 
        
 
41
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
52
42
        # Generate status output
53
43
        self._generate_status()
54
44
 
 
45
    def _create(self):
 
46
        self.set_default_size(400, 300)
 
47
        scrolledwindow = gtk.ScrolledWindow()
 
48
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
49
        self.treeview = gtk.TreeView()
 
50
        scrolledwindow.add(self.treeview)
 
51
        self.vbox.pack_start(scrolledwindow, True, True)
 
52
        self.vbox.show_all()
 
53
 
 
54
    def row_diff(self, tv, path, tvc):
 
55
        file = self.model[path][1]
 
56
        if file is None:
 
57
            return
 
58
        from bzrlib.plugins.gtk.diff import DiffWindow
 
59
        window = DiffWindow()
 
60
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
61
        window.set_file(file)
 
62
        window.show()
 
63
 
55
64
    def _generate_status(self):
56
65
        """ Generate 'bzr status' output. """
57
66
        self.model = gtk.TreeStore(str, str)
58
 
        self.treeview = self.glade.get_widget('treeview_status')
 
67
        self.treeview.set_headers_visible(False)
59
68
        self.treeview.set_model(self.model)
 
69
        self.treeview.connect("row-activated", self.row_diff)
60
70
        
61
71
        cell = gtk.CellRendererText()
62
72
        cell.set_property("width-chars", 20)
71
81
        
72
82
        if len(delta.added):
73
83
            changes = True
74
 
            titer = self.model.append(None, [ _('Added'), None ])
 
84
            titer = self.model.append(None, [ _i18n('Added'), None ])
75
85
            for path, id, kind in delta.added:
76
86
                self.model.append(titer, [ path, path ])
77
87
 
78
88
        if len(delta.removed):
79
89
            changes = True
80
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
90
            titer = self.model.append(None, [ _i18n('Removed'), None ])
81
91
            for path, id, kind in delta.removed:
82
92
                self.model.append(titer, [ path, path ])
83
93
 
84
94
        if len(delta.renamed):
85
95
            changes = True
86
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
96
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
87
97
            for oldpath, newpath, id, kind, text_modified, meta_modified \
88
98
                    in delta.renamed:
89
99
                self.model.append(titer, [ oldpath, newpath ])
90
100
 
91
101
        if len(delta.modified):
92
102
            changes = True
93
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
103
            titer = self.model.append(None, [ _i18n('Modified'), None ])
94
104
            for path, id, kind, text_modified, meta_modified in delta.modified:
95
105
                self.model.append(titer, [ path, path ])
96
106
        
98
108
        for path in self.wt.unknowns():
99
109
            changes = True
100
110
            if not done_unknown:
101
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
111
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
102
112
                done_unknown = True
103
113
            self.model.append(titer, [ path, path ])
104
114
 
105
115
        if not changes:
106
 
            self.model.append(None, [ _('No changes.'), None ])
 
116
            self.model.append(None, [ _i18n('No changes.'), None ])
107
117
 
108
118
        self.treeview.expand_all()
109
119
    
110
 
    def display(self):
111
 
        """ Display the Diff window. """
112
 
        self.window.show_all()
113
 
 
114
120
    def close(self, widget=None):
115
121
        self.window.destroy()