/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: Jelmer Vernooij
  • Date: 2007-04-03 17:16:07 UTC
  • mfrom: (187 trunk)
  • mto: This revision was merged to the branch mainline in revision 188.
  • Revision ID: jelmer@samba.org-20070403171607-0zaskazouokrm4cq
Tags: bzr-gtk-0.15.2
Prepare for 0.15.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
status.py
21
21
    pass
22
22
 
23
23
import gtk
24
 
from bzrlib.plugins.gtk import window
25
 
from bzrlib.plugins.gtk.i18n import _i18n
26
 
 
27
 
 
28
 
class StatusWindow(window.Window):
 
24
 
 
25
class StatusDialog(gtk.Dialog):
29
26
    """ Display Status window and perform the needed actions. """
30
 
 
31
 
    def __init__(self, wt, wtpath, revision=None):
 
27
    def __init__(self, wt, wtpath):
32
28
        """ Initialize the Status window. """
33
 
        super(StatusWindow, self).__init__()
 
29
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
34
30
        self.set_title("Working tree changes")
35
31
        self._create()
36
32
        self.wt = wt
37
33
        self.wtpath = wtpath
38
 
 
39
 
        if revision is None:
40
 
            revision = self.wt.branch.last_revision()
41
 
 
42
34
        # Set the old working tree
43
 
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
 
35
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
44
36
        # Generate status output
45
37
        self._generate_status()
46
38
 
47
39
    def _create(self):
48
40
        self.set_default_size(400, 300)
49
 
        sw = gtk.ScrolledWindow()
50
 
        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
51
 
        sw.set_shadow_type(gtk.SHADOW_IN)
 
41
        scrolledwindow = gtk.ScrolledWindow()
 
42
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
52
43
        self.treeview = gtk.TreeView()
53
 
        sw.add(self.treeview)
54
 
        self.add(sw)
55
 
 
56
 
        # sane border and spacing widths (as recommended by GNOME HIG) 
57
 
        self.set_border_width(5)
58
 
        sw.set_border_width(5)
59
 
        self.show_all()
60
 
 
 
44
        scrolledwindow.add(self.treeview)
 
45
        self.vbox.pack_start(scrolledwindow, True, True)
 
46
        self.vbox.show_all()
61
47
 
62
48
    def row_diff(self, tv, path, tvc):
63
49
        file = self.model[path][1]
65
51
            return
66
52
        from bzrlib.plugins.gtk.diff import DiffWindow
67
53
        window = DiffWindow()
68
 
        window.set_diff("Working tree changes", self.wt, self.old_tree)
 
54
        window.set_diff("Working tree changes", self.old_tree, self.wt)
69
55
        window.set_file(file)
70
56
        window.show()
71
57
 
72
 
 
73
58
    def _generate_status(self):
74
59
        """ Generate 'bzr status' output. """
75
60
        self.model = gtk.TreeStore(str, str)
76
61
        self.treeview.set_headers_visible(False)
77
62
        self.treeview.set_model(self.model)
78
63
        self.treeview.connect("row-activated", self.row_diff)
79
 
 
 
64
        
80
65
        cell = gtk.CellRendererText()
81
66
        cell.set_property("width-chars", 20)
82
67
        column = gtk.TreeViewColumn()
83
68
        column.pack_start(cell, expand=True)
84
69
        column.add_attribute(cell, "text", 0)
85
70
        self.treeview.append_column(column)
86
 
 
 
71
        
87
72
        delta = self.wt.changes_from(self.old_tree)
88
73
 
89
74
        changes = False
90
 
 
 
75
        
91
76
        if len(delta.added):
92
77
            changes = True
93
 
            titer = self.model.append(None, [ _i18n('Added'), None ])
 
78
            titer = self.model.append(None, [ _('Added'), None ])
94
79
            for path, id, kind in delta.added:
95
80
                self.model.append(titer, [ path, path ])
96
81
 
97
82
        if len(delta.removed):
98
83
            changes = True
99
 
            titer = self.model.append(None, [ _i18n('Removed'), None ])
 
84
            titer = self.model.append(None, [ _('Removed'), None ])
100
85
            for path, id, kind in delta.removed:
101
86
                self.model.append(titer, [ path, path ])
102
87
 
103
88
        if len(delta.renamed):
104
89
            changes = True
105
 
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
 
90
            titer = self.model.append(None, [ _('Renamed'), None ])
106
91
            for oldpath, newpath, id, kind, text_modified, meta_modified \
107
92
                    in delta.renamed:
108
93
                self.model.append(titer, [ oldpath, newpath ])
109
94
 
110
95
        if len(delta.modified):
111
96
            changes = True
112
 
            titer = self.model.append(None, [ _i18n('Modified'), None ])
 
97
            titer = self.model.append(None, [ _('Modified'), None ])
113
98
            for path, id, kind, text_modified, meta_modified in delta.modified:
114
99
                self.model.append(titer, [ path, path ])
115
 
 
 
100
        
116
101
        done_unknown = False
117
102
        for path in self.wt.unknowns():
118
103
            changes = True
119
104
            if not done_unknown:
120
 
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
 
105
                titer = self.model.append(None, [ _('Unknown'), None ])
121
106
                done_unknown = True
122
107
            self.model.append(titer, [ path, path ])
123
108
 
124
109
        if not changes:
125
 
            self.model.append(None, [ _i18n('No changes.'), None ])
 
110
            self.model.append(None, [ _('No changes.'), None ])
126
111
 
127
112
        self.treeview.expand_all()
 
113
    
 
114
    def display(self):
 
115
        """ Display the Diff window. """
 
116
        self.window.show_all()
128
117
 
129
118
    def close(self, widget=None):
130
119
        self.window.destroy()