/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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 _i18n
 
25
 
24
26
 
25
27
class StatusDialog(gtk.Dialog):
26
28
    """ Display Status window and perform the needed actions. """
27
 
    def __init__(self, wt, wtpath):
 
29
    def __init__(self, wt, wtpath, revision=None):
28
30
        """ Initialize the Status window. """
29
 
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
31
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
30
32
        self.set_title("Working tree changes")
 
33
        self.set_default_response(gtk.RESPONSE_CLOSE)
31
34
        self._create()
32
35
        self.wt = wt
33
36
        self.wtpath = wtpath
 
37
 
 
38
        if revision is None:
 
39
            revision = self.wt.branch.last_revision()
 
40
            
34
41
        # Set the old working tree
35
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
 
42
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
36
43
        # Generate status output
37
44
        self._generate_status()
38
45
 
39
46
    def _create(self):
40
47
        self.set_default_size(400, 300)
41
 
        scrolledwindow = gtk.ScrolledWindow()
42
 
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
48
        self.set_has_separator(False)
 
49
        sw = gtk.ScrolledWindow()
 
50
        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
51
        sw.set_shadow_type(gtk.SHADOW_IN)
43
52
        self.treeview = gtk.TreeView()
44
 
        scrolledwindow.add(self.treeview)
45
 
        self.vbox.pack_start(scrolledwindow, True, True)
 
53
        sw.add(self.treeview)
 
54
        self.vbox.pack_start(sw, True, True)
46
55
        self.vbox.show_all()
47
56
 
 
57
        # sane border and spacing widths (as recommended by GNOME HIG) 
 
58
        self.set_border_width(5)
 
59
        sw.set_border_width(5)
 
60
        self.vbox.set_spacing(2)
 
61
        self.action_area.set_border_width(5)
 
62
 
 
63
 
48
64
    def row_diff(self, tv, path, tvc):
49
65
        file = self.model[path][1]
50
66
        if file is None:
55
71
        window.set_file(file)
56
72
        window.show()
57
73
 
 
74
 
58
75
    def _generate_status(self):
59
76
        """ Generate 'bzr status' output. """
60
77
        self.model = gtk.TreeStore(str, str)
75
92
        
76
93
        if len(delta.added):
77
94
            changes = True
78
 
            titer = self.model.append(None, [ _('Added'), None ])
 
95
            titer = self.model.append(None, [ _i18n('Added'), None ])
79
96
            for path, id, kind in delta.added:
80
97
                self.model.append(titer, [ path, path ])
81
98
 
82
99
        if len(delta.removed):
83
100
            changes = True
84
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
101
            titer = self.model.append(None, [ _i18n('Removed'), None ])
85
102
            for path, id, kind in delta.removed:
86
103
                self.model.append(titer, [ path, path ])
87
104
 
88
105
        if len(delta.renamed):
89
106
            changes = True
90
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
107
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
91
108
            for oldpath, newpath, id, kind, text_modified, meta_modified \
92
109
                    in delta.renamed:
93
110
                self.model.append(titer, [ oldpath, newpath ])
94
111
 
95
112
        if len(delta.modified):
96
113
            changes = True
97
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
114
            titer = self.model.append(None, [ _i18n('Modified'), None ])
98
115
            for path, id, kind, text_modified, meta_modified in delta.modified:
99
116
                self.model.append(titer, [ path, path ])
100
117
        
102
119
        for path in self.wt.unknowns():
103
120
            changes = True
104
121
            if not done_unknown:
105
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
122
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
106
123
                done_unknown = True
107
124
            self.model.append(titer, [ path, path ])
108
125
 
109
126
        if not changes:
110
 
            self.model.append(None, [ _('No changes.'), None ])
 
127
            self.model.append(None, [ _i18n('No changes.'), None ])
111
128
 
112
129
        self.treeview.expand_all()
113
130