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

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 16:23:15 UTC
  • mfrom: (170 trunk)
  • mto: (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315162315-rs1sbxjh31n314zc
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
26
26
import gtk
27
27
 
28
28
import bzrlib.errors as errors
29
 
from dialog import error_dialog
 
29
from bzrlib.workingtree import WorkingTree
30
30
 
 
31
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
 
32
from errors import show_bzr_error
31
33
from launch import launch
 
34
from olive import Preferences, DiffWindow
32
35
 
33
36
class OliveMenu:
34
37
    """ This class is responsible for building the context menus. """
35
 
    def __init__(self, comm):
 
38
    def __init__(self, path, selected, app=None):
36
39
        # Load the UI file
37
 
        if sys.platform == 'win32':
38
 
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
39
 
        else:
40
 
            self.uifile = "/usr/share/olive/cmenu.ui"
41
 
        
42
 
        if not os.path.exists(self.uifile):
43
 
            # Load from current directory if not installed
44
 
            self.uifile = "cmenu.ui"
45
 
            # Check again
46
 
            if not os.path.exists(self.uifile):
47
 
                # Fail
48
 
                print _('UI description file cannot be found.')
49
 
                sys.exit(1)
50
 
        
51
 
        self.comm = comm
 
40
        from guifiles import UIFILENAME
 
41
 
 
42
        self.uifile = UIFILENAME
 
43
 
 
44
        # Preferences handler
 
45
        self.pref = Preferences()
 
46
        
 
47
        # Set default values
 
48
        self.path = path
 
49
        self.selected = selected
 
50
        self.app = app
52
51
        
53
52
        # Create the file list context menu
54
53
        self.ui = gtk.UIManager()
62
61
                                       _('Remove'), None,
63
62
                                       _('Remove the selected file'),
64
63
                                       self.remove_file),
 
64
                                      ('rename', None,
 
65
                                       _('Rename'), None,
 
66
                                       _('Rename the selected file'),
 
67
                                       self.rename_file),
65
68
                                      ('open', gtk.STOCK_OPEN,
66
69
                                       _('Open'), None,
67
70
                                       _('Open the selected file'),
68
71
                                       self.open_file),
 
72
                                      ('revert', None,
 
73
                                       _('Revert'), None,
 
74
                                       _('Revert the changes'),
 
75
                                       self.revert),
69
76
                                      ('commit', None,
70
77
                                       _('Commit'), None,
71
78
                                       _('Commit the changes'),
108
115
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
109
116
        
110
117
        # Set icons
111
 
        commit_menu = self.ui.get_widget('/context_right/commit')
112
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
113
 
        commit_pixbuf = commit_image.get_pixbuf()
114
 
        commit_icon = gtk.Image()
115
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
116
 
        commit_menu.set_image(commit_icon)
117
 
        diff_menu = self.ui.get_widget('/context_right/diff')
118
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
119
 
        diff_pixbuf = diff_image.get_pixbuf()
120
 
        diff_icon = gtk.Image()
121
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
122
 
        diff_menu.set_image(diff_icon)
 
118
        # TODO: do it without using deprecated comm
 
119
        #commit_menu = self.ui.get_widget('/context_right/commit')
 
120
        #commit_image = self.comm.menuitem_branch_commit.get_image()
 
121
        #commit_pixbuf = commit_image.get_pixbuf()
 
122
        #commit_icon = gtk.Image()
 
123
        #commit_icon.set_from_pixbuf(commit_pixbuf)
 
124
        #commit_menu.set_image(commit_icon)
 
125
        #diff_menu = self.ui.get_widget('/context_right/diff')
 
126
        #diff_image = self.comm.menuitem_stats_diff.get_image()
 
127
        #diff_pixbuf = diff_image.get_pixbuf()
 
128
        #diff_icon = gtk.Image()
 
129
        #diff_icon.set_from_pixbuf(diff_pixbuf)
 
130
        #diff_menu.set_image(diff_icon)
123
131
 
124
132
    def right_context_menu(self):
125
133
        return self.cmenu_right
127
135
    def left_context_menu(self):
128
136
        return self.cmenu_left
129
137
    
 
138
    @show_bzr_error
130
139
    def add_file(self, action):
131
140
        """ Right context menu -> Add """
 
141
        import bzrlib.add
 
142
        
132
143
        # Add only the selected file
133
 
        directory = self.comm.get_path()
134
 
        filename = self.comm.get_selected_right()
 
144
        directory = self.path
 
145
        filename = self.selected
135
146
            
136
147
        if filename is None:
137
148
            error_dialog(_('No file was selected'),
138
 
                                     _('Please select a file from the list,\nor choose the other option.'))
139
 
            return
140
 
        
141
 
        try:
142
 
            bzrlib.add.smart_add([directory + '/' + filename])
143
 
        except errors.NotBranchError:
144
 
            error_dialog(_('Directory is not a branch'),
145
 
                                     _('You can perform this action only in a branch.'))
146
 
            return
147
 
        
148
 
        self.comm.refresh_right()
 
149
                         _('Please select a file from the list,\nor choose the other option.'))
 
