/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
 
 
25
 
class StatusDialog(gtk.MessageDialog):
 
24
from bzrlib.plugins.gtk import _i18n
 
25
 
 
26
 
 
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.BUTTONS_OK)
 
31
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
30
32
        self.set_title("Working tree changes")
31
 
        self.set_image(gtk.Label("Working tree status"))
 
33
        self.set_default_response(gtk.RESPONSE_CLOSE)
32
34
        self._create()
33
35
        self.wt = wt
34
36
        self.wtpath = wtpath
 
37
 
 
38
        if revision is None:
 
39
            revision = self.wt.branch.last_revision()
 
40
            
35
41
        # Set the old working tree
36
 
        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)
37
43
        # Generate status output
38
44
        self._generate_status()
39
45
 
40
46
    def _create(self):
41
47
        self.set_default_size(400, 300)
42
 
        scrolledwindow = gtk.ScrolledWindow()
43
 
        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)
44
52
        self.treeview = gtk.TreeView()
45
 
        scrolledwindow.add(self.treeview)
46
 
        self.vbox.pack_start(scrolledwindow, True, True)
 
53
        sw.add(self.treeview)
 
54
        self.vbox.pack_start(sw, True, True)
47
55
        self.vbox.show_all()
48
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
 
49
64
    def row_diff(self, tv, path, tvc):
50
65
        file = self.model[path][1]
51
66
        if file is None:
56
71
        window.set_file(file)
57
72
        window.show()
58
73
 
 
74
 
59
75
    def _generate_status(self):
60
76
        """ Generate 'bzr status' output. """
61
77
        self.model = gtk.TreeStore(str, str)
76
92
        
77
93
        if len(delta.added):
78
94
            changes = True
79
 
            titer = self.model.append(None, [ _('Added'), None ])
 
95
            titer = self.model.append(None, [ _i18n('Added'), None ])
80
96
            for path, id, kind in delta.added:
81
97
                self.model.append(titer, [ path, path ])
82
98
 
83
99
        if len(delta.removed):
84
100
            changes = True
85
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
101
            titer = self.model.append(None, [ _i18n('Removed'), None ])
86
102
            for path, id, kind in delta.removed:
87
103
                self.model.append(titer, [ path, path ])
88
104
 
89
105
        if len(delta.renamed):
90
106
            changes = True
91
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
107
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
92
108
            for oldpath, newpath, id, kind, text_modified, meta_modified \
93
109
                    in delta.renamed:
94
110
                self.model.append(titer, [ oldpath, newpath ])
95
111
 
96
112
        if len(delta.modified):
97
113
            changes = True
98
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
114
            titer = self.model.append(None, [ _i18n('Modified'), None ])
99
115
            for path, id, kind, text_modified, meta_modified in delta.modified:
100
116
                self.model.append(titer, [ path, path ])
101
117
        
103
119
        for path in self.wt.unknowns():
104
120
            changes = True
105
121
            if not done_unknown:
106
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
122
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
107
123
                done_unknown = True
108
124
            self.model.append(titer, [ path, path ])
109
125
 
110
126
        if not changes:
111
 
            self.model.append(None, [ _('No changes.'), None ])
 
127
            self.model.append(None, [ _i18n('No changes.'), None ])
112
128
 
113
129
        self.treeview.expand_all()
114
130
    
115
 
    def display(self):
116
 
        """ Display the Diff window. """
117
 
        self.window.show_all()
118
 
 
119
131
    def close(self, widget=None):
120
132
        self.window.destroy()