/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
 
import gtk
24
 
 
25
 
class StatusDialog(gtk.MessageDialog):
 
17
from gi.repository import Gtk
 
18
from bzrlib.plugins.gtk import window
 
19
from bzrlib.plugins.gtk.i18n import _i18n
 
20
 
 
21
 
 
22
class StatusWindow(window.Window):
26
23
    """ Display Status window and perform the needed actions. """
27
 
    def __init__(self, wt, wtpath):
 
24
 
 
25
    def __init__(self, wt, wtpath, revision=None):
28
26
        """ Initialize the Status window. """
29
 
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=gtk.BUTTONS_OK)
 
27
        super(StatusWindow, self).__init__()
30
28
        self.set_title("Working tree changes")
31
 
        self.set_image(gtk.Label("Working tree status"))
32
29
        self._create()
33
30
        self.wt = wt
34
31
        self.wtpath = wtpath
 
32
 
 
33
        if revision is None:
 
34
            revision = self.wt.branch.last_revision()
 
35
 
35
36
        # Set the old working tree
36
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
 
37
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
37
38
        # Generate status output
38
39
        self._generate_status()
39
40
 
40
41
    def _create(self):
41
42
        self.set_default_size(400, 300)
42
 
        scrolledwindow = gtk.ScrolledWindow()
43
 
        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
44
 
        self.treeview = gtk.TreeView()
45
 
        scrolledwindow.add(self.treeview)
46
 
        self.vbox.pack_start(scrolledwindow, True, True)
47
 
        self.vbox.show_all()
 
43
        sw = Gtk.ScrolledWindow()
 
44
        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
45
        sw.set_shadow_type(Gtk.ShadowType.IN)
 
46
        self.treeview = Gtk.TreeView()
 
47
        sw.add(self.treeview)
 
48
        self.add(sw)
 
49
 
 
50
        # sane border and spacing widths (as recommended by GNOME HIG) 
 
51
        self.set_border_width(5)
 
52
        sw.set_border_width(5)
 
53
        self.show_all()
 
54
 
48
55
 
49
56
    def row_diff(self, tv, path, tvc):
50
57
        file = self.model[path][1]
52
59
            return
53
60
        from bzrlib.plugins.gtk.diff import DiffWindow
54
61
        window = DiffWindow()
55
 
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
62
        window.set_diff("Working tree changes", self.wt, self.old_tree)
56
63
        window.set_file(file)
57
64
        window.show()
58
65
 
 
66
 
59
67
    def _generate_status(self):
60
68
        """ Generate 'bzr status' output. """
61
 
        self.model = gtk.TreeStore(str, str)
 
69
        self.model = Gtk.TreeStore(str, str)
62
70
        self.treeview.set_headers_visible(False)
63
71
        self.treeview.set_model(self.model)
64
72
        self.treeview.connect("row-activated", self.row_diff)
65
 
        
66
 
        cell = gtk.CellRendererText()
 
73
 
 
74
        cell = Gtk.CellRendererText()
67
75
        cell.set_property("width-chars", 20)
68
 
        column = gtk.TreeViewColumn()
69
 
        column.pack_start(cell, expand=True)
 
76
        column = Gtk.TreeViewColumn()
 
77
        column.pack_start(cell, True)
70
78
        column.add_attribute(cell, "text", 0)
71
79
        self.treeview.append_column(column)
72
 
        
 
80
 
73
81
        delta = self.wt.changes_from(self.old_tree)
74
82
 
75
83
        changes = False
76
 
        
 
84
 
77
85
        if len(delta.added):
78
86
            changes = True
79
 
            titer = self.model.append(None, [ _('Added'), None ])
 
87
            titer = self.model.append(None, [ _i18n('Added'), None ])
80
88
            for path, id, kind in delta.added:
81
89
                self.model.append(titer, [ path, path ])
82
90
 
83
91
        if len(delta.removed):
84
92
            changes = True
85
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
93
            titer = self.model.append(None, [ _i18n('Removed'), None ])
86
94
            for path, id, kind in delta.removed:
87
95
                self.model.append(titer, [ path, path ])
88
96
 
89
97
        if len(delta.renamed):
90
98
            changes = True
91
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
99
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
92
100
            for oldpath, newpath, id, kind, text_modified, meta_modified \
93
101
                    in delta.renamed:
94
102
                self.model.append(titer, [ oldpath, newpath ])
95
103
 
96
104
        if len(delta.modified):
97
105
            changes = True
98
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
106
            titer = self.model.append(None, [ _i18n('Modified'), None ])
99
107
            for path, id, kind, text_modified, meta_modified in delta.modified:
100
108
                self.model.append(titer, [ path, path ])
101
 
        
 
109
 
102
110
        done_unknown = False
103
111
        for path in self.wt.unknowns():
104
112
            changes = True
105
113
            if not done_unknown:
106
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
114
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
107
115
                done_unknown = True
108
116
            self.model.append(titer, [ path, path ])
109
117
 
110
118
        if not changes:
111
 
            self.model.append(None, [ _('No changes.'), None ])
 
119
            self.model.append(None, [ _i18n('No changes.'), None ])
112
120
 
113
121
        self.treeview.expand_all()
114
 
    
115
 
    def display(self):
116
 
        """ Display the Diff window. """
117
 
        self.window.show_all()
118
122
 
119
123
    def close(self, widget=None):
120
124
        self.window.destroy()