/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

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
 
 
25
class StatusDialog(gtk.Dialog):
29
26
    """ Display Status window and perform the needed actions. """
30
 
    def __init__(self, wt, wtpath):
 
27
    def __init__(self, wt, wtpath, revision=None):
31
28
        """ 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
 
        
 
29
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
30
        self.set_title("Working tree changes")
 
31
        self._create()
37
32
        self.wt = wt
38
33
        self.wtpath = wtpath
39
34
        
40
 
        # Check if current location is a branch
41
 
        file_id = self.wt.path2id(wtpath)
42
 
 
 
35
        if revision is None:
 
36
            revision = self.wt.branch.last_revision()
 
37
            
43
38
        # 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
 
        
 
39
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
52
40
        # Generate status output
53
41
        self._generate_status()
54
42
 
 
43
    def _create(self):
 
44
        self.set_default_size(400, 300)
 
45
        scrolledwindow = gtk.ScrolledWindow()
 
46
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
47
        self.treeview = gtk.TreeView()
 
48
        scrolledwindow.add(self.treeview)
 
49
        self.vbox.pack_start(scrolledwindow, True, True)
 
50
        self.vbox.show_all()
 
51
 
 
52
    def row_diff(self, tv, path, tvc):
 
53
        file = self.model[path][1]
 
54
        if file is None:
 
55
            return
 
56
        from bzrlib.plugins.gtk.diff import DiffWindow
 
57
        window = DiffWindow()
 
58
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
59
        window.set_file(file)
 
60
        window.show()
 
61
 
55
62
    def _generate_status(self):
56
63
        """ Generate 'bzr status' output. """
57
64
        self.model = gtk.TreeStore(str, str)
58
 
        self.treeview = self.glade.get_widget('treeview_status')
 
65
        self.treeview.set_headers_visible(False)
59
66
        self.treeview.set_model(self.model)
 
67
        self.treeview.connect("row-activated", self.row_diff)
60
68
        
61
69
        cell = gtk.CellRendererText()
62
70
        cell.set_property("width-chars", 20)
107
115
 
108
116
        self.treeview.expand_all()
109
117
    
110
 
    def display(self):
111
 
        """ Display the Diff window. """
112
 
        self.window.show_all()
113
 
 
114
118
    def close(self, widget=None):
115
119
        self.window.destroy()