/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-27 17:43:04 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927174304-6e7eedf7952827d7
Fix dialog handling for log.

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