/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/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
 
24
import gtk
 
25
import gtk.glade
 
26
import gobject
 
27
import pango
31
28
 
32
29
from bzrlib import version_info
33
30
 
35
32
from bzrlib.workingtree import WorkingTree
36
33
 
37
34
from dialog import error_dialog
 
35
from olive import gladefile
38
36
 
39
37
class OliveCommit:
40
38
    """ Display Commit dialog and perform the needed actions. """
41
 
    def __init__(self, gladefile, wt, wtpath):
 
39
    def __init__(self, wt, wtpath):
42
40
        """ Initialize the Commit dialog. """
43
 
        self.gladefile = gladefile
44
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_commit', 'olive-gtk')
 
41
        self.glade = gtk.glade.XML(gladefile, 'window_commit', 'olive-gtk')
45
42
        
46
43
        self.wt = wt
47
44
        self.wtpath = wtpath
61
58
        
62
59
        # Set the delta
63
60
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
64
 
        if version_info < (0, 9):
65
 
            self.delta = compare_trees(self.old_tree, self.wt)
66
 
        else:
67
 
            self.delta = self.wt.changes_from(self.old_tree)
 
61
        self.delta = self.wt.changes_from(self.old_tree)
68
62
        
69
63
        # Dictionary for signal_autoconnect
70
64
        dic = { "on_button_commit_commit_clicked": self.commit,
127
121
            it = self.file_store.iter_next(it)
128
122
 
129
123
        return ret
130
 
    # end of bzr-gtk code
131
124
    
132
125
    def _toggle_commit(self, cell, path, model):
133
126
        model[path][0] = not model[path][0]
181
174
            return
182
175
        
183
176
        self.close()
184
 
        self.comm.refresh_right()
185
177
        
186
178
    def close(self, widget=None):
187
179
        self.window.destroy()