/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: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

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