/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: Curtis Hovey
  • Date: 2011-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

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
 
from bzrlib.plugins.gtk import _i18n
25
 
 
26
 
 
27
 
class StatusDialog(gtk.Dialog):
 
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):
28
23
    """ Display Status window and perform the needed actions. """
 
24
 
29
25
    def __init__(self, wt, wtpath, revision=None):
30
26
        """ Initialize the Status window. """
31
 
        super(StatusDialog, self).__init__(flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
27
        super(StatusWindow, self).__init__()
32
28
        self.set_title("Working tree changes")
33
29
        self._create()
34
30
        self.wt = wt
35
31
        self.wtpath = wtpath
36
 
        
 
32
 
37
33
        if revision is None:
38
34
            revision = self.wt.branch.last_revision()
39
 
            
 
35
 
40
36
        # Set the old working tree
41
37
        self.old_tree = self.wt.branch.repository.revision_tree(revision)
42
38
        # Generate status output
44
40
 
45
41
    def _create(self):
46
42
        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()
 
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
 
53
55
 
54
56
    def row_diff(self, tv, path, tvc):
55
57
        file = self.model[path][1]
57
59
            return
58
60
        from bzrlib.plugins.gtk.diff import DiffWindow
59
61
        window = DiffWindow()
60
 
        window.set_diff("Working tree changes", self.old_tree, self.wt)
 
62
        window.set_diff("Working tree changes", self.wt, self.old_tree)
61
63
        window.set_file(file)
62
64
        window.show()
63
65
 
 
66
 
64
67
    def _generate_status(self):
65
68
        """ Generate 'bzr status' output. """
66
 
        self.model = gtk.TreeStore(str, str)
 
69
        self.model = Gtk.TreeStore(str, str)
67
70
        self.treeview.set_headers_visible(False)
68
71
        self.treeview.set_model(self.model)
69
72
        self.treeview.connect("row-activated", self.row_diff)
70
 
        
71
 
        cell = gtk.CellRendererText()
 
73
 
 
74
        cell = Gtk.CellRendererText()
72
75
        cell.set_property("width-chars", 20)
73
 
        column = gtk.TreeViewColumn()
74
 
        column.pack_start(cell, expand=True)
 
76
        column = Gtk.TreeViewColumn()
 
77
        column.pack_start(cell, True, True, 0)
75
78
        column.add_attribute(cell, "text", 0)
76
79
        self.treeview.append_column(column)
77
 
        
 
80
 
78
81
        delta = self.wt.changes_from(self.old_tree)
79
82
 
80
83
        changes = False
81
 
        
 
84
 
82
85
        if len(delta.added):
83
86
            changes = True
84
87
            titer = self.model.append(None, [ _i18n('Added'), None ])
103
106
            titer = self.model.append(None, [ _i18n('Modified'), None ])
104
107
            for path, id, kind, text_modified, meta_modified in delta.modified:
105
108
                self.model.append(titer, [ path, path ])
106
 
        
 
109
 
107
110
        done_unknown = False
108
111
        for path in self.wt.unknowns():
109
112
            changes = True
116
119
            self.model.append(None, [ _i18n('No changes.'), None ])
117
120
 
118
121
        self.treeview.expand_all()
119
 
    
 
122
 
120
123
    def close(self, widget=None):
121
124
        self.window.destroy()