/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: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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