150
            return
 
151
        
 
152
        bzrlib.add.smart_add([os.path.join(directory, filename)])
149
153
    
 
154
    @show_bzr_error
150
155
    def remove_file(self, action):
151
156
        """ Right context menu -> Remove """
152
157
        # Remove only the selected file
153
 
        directory = self.comm.get_path()
154
 
        filename = self.comm.get_selected_right()
 
158
        directory = self.path
 
159
        filename = self.selected
155
160
        
156
161
        if filename is None:
157
162
            error_dialog(_('No file was selected'),
158
 
                                     _('Please select a file from the list,\nor choose the other option.'))
159
 
            return
160
 
        
161
 
        try:
162
 
            wt, path = WorkingTree.open_containing(directory+'/'+filename)
163
 
            wt.remove(path)
164
 
 
165
 
        except errors.NotBranchError:
166
 
            error_dialog(_('Directory is not a branch'),
167
 
                                     _('You can perform this action only in a branch.'))
168
 
            return
169
 
        except errors.NotVersionedError:
170
 
            error_dialog(_('File not versioned'),
171
 
                                     _('The selected file is not versioned.'))
172
 
            return
173
 
        except:
174
 
            raise
175
 
        
176
 
        self.comm.refresh_right()
177
 
 
 
163
                         _('Please select a file from the list,\nor choose the other option.'))
 
164
            return
 
165
        
 
166
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
 
167
        wt.remove(path)
 
168
        self.app.set_path(self.path)
 
169
        self.app.refresh_right()
 
170
 
 
171
    def rename_file(self, action):
 
172
        """ Right context menu -> Rename """
 
173
        from rename import OliveRename
 
174
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
 
175
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
 
176
        rename.display()
 
177
    
178
178
    def open_file(self, action):
179
179
        """ Right context menu -> Open """
180
180
        # Open only the selected file
181
 
        filename = self.comm.get_selected_right()
 
181
        filename = self.selected
182
182
        
183
183
        if filename is None:
184
184
            error_dialog(_('No file was selected'),
185
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
185
                         _('Please select a file from the list,\nor choose the other option.'))
186
186
            return
187
187
 
188
188
        if filename == '..':
189
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
189
            # TODO: how to enter a directory?
 
190
            return
190
191
        else:
191
 
            fullpath = self.comm.get_path() + os.sep + filename
 
192
            fullpath = self.path + os.sep + filename
192
193
            if os.path.isdir(fullpath):
193
194
                # selected item is an existant directory
194
 
                self.comm.set_path(fullpath)
 
195
                # TODO: how to enter a directory?
 
196
                return
195
197
            else:
196
198
                launch(fullpath) 
197
 
        
198
 
        self.comm.refresh_right()
