/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/rename.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-12-17 23:22:10 UTC
  • Revision ID: szilveszter.farkas@gmail.com-20061217232210-nxws311ray6wlpw3
Use OliveBookmarkDialog instead of OliveBookmark.

Fixed: #67922 (bookmarks in olive)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
28
28
import bzrlib.errors as errors
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
 
from errors import show_bzr_error
32
 
from bzrlib.plugins.gtk.dialog import error_dialog
 
31
from dialog import error_dialog
33
32
from guifiles import GLADEFILENAME
34
 
from bzrlib.plugins.gtk import _i18n
35
33
 
36
34
 
37
35
class OliveRename:
61
59
        
62
60
        self.window.show_all()
63
61
 
64
 
    @show_bzr_error
65
62
    def rename(self, widget):
66
63
        # Get entry
67
64
        old_filename = self.selected
68
65
        new_filename = self.entry.get_text()
69
66
            
70
67
        if old_filename is None:
71
 
            error_dialog(_i18n('No file was selected'),
72
 
                         _i18n('Please select a file from the list to proceed.'))
 
68
            error_dialog(_('No file was selected'),
 
69
                         _('Please select a file from the list to proceed.'))
73
70
            return
74
71
        
75
72
        if new_filename == "":
76
 
            error_dialog(_i18n('Filename not given'),
77
 
                         _i18n('Please specify a new name for the file.'))
 
73
            error_dialog(_('Filename not given'),
 
74
                         _('Please specify a new name for the file.'))
78
75
            return
79
76
        
80
77
        source = os.path.join(self.wtpath, old_filename)
81
78
        destination = os.path.join(self.wtpath, new_filename)
82
79
        
83
80
        # Rename the file
84
 
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
85
 
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
 
81
        try:
 
82
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
83
            wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
86
84
 
87
 
        if wt1.basedir != wt2.basedir:
88
 
            error_dialog(_i18n('Not the same branch'),
89
 
                         _i18n('The destination is not in the same branch.'))
 
85
            if wt1.basedir != wt2.basedir:
 
86
                error_dialog(_('Not the same branch'),
 
87
                             _('The destination is not in the same branch.'))
 
88
                return
 
89
            wt1.rename_one(source, destination)
 
90
        except errors.NotBranchError:
 
91
            error_dialog(_('File is not in a branch'),
 
92
                         _('The selected file is not in a branch.'))
90
93
            return
91
 
        wt1.rename_one(source, destination)
 
94
        except errors.BzrError, msg:
 
95
            error_dialog(_('Unknown bzr error'), str(msg))
 
96
 
92
97
        self.close()
93
98
    
94
99
    def close(self, widget=None):