/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: Daniel Schierbeck
  • Date: 2008-04-07 20:34:51 UTC
  • mfrom: (450.6.13 bugs)
  • mto: (463.2.1 bug.78765)
  • mto: This revision was merged to the branch mainline in revision 462.
  • Revision ID: daniel.schierbeck@gmail.com-20080407203451-2i6el7jf9t0k9y64
Merged bug page improvements.

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)
 
25
 
 
26
import gtk
 
27
import gtk.glade
30
28
 
31
29
import bzrlib.errors as errors
 
30
from bzrlib.workingtree import WorkingTree
 
31
 
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from errors import show_bzr_error
 
34
from guifiles import GLADEFILENAME
 
35
 
32
36
 
33
37
class OliveMove:
34
38
    """ Display the Move dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
39
    def __init__(self, wt, wtpath, selected=[]):
36
40
        """ Initialize the Move dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_move', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
41
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
44
42
        
45
43
        self.window = self.glade.get_widget('window_move')
46
44
        
51
49
        # Connect the signals to the handlers
52
50
        self.glade.signal_autoconnect(dic)
53
51
        
 
52
        self.wt = wt
 
53
        self.wtpath = wtpath
 
54
        self.selected = selected
 
55
        
 
56
        if self.selected is None:
 
57
            self.selected = ""
 
58
        
 
59
        if self.wtpath == "":
 
60
            directory = dirname(self.wt.abspath(self.selected))
 
61
        else:
 
62
            directory = dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
 
63
        
54
64
        # Set FileChooser directory
55
65
        self.filechooser = self.glade.get_widget('filechooserbutton_move')
56
 
        self.filechooser.set_filename(self.comm.get_path())
 
66
        self.filechooser.set_filename(directory)
57
67
 
58
68
    def display(self):
59
69
        """ Display the Move dialog. """
60
70
        self.window.show_all()
61
71
 
 
72
    @show_bzr_error
62
73
    def move(self, widget):
63
74
        destination = self.filechooser.get_filename()
64
75
 
65
 
        filename = self.comm.get_selected_right()
 
76
        filename = self.selected
66
77
            
67
78
        if filename is None:
68
 
            self.dialog.error_dialog(_('No file was selected'),
69
 
                                     _('Please select a file from the list to proceed.'))
 
79
            error_dialog(_('No file was selected'),
 
80
                         _('Please select a file from the list to proceed.'))
70
81
            return
71
82
        
72
 
        source = self.comm.get_path() + '/' + filename
 
83
        source = os.path.join(self.wtpath, filename)
73
84
        
74
85
        # Move the file to a directory
75
 
        try:
76
 
            wt1, path1 = WorkingTree.open_containing(source)
77
 
            wt2, path2 = WorkingTree.open_containing(destination)
78
 
            if wt1.base != wt2.base:
79
 
                self.dialog.error_dialog(_('Not the same branch'),
80
 
                                         _('The destination is not in the same branch.'))
81
 
                return
82
 
 
83
 
            wt1.move([source], destination)
84
 
        except errors.NotBranchError:
85
 
            self.dialog.error_dialog(_('File is not in a branch'),
86
 
                                     _('The selected file is not in a branch.'))
 
86
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
87
        wt2, path2 = WorkingTree.open_containing(destination)
 
88
        if wt1.basedir != wt2.basedir:
 
89
            error_dialog(_('Not the same branch'),
 
90
                         _('The destination is not in the same branch.'))
87
91
            return
88
92
 
 
93
        wt1.move([source], wt1.relpath(destination))
89
94
        self.close()
90
 
        self.comm.refresh_right()
91
95
    
92
96
    def close(self, widget=None):
93
97
        self.window.destroy()