199
199
 
 
200
    def revert(self, action):
 
201
        """ Right context menu -> Revert """
 
202
        wt, path = WorkingTree.open_containing(self.path)
 
203
        ret = wt.revert([os.path.join(path, self.selected)])
 
204
        if ret:
 
205
            warning_dialog(_('Conflicts detected'),
 
206
                           _('Please have a look at the working tree before continuing.'))
 
207
        else:
 
208
            info_dialog(_('Revert successful'),
 
209
                        _('All files reverted to last revision.'))
 
210
        self.app.refresh_right()       
 
211
    
200
212
    def commit(self, action):
201
213
        """ Right context menu -> Commit """
202
 
        from commit import OliveCommit
203
 
        wt, path = WorkingTree.open_containing(self.comm.get_path())
204
 
        commit = OliveCommit(wt, path)
205
 
        commit.display()
 
214
        from commit import CommitDialog
 
215
        branch = None
 
216
        try:
 
217
            wt, path = WorkingTree.open_containing(self.path)
 
218
            branch = wt.branch
 
219
        except NotBranchError, e:
 
220
            path = e.path
 
221
        
 
222
        commit = CommitDialog(wt, path, not branch, self.selected)
 
223
        response = commit.run()
 
224
        if response != gtk.RESPONSE_NONE:
 
225
            commit.hide()
 
226
        
 
227
            if response == gtk.RESPONSE_OK:
 
228
                self.app.refresh_right()
 
229
            
 
230
            commit.destroy()
206
231
    
 
232
    @show_bzr_error
207
233
    def diff(self, action):
208
234
        """ Right context menu -> Diff """
209
 
        from diff import OliveDiff
210
 
        diff = OliveDiff(self.comm)
211
 
        diff.display()
 
235
        wt = WorkingTree.open_containing(self.path)[0]
 
236
        window = DiffWindow()
 
237
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
238
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
239
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
 
240
        window.show()
212
241
    
213
242
    def bookmark(self, action):
214
243
        """ Right context menu -> Bookmark """
215
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
 
244
        if self.pref.add_bookmark(self.path):
216
245
            info_dialog(_('Bookmark successfully added'),
217
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
246
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
247
            self.pref.write()
218
248
        else:
219
249
            warning_dialog(_('Location already bookmarked'),
220
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
 
250
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
221
251
        
222
 
        self.comm.refresh_left()
 
252
        self.app.refresh_left()
223
253
 
224
254
    def edit_bookmark(self, action):
225
255
        """ Left context menu -> Edit """
226
 
        from bookmark import OliveBookmark
227
 
 
228
 
        if self.comm.get_selected_left() != None:
229
 
            bookmark = OliveBookmark(self.comm)
230
 
            bookmark.display()
 
256
        from bookmark import BookmarkDialog
 
257
        
 
258
        if self.selected != None:
 
259
            bookmark = BookmarkDialog(self.selected, self.app.window)
 
260
            response = bookmark.run()
 
261
            
 
262
            if response != gtk.RESPONSE_NONE:
 
263
                bookmark.hide()
 
264
        
 
265
                if response == gtk.RESPONSE_OK:
 
266
                    self.app.refresh_left()
 
267
            
 
268
                bookmark.destroy()
231
269
 
232
270
    def remove_bookmark(self, action):
233
271
        """ Left context menu -> Remove """
234
272
        
235
 
        if self.comm.get_selected_left() != None:
236
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
237
 
            self.comm.refresh_left()
 
273
        if self.selected != None:
 
274
            self.pref.remove_bookmark(self.selected)
 
275
            self.pref.write()
 
276
        
 
277
        self.app.refresh_left()
238
278
    
239
279
    def open_folder(self, action):
240
280
        """ Left context menu -> Open Folder """
241
 
        path = self.comm.get_selected_left()
 
281
        path = self.selected
242
282
 
243
283
        if path != None:
244
284
            launch(path)