/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/move.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:
olive/move.py
29
29
import bzrlib.errors as errors
30
30
from bzrlib.workingtree import WorkingTree
31
31
 
32
 
from olive import gladefile
33
 
from dialog import error_dialog
 
32
from bzrlib.plugins.gtk import _i18n
 
33
from bzrlib.plugins.gtk.dialog import error_dialog
 
34
from errors import show_bzr_error
 
35
from guifiles import GLADEFILENAME
 
36
 
34
37
 
35
38
class OliveMove:
36
39
    """ Display the Move dialog and perform the needed actions. """
37
40
    def __init__(self, wt, wtpath, selected=[]):
38
41
        """ Initialize the Move dialog. """
39
 
        self.glade = gtk.glade.XML(gladefile, 'window_move', 'olive-gtk')
 
42
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
40
43
        
41
44
        self.window = self.glade.get_widget('window_move')
42
45
        
67
70
        """ Display the Move dialog. """
68
71
        self.window.show_all()
69
72
 
 
73
    @show_bzr_error
70
74
    def move(self, widget):
71
75
        destination = self.filechooser.get_filename()
72
76
 
73
77
        filename = self.selected
74
78
            
75
79
        if filename is None:
76
 
            error_dialog(_('No file was selected'),
77
 
                         _('Please select a file from the list to proceed.'))
 
80
            error_dialog(_i18n('No file was selected'),
 
81
                         _i18n('Please select a file from the list to proceed.'))
78
82
            return
79
83
        
80
84
        source = os.path.join(self.wtpath, filename)
81
85
        
82
86
        # Move the file to a directory
83
 
        try:
84
 
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
85
 
            wt2, path2 = WorkingTree.open_containing(destination)
86
 
            if wt1.basedir != wt2.basedir:
87
 
                error_dialog(_('Not the same branch'),
88
 
                             _('The destination is not in the same branch.'))
89
 
                return
90
 
 
91
 
            wt1.move([source], wt1.relpath(destination))
92
 
        except errors.NotBranchError:
93
 
            error_dialog(_('File is not in a branch'),
94
 
                         _('The selected file is not in a branch.'))
 
87
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
88
        wt2, path2 = WorkingTree.open_containing(destination)
 
89
        if wt1.basedir != wt2.basedir:
 
90
            error_dialog(_i18n('Not the same branch'),
 
91
                         _i18n('The destination is not in the same branch.'))
95
92
            return
96
93
 
 
94
        wt1.move([source], wt1.relpath(destination))
97
95
        self.close()
98
96
    
99
97
    def close(self, widget=None):