/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: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
status.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
22
20
except:
23
21
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
31
 
 
32
 
import bzrlib
33
 
import bzrlib.errors as errors
34
 
 
35
 
if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
36
 
    # function deprecated after 0.9
37
 
    from bzrlib.delta import compare_trees
38
 
 
39
 
from bzrlib.status import show_tree_status
40
 
from bzrlib.workingtree import WorkingTree
41
 
 
42
 
from dialog import OliveDialog
43
 
 
44
 
class OliveStatus:
 
22
 
 
23
import gtk
 
24
from bzrlib.plugins.gtk import _i18n
 
25
 
 
26
 
 
27
class StatusDialog(gtk.Dialog):
45
28
    """ Display Status window and perform the needed actions. """
46
 
    def __init__(self, gladefile, comm):
47
 
        """ Initialize the Diff window. """
48
 
        self.gladefile = gladefile
49
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_status')
50
 
        
51
 
        self.comm = comm
52
 
        
53
 
        self.dialog = OliveDialog(self.gladefile)
54
 
        
55
 
        # Get the Status window widget
56
 
        self.window = self.glade.get_widget('window_status')
57
 
        
58
 
        # Check if current location is a branch
59
 
        try:
60
 
            (self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
61
 
            branch = self.wt.branch
62
 
        except errors.NotBranchError:
63
 
            self.notbranch = True
64
 
            return
65
 
        except:
66
 
            raise
67
 
        
68
 
        file_id = self.wt.path2id(path)
69
 
 
70
 
        self.notbranch = False
71
 
        if file_id is None:
72
 
            self.notbranch = True
73
 
            return
74
 
        
 
29
    def __init__(self, wt, wtpath, revision=None):
 
30
        """ Initialize the Status window. """
 
31
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
32
        self.set_title("Working tree changes")
 
33
        self._create()
 
34
        self.wt = wt
 
35
        self.wtpath = wtpath
 
36
        
 
37
        if revision is None:
 
38
            revision = self.wt.branch.last_revision()
 
39
            
75
40
        # Set the old working tree
76
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
77
 
        
78
 
        # Dictionary for signal_autoconnect
79
 
        dic = { "on_button_status_close_clicked": self.close }
80
 
        
81
 
        # Connect the signals to the handlers
82
 
        self.glade.signal_autoconnect(dic)
83
 
        
 
41
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
84
42
        # Generate status output
85
43
        self._generate_status()
86
44
 
 
45
    def _create(self):
 
46
        self.set_default_size(400, 300)
 
47
        scrolledwindow = gtk.ScrolledWindow()
 
48
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
49
        self.treeview = gtk.TreeView()
 
50
        scrolledwindow.add(self.treeview)
 
51
        self.vbox.pack_start(scrolledwindow, True, True)
 
52
        self.vbox.show_all()
 
53
 
 
54
    def row_diff(self, tv, path, tvc):
 
55
        file = self.model[path][1]
 
56
        if file is None:
 
57
            return
 
58
        from bzrlib.plugins.gtk.diff import DiffWindow
 
59
        window = DiffWindow()
 
60
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
61
        window.set_file(file)
 
62
        window.show()
 
63
 
87
64
    def _generate_status(self):
88
65
        """ Generate 'bzr status' output. """
89
66
        self.model = gtk.TreeStore(str, str)
90
 
        self.treeview = self.glade.get_widget('treeview_status')
 
67
        self.treeview.set_headers_visible(False)
91
68
        self.treeview.set_model(self.model)
 
69
        self.treeview.connect("row-activated", self.row_diff)
92
70
        
93
71
        cell = gtk.CellRendererText()
94
72
        cell.set_property("width-chars", 20)
97
75
        column.add_attribute(cell, "text", 0)
98
76
        self.treeview.append_column(column)
99
77
        
100
 
        if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
101
 
            delta = compare_trees(self.old_tree, self.wt)
102
 
        else:
103
 
            delta = self.wt.changes_from(self.old_tree)
 
78
        delta = self.wt.changes_from(self.old_tree)
104
79
 
 
80
        changes = False
 
81
        
105
82
        if len(delta.added):
106
 
            titer = self.model.append(None, [ "Added", None ])
 
83
            changes = True
 
84
            titer = self.model.append(None, [ _i18n('Added'), None ])
107
85
            for path, id, kind in delta.added:
108
86
                self.model.append(titer, [ path, path ])
109
87
 
110
88
        if len(delta.removed):
111
 
            titer = self.model.append(None, [ "Removed", None ])
 
89
            changes = True
 
90
            titer = self.model.append(None, [ _i18n('Removed'), None ])
112
91
            for path, id, kind in delta.removed:
113
92
                self.model.append(titer, [ path, path ])
114
93
 
115
94
        if len(delta.renamed):
116
 
            titer = self.model.append(None, [ "Renamed", None ])
 
95
            changes = True
 
96
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
117
97
            for oldpath, newpath, id, kind, text_modified, meta_modified \
118
98
                    in delta.renamed:
119
99
                self.model.append(titer, [ oldpath, newpath ])
120
100
 
121
101
        if len(delta.modified):
122
 
            titer = self.model.append(None, [ "Modified", None ])
 
102
            changes = True
 
103
            titer = self.model.append(None, [ _i18n('Modified'), None ])
123
104
            for path, id, kind, text_modified, meta_modified in delta.modified:
124
105
                self.model.append(titer, [ path, path ])
125
106
        
126
107
        done_unknown = False
127
108
        for path in self.wt.unknowns():
 
109
            changes = True
128
110
            if not done_unknown:
129
 
                titer = self.model.append(None, [ "Unknown", None ])
 
111
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
130
112
                done_unknown = True
131
113
            self.model.append(titer, [ path, path ])
132
114
 
 
115
        if not changes:
 
116
            self.model.append(None, [ _i18n('No changes.'), None ])
 
117
 
133
118
        self.treeview.expand_all()
134
119
    
135
 
    def display(self):
136
 
        """ Display the Diff window. """
137
 
        if self.notbranch:
138
 
            self.dialog.error_dialog('Directory is not a branch.')
139
 
            self.close()
140
 
        else:
141
 
            self.window.show_all()
142
 
 
143
120
    def close(self, widget=None):
144
121
        self.window.destroy()