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