/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 olive/frontend/gtk/status.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-09 17:43:44 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060809174344-61ca8dac23ebe7cb
Main window preferences (size, position) are stored.

2006-08-09  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/gtk/__init__.py: simplified preference handling
    * olive/frontend/gtk/handler.py: window preferences are stored on quit

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/status.py
32
32
import bzrlib
33
33
import bzrlib.errors as errors
34
34
 
35
 
if bzrlib.version_info < (0, 9):
 
35
if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
36
36
    # function deprecated after 0.9
37
37
    from bzrlib.delta import compare_trees
38
38
 
43
43
 
44
44
class OliveStatus:
45
45
    """ Display Status window and perform the needed actions. """
46
 
    def __init__(self, gladefile, comm, dialog):
47
 
        """ Initialize the Status window. """
 
46
    def __init__(self, gladefile, comm):
 
47
        """ Initialize the Diff window. """
48
48
        self.gladefile = gladefile
49
49
        self.glade = gtk.glade.XML(self.gladefile, 'window_status')
50
50
        
51
 
        # Communication object
52
51
        self.comm = comm
53
 
        # Dialog object
54
 
        self.dialog = dialog
 
52
        
 
53
        self.dialog = OliveDialog(self.gladefile)
55
54
        
56
55
        # Get the Status window widget
57
56
        self.window = self.glade.get_widget('window_status')
98
97
        column.add_attribute(cell, "text", 0)
99
98
        self.treeview.append_column(column)
100
99
        
101
 
        if bzrlib.version_info < (0, 9):
 
100
        if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
102
101
            delta = compare_trees(self.old_tree, self.wt)
103
102
        else:
104
103
            delta = self.wt.changes_from(self.old_tree)
105
104
 
106
105
        if len(delta.added):
107
 
            titer = self.model.append(None, [ _('Added'), None ])
 
106
            titer = self.model.append(None, [ "Added", None ])
108
107
            for path, id, kind in delta.added:
109
108
                self.model.append(titer, [ path, path ])
110
109
 
111
110
        if len(delta.removed):
112
 
            titer = self.model.append(None, [ _('Removed'), None ])
 
111
            titer = self.model.append(None, [ "Removed", None ])
113
112
            for path, id, kind in delta.removed:
114
113
                self.model.append(titer, [ path, path ])
115
114
 
116
115
        if len(delta.renamed):
117
 
            titer = self.model.append(None, [ _('Renamed'), None ])
 
116
            titer = self.model.append(None, [ "Renamed", None ])
118
117
            for oldpath, newpath, id, kind, text_modified, meta_modified \
119
118
                    in delta.renamed:
120
119
                self.model.append(titer, [ oldpath, newpath ])
121
120
 
122
121
        if len(delta.modified):
123
 
            titer = self.model.append(None, [ _('Modified'), None ])
 
122
            titer = self.model.append(None, [ "Modified", None ])
124
123
            for path, id, kind, text_modified, meta_modified in delta.modified:
125
124
                self.model.append(titer, [ path, path ])
126
125
        
127
126
        done_unknown = False
128
127
        for path in self.wt.unknowns():
129
128
            if not done_unknown:
130
 
                titer = self.model.append(None, [ _('Unknown'), None ])
 
129
                titer = self.model.append(None, [ "Unknown", None ])
131
130
                done_unknown = True
132
131
            self.model.append(titer, [ path, path ])
133
132
 
136
135
    def display(self):
137
136
        """ Display the Diff window. """
138
137
        if self.notbranch:
139
 
            self.dialog.error_dialog(_('Directory is not a branch'),
140
 
                                     _('You can perform this action only in a branch.'))
 
138
            self.dialog.error_dialog('Directory is not a branch.')
141
139
            self.close()
142
140
        else:
143
141
            self.window.show_all()