/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: 2011-02-18 13:01:03 UTC
  • Revision ID: jelmer@samba.org-20110218130103-fiyk203auk28thpn
Remove some unused imports, fix some formatting.

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, 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 (
 
25
    _i18n,
 
26
    window,
 
27
    )
 
28
 
 
29
 
 
30
class StatusWindow(window.Window):
45
31
    """ Display Status window and perform the needed actions. """
46
 
    def __init__(self, gladefile, comm, dialog):
 
32
    def __init__(self, wt, wtpath, revision=None):
47
33
        """ Initialize the Status window. """
48
 
        self.gladefile = gladefile
49
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_status')
50
 
        
51
 
        # Communication object
52
 
        self.comm = comm
53
 
        # Dialog object
54
 
        self.dialog = dialog
55
 
        
56
 
        # Get the Status window widget
57
 
        self.window = self.glade.get_widget('window_status')
58
 
        
59
 
        # Check if current location is a branch
60
 
        try:
61
 
            (self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
62
 
            branch = self.wt.branch
63
 
        except errors.NotBranchError:
64
 
            self.notbranch = True
65
 
            return
66
 
        except:
67
 
            raise
68
 
        
69
 
        file_id = self.wt.path2id(path)
70
 
 
71
 
        self.notbranch = False
72
 
        if file_id is None:
73
 
            self.notbranch = True
74
 
            return
75
 
        
 
34
        super(StatusWindow, self).__init__()
 
35
        self.set_title("Working tree changes")
 
36
        self._create()
 
37
        self.wt = wt
 
38
        self.wtpath = wtpath
 
39
 
 
40
        if revision is None:
 
41
            revision = self.wt.branch.last_revision()
 
42
 
76
43
        # Set the old working tree
77
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
78
 
        
79
 
        # Dictionary for signal_autoconnect
80
 
        dic = { "on_button_status_close_clicked": self.close }
81
 
        
82
 
        # Connect the signals to the handlers
83
 
        self.glade.signal_autoconnect(dic)
84
 
        
 
44
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
85
45
        # Generate status output
86
46
        self._generate_status()
87
47
 
 
48
    def _create(self):
 
49
        self.set_default_size(400, 300)
 
50
        sw = gtk.ScrolledWindow()
 
51
        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
52
        sw.set_shadow_type(gtk.SHADOW_IN)
 
53
        self.treeview = gtk.TreeView()
 
54
        sw.add(self.treeview)
 
55
        self.add(sw)
 
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.show_all()
 
61
 
 
62
 
 
63
    def row_diff(self, tv, path, tvc):
 
64
        file = self.model[path][1]
 
65
        if file is None:
 
66
            return
 
67
        from bzrlib.plugins.gtk.diff import DiffWindow
 
68
        window = DiffWindow()
 
69
        window.set_diff("Working tree changes", self.wt, self.old_tree)
 
70
        window.set_file(file)
 
71
        window.show()
 
72
 
 
73
 
88
74
    def _generate_status(self):
89
75
        """ Generate 'bzr status' output. """
90
76
        self.model = gtk.TreeStore(str, str)
91
 
        self.treeview = self.glade.get_widget('treeview_status')
 
77
        self.treeview.set_headers_visible(False)
92
78
        self.treeview.set_model(self.model)
93
 
        
 
79
        self.treeview.connect("row-activated", self.row_diff)
 
80
 
94
81
        cell = gtk.CellRendererText()
95
82
        cell.set_property("width-chars", 20)
96
83
        column = gtk.TreeViewColumn()
97
84
        column.pack_start(cell, expand=True)
98
85
        column.add_attribute(cell, "text", 0)
99
86
        self.treeview.append_column(column)
100
 
        
101
 
        if bzrlib.version_info < (0, 9):
102
 
            delta = compare_trees(self.old_tree, self.wt)
103
 
        else:
104
 
            delta = self.wt.changes_from(self.old_tree)
 
87
 
 
88
        delta = self.wt.changes_from(self.old_tree)
 
89
 
 
90
        changes = False
105
91
 
106
92
        if len(delta.added):
107
 
            titer = self.model.append(None, [ _('Added'), None ])
 
93
            changes = True
 
94
            titer = self.model.append(None, [ _i18n('Added'), None ])
108
95
            for path, id, kind in delta.added:
109
96
                self.model.append(titer, [ path, path ])
110
97
 
111
98
        if len(delta.removed):
112
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
99
            changes = True
 
100
            titer = self.model.append(None, [ _i18n('Removed'), None ])
113
101
            for path, id, kind in delta.removed:
114
102
                self.model.append(titer, [ path, path ])
115
103
 
116
104
        if len(delta.renamed):
117
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
105
            changes = True
 
106
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
118
107
            for oldpath, newpath, id, kind, text_modified, meta_modified \
119
108
                    in delta.renamed:
120
109
                self.model.append(titer, [ oldpath, newpath ])
121
110
 
122
111
        if len(delta.modified):
123
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
112
            changes = True
 
113
            titer = self.model.append(None, [ _i18n('Modified'), None ])
124
114
            for path, id, kind, text_modified, meta_modified in delta.modified:
125
115
                self.model.append(titer, [ path, path ])
126
 
        
 
116
 
127
117
        done_unknown = False
128
118
        for path in self.wt.unknowns():
 
119
            changes = True
129
120
            if not done_unknown:
130
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
121
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
131
122
                done_unknown = True
132
123
            self.model.append(titer, [ path, path ])
133
124
 
 
125
        if not changes:
 
126
            self.model.append(None, [ _i18n('No changes.'), None ])
 
127
 
134
128
        self.treeview.expand_all()
135
 
    
136
 
    def display(self):
137
 
        """ Display the Diff window. """
138
 
        if self.notbranch:
139
 
            self.dialog.error_dialog(_('Directory is not a branch'),
140
 
                                     _('You can perform this action only in a branch.'))
141
 
            self.close()
142
 
        else:
143
 
            self.window.show_all()
144
129
 
145
130
    def close(self, widget=None):
146
131
        self.window.destroy()