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