/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

Commit messages never contain config options

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
 
import gtk.glade
25
 
 
26
 
from guifiles import GLADEFILENAME
27
 
 
28
 
 
29
 
class OliveStatus:
 
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):
30
23
    """ Display Status window and perform the needed actions. """
31
 
    def __init__(self, wt, wtpath):
 
24
 
 
25
    def __init__(self, wt, wtpath, revision=None):
32
26
        """ 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
 
        
 
27
        super(StatusWindow, self).__init__()
 
28
        self.set_title("Working tree changes")
 
29
        self._create()
38
30
        self.wt = wt
39
31
        self.wtpath = wtpath
40
 
        
41
 
        # Check if current location is a branch
42
 
        file_id = self.wt.path2id(wtpath)
 
32
 
 
33
        if revision is None:
 
34
            revision = self.wt.branch.last_revision()
43
35
 
44
36
        # 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
 
        
 
37
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
53
38
        # Generate status output
54
39
        self._generate_status()
55
40
 
 
41
    def _create(self):
 
42
        self.set_default_size(400, 300)
 
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
 
 
55
 
 
56
    def row_diff(self, tv, path, tvc):
 
57
        file = self.model[path][1]
 
58
        if file is None:
 
59
            return
 
60
        from bzrlib.plugins.gtk.diff import DiffWindow
 
61
        window = DiffWindow()
 
62
        window.set_diff("Working tree changes", self.wt, self.old_tree)
 
63
        window.set_file(file)
 
64
        window.show()
 
65
 
 
66
 
56
67
    def _generate_status(self):
57
68
        """ Generate 'bzr status' output. """
58
 
        self.model = gtk.TreeStore(str, str)
59
 
        self.treeview = self.glade.get_widget('treeview_status')
 
69
        self.model = Gtk.TreeStore(str, str)
 
70
        self.treeview.set_headers_visible(False)
60
71
        self.treeview.set_model(self.model)
61
 
        
62
 
        cell = gtk.CellRendererText()
 
72
        self.treeview.connect("row-activated", self.row_diff)
 
73
 
 
74
        cell = Gtk.CellRendererText()
63
75
        cell.set_property("width-chars", 20)
64
 
        column = gtk.TreeViewColumn()
65
 
        column.pack_start(cell, expand=True)
 
76
        column = Gtk.TreeViewColumn()
 
77
        column.pack_start(cell, True)
66
78
        column.add_attribute(cell, "text", 0)
67
79
        self.treeview.append_column(column)
68
 
        
 
80
 
69
81
        delta = self.wt.changes_from(self.old_tree)
70
82
 
71
83
        changes = False
72
 
        
 
84
 
73
85
        if len(delta.added):
74
86
            changes = True
75
 
            titer = self.model.append(None, [ _('Added'), None ])
 
87
            titer = self.model.append(None, [ _i18n('Added'), None ])
76
88
            for path, id, kind in delta.added:
77
89
                self.model.append(titer, [ path, path ])
78
90
 
79
91
        if len(delta.removed):
80
92
            changes = True
81
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
93
            titer = self.model.append(None, [ _i18n('Removed'), None ])
82
94
            for path, id, kind in delta.removed:
83
95
                self.model.append(titer, [ path, path ])
84
96
 
85
97
        if len(delta.renamed):
86
98
            changes = True
87
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
99
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
88
100
            for oldpath, newpath, id, kind, text_modified, meta_modified \
89
101
                    in delta.renamed:
90
102
                self.model.append(titer, [ oldpath, newpath ])
91
103
 
92
104
        if len(delta.modified):
93
105
            changes = True
94
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
106
            titer = self.model.append(None, [ _i18n('Modified'), None ])
95
107
            for path, id, kind, text_modified, meta_modified in delta.modified:
96
108
                self.model.append(titer, [ path, path ])
97
 
        
 
109
 
98
110
        done_unknown = False
99
111
        for path in self.wt.unknowns():
100
112
            changes = True
101
113
            if not done_unknown:
102
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
114
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
103
115
                done_unknown = True
104
116
            self.model.append(titer, [ path, path ])
105
117
 
106
118
        if not changes:
107
 
            self.model.append(None, [ _('No changes.'), None ])
 
119
            self.model.append(None, [ _i18n('No changes.'), None ])
108
120
 
109
121
        self.treeview.expand_all()
110
 
    
111
 
    def display(self):
112
 
        """ Display the Diff window. """
113
 
        self.window.show_all()
114
122
 
115
123
    def close(self, widget=None):
116
124
        self.window.destroy()