/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-10-03 06:44:48 UTC
  • mfrom: (0.8.98 merge)
  • mto: (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 103.
  • Revision ID: Szilveszter.Farkas@gmail.com-20061003064448-8cf3c9cc653346ab
Merge from the merge branch.

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