/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:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/move.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
import sys
 
18
from os.path import dirname
19
19
 
20
20
try:
21
21
    import pygtk
22
22
    pygtk.require("2.0")
23
23
except:
24
24
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
30
 
 
31
 
import olive.backend.errors as errors
32
 
import olive.backend.fileops as fileops
 
25
 
 
26
import gtk
 
27
import gtk.glade
 
28
 
 
29
import bzrlib.errors as errors
 
30
from bzrlib.workingtree import WorkingTree
 
31
 
 
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
 
33
37
 
34
38
class OliveMove:
35
39
    """ Display the Move dialog and perform the needed actions. """
36
 
    def __init__(self, gladefile, comm, dialog):
 
40
    def __init__(self, wt, wtpath, selected=[]):
37
41
        """ Initialize the Move dialog. """
38
 
        self.gladefile = gladefile
39
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_move', 'olive-gtk')
40
 
        
41
 
        # Communication object
42
 
        self.comm = comm
43
 
        # Dialog object
44
 
        self.dialog = dialog
 
42
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
45
43
        
46
44
        self.window = self.glade.get_widget('window_move')
47
45
        
52
50
        # Connect the signals to the handlers
53
51
        self.glade.signal_autoconnect(dic)
54
52
        
 
53
        self.wt = wt
 
54
        self.wtpath = wtpath
 
55
        self.selected = selected
 
56
        
 
57
        if self.selected is None:
 
58
            self.selected = ""
 
59
        
 
60
        if self.wtpath == "":
 
61
            directory = dirname(self.wt.abspath(self.selected))
 
62
        else:
 
63
            directory = dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
 
64
        
55
65
        # Set FileChooser directory
56
66
        self.filechooser = self.glade.get_widget('filechooserbutton_move')
57
 
        self.filechooser.set_filename(self.comm.get_path())
 
67
        self.filechooser.set_filename(directory)
58
68
 
59
69
    def display(self):
60
70
        """ Display the Move dialog. """
61
71
        self.window.show_all()
62
72
 
 
73
    @show_bzr_error
63
74
    def move(self, widget):
64
75
        destination = self.filechooser.get_filename()
65
76
 
66
 
        filename = self.comm.get_selected_right()
 
77
        filename = self.selected
67
78
            
68
79
        if filename is None:
69
 
            self.dialog.error_dialog(_('No file was selected'),
70
 
                                     _('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.'))
71
82
            return
72
83
        
73
 
        source = self.comm.get_path() + '/' + filename
 
84
        source = os.path.join(self.wtpath, filename)
74
85
        
75
86
        # Move the file to a directory
76
 
        try:
77
 
            fileops.move([source, destination])
78
 
        except errors.NotBranchError:
79
 
            self.dialog.error_dialog(_('File is not in a branch'),
80
 
                                     _('The selected file is not in a branch.'))
81
 
            return
82
 
        except errors.NotSameBranchError:
83
 
            self.dialog.error_dialog(_('Not the same branch'),
84
 
                                     _('The destination is not in the same branch.'))
85
 
            return
86
 
        except:
87
 
            raise
 
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.'))
 
92
            return
88
93
 
 
94
        wt1.move([source], wt1.relpath(destination))
89
95
        self.close()
90
 
        self.comm.refresh_right()
91
96
    
92
97
    def close(self, widget=None):
93
98
        self.window.destroy()