/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
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
26
 
import gtk.glade
27
 
import gobject
28
 
import pango
29
 
 
30
 
import bzrlib
31
 
import bzrlib.errors as errors
32
 
 
33
 
from bzrlib.status import show_tree_status
34
 
from bzrlib.workingtree import WorkingTree
35
 
 
36
 
from dialog import error_dialog
37
 
 
38
 
from olive import gladefile
39
 
 
40
 
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):
41
23
    """ Display Status window and perform the needed actions. """
42
 
    def __init__(self, wt, wtpath):
 
24
 
 
25
    def __init__(self, wt, wtpath, revision=None):
43
26
        """ Initialize the Status window. """
44
 
        self.glade = gtk.glade.XML(gladefile, 'window_status')
45
 
        
46
 
        # Get the Status window widget
47
 
        self.window = self.glade.get_widget('window_status')
 
27
        super(StatusWindow, self).__init__()
 
28
        self.set_title("Working tree changes")
 
29
        self._create()
48
30
        self.wt = wt
49
31
        self.wtpath = wtpath
50
 
        
51
 
        # Check if current location is a branch
52
 
        file_id = self.wt.path2id(wtpath)
 
32
 
 
33
        if revision is None:
 
34
            revision = self.wt.branch.last_revision()
53
35
 
54
36
        # Set the old working tree
55
 
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
56
 
        
57
 
        # Dictionary for signal_autoconnect
58
 
        dic = { "on_button_status_close_clicked": self.close }
59
 
        
60
 
        # Connect the signals to the handlers
61
 
        self.glade.signal_autoconnect(dic)
62
 
        
 
37
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
63
38
        # Generate status output
64
39
        self._generate_status()
65
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
 
66
67
    def _generate_status(self):
67
68
        """ Generate 'bzr status' output. """
68
 
        self.model = gtk.TreeStore(str, str)
69
 
        self.treeview = self.glade.get_widget('treeview_status')
 
69
        self.model = Gtk.TreeStore(str, str)
 
70
        self.treeview.set_headers_visible(False)
70
71
        self.treeview.set_model(self.model)
71
 
        
72
 
        cell = gtk.CellRendererText()
 
72
        self.treeview.connect("row-activated", self.row_diff)
 
73
 
 
74
        cell = Gtk.CellRendererText()
73
75
        cell.set_property("width-chars", 20)
74
 
        column = gtk.TreeViewColumn()
75
 
        column.pack_start(cell, expand=True)
 
76
        column = Gtk.TreeViewColumn()
 
77
        column.pack_start(cell, True)
76
78
        column.add_attribute(cell, "text", 0)
77
79
        self.treeview.append_column(column)
78
 
        
 
80
 
79
81
        delta = self.wt.changes_from(self.old_tree)
80
82
 
81
83
        changes = False
82
 
        
 
84
 
83
85
        if len(delta.added):
84
86
            changes = True
85
 
            titer = self.model.append(None, [ _('Added'), None ])
 
87
            titer = self.model.append(None, [ _i18n('Added'), None ])
86
88
            for path, id, kind in delta.added:
87
89
                self.model.append(titer, [ path, path ])
88
90
 
89
91
        if len(delta.removed):
90
92
            changes = True
91
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
93
            titer = self.model.append(None, [ _i18n('Removed'), None ])
92
94
            for path, id, kind in delta.removed:
93
95
                self.model.append(titer, [ path, path ])
94
96
 
95
97
        if len(delta.renamed):
96
98
            changes = True
97
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
99
            titer = self.model.append(None, [ _i18n('Renamed'), None ])
98
100
            for oldpath, newpath, id, kind, text_modified, meta_modified \
99
101
                    in delta.renamed:
100
102
                self.model.append(titer, [ oldpath, newpath ])
101
103
 
102
104
        if len(delta.modified):
103
105
            changes = True
104
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
106
            titer = self.model.append(None, [ _i18n('Modified'), None ])
105
107
            for path, id, kind, text_modified, meta_modified in delta.modified:
106
108
                self.model.append(titer, [ path, path ])
107
 
        
 
109
 
108
110
        done_unknown = False
109
111
        for path in self.wt.unknowns():
110
112
            changes = True
111
113
            if not done_unknown:
112
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
114
                titer = self.model.append(None, [ _i18n('Unknown'), None ])
113
115
                done_unknown = True
114
116
            self.model.append(titer, [ path, path ])
115
117
 
116
118
        if not changes:
117
 
            self.model.append(None, [ _('No changes.'), None ])
 
119
            self.model.append(None, [ _i18n('No changes.'), None ])
118
120
 
119
121
        self.treeview.expand_all()
120
 
    
121
 
    def display(self):
122
 
        """ Display the Diff window. """
123
 
        self.window.show_all()
124
122
 
125
123
    def close(self, widget=None):
126
124
        self.window.destroy()