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