/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: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

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