/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: v.ladeuil+lp at free
  • Date: 2006-11-30 13:25:35 UTC
  • mto: (66.2.6 trunk)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: v.ladeuil+lp@free.fr-20061130132535-pypv8n8p2lgd0nsl
Fix #73737. Check empty message at commit time.

* dialog.py:
(about): Destroy the dialog unconditionally.
(_message_dialog): Add a 'question' type dialog. Destroy the
dialog unconditionally. Always returns the response, even if
nobody cares.
(question_dialog): New dialog.

* commit.py:
(CommitDialog.display): Give the focus to the commit message text
widget.
(CommitDialog.commit): Requires confirmation to commit with an
empty message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
17
import os.path
19
 
import shutil
20
18
import sys
21
19
 
22
20
try:
30
28
import bzrlib.errors as errors
31
29
from bzrlib.workingtree import WorkingTree
32
30
 
33
 
from bzrlib.plugins.gtk import _i18n
34
 
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
35
 
from bzrlib.plugins.gtk.errors import show_bzr_error
36
 
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
37
 
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
38
 
from bzrlib.plugins.gtk.diff import DiffWindow
 
31
from dialog import error_dialog, info_dialog, warning_dialog
39
32
from launch import launch
40
 
from bzrlib.plugins.gtk.olive import Preferences
 
33
from olive import OlivePreferences, DiffWindow
41
34
 
42
35
class OliveMenu:
43
36
    """ This class is responsible for building the context menus. """
44
 
    def __init__(self, path, selected, app=None):
 
37
    def __init__(self, path, selected):
45
38
        # Load the UI file
46
39
        from guifiles import UIFILENAME
47
40
 
48
41
        self.uifile = UIFILENAME
49
42
 
50
43
        # Preferences handler
51
 
        self.pref = Preferences()
 
44
        self.pref = OlivePreferences()
52
45
        
53
46
        # Set default values
54
47
        self.path = path
55
48
        self.selected = selected
56
 
        self.app = app
57
49
        
58
50
        # Create the file list context menu
59
51
        self.ui = gtk.UIManager()
60
52
        
61
53
        self.actiongroup = gtk.ActionGroup('context')
62
54
        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
63
 
                                       _i18n('Add'), None,
64
 
                                       _i18n('Add the selected file'),
 
55
                                       _('Add'), None,
 
56
                                       _('Add the selected file'),
65
57
                                       self.add_file),
66
58
                                      ('remove', gtk.STOCK_REMOVE,
67
 
                                       _i18n('Remove'), None,
68
 
                                       _i18n('Remove the selected file'),
 
59
                                       _('Remove'), None,
 
60
                                       _('Remove the selected file'),
69
61
                                       self.remove_file),
70
 
                                      ('remove_and_delete', gtk.STOCK_REMOVE,
71
 
                                       _i18n('Remove and delete'), None,
72
 
                                       _i18n('Remove the selected file/dir and delete from disk'),
73
 
                                       self.remove_and_delete_file),
74
 
                                      ('rename', None,
75
 
                                       _i18n('Rename'), None,
76
 
                                       _i18n('Rename the selected file'),
77
 
                                       self.rename_file),
78
62
                                      ('open', gtk.STOCK_OPEN,
79
 
                                       _i18n('Open'), None,
80
 
                                       _i18n('Open the selected file'),
 
63
                                       _('Open'), None,
 
64
                                       _('Open the selected file'),
81
65
                                       self.open_file),
82
 
                                      ('revert', None,
83
 
                                       _i18n('Revert'), None,
84
 
                                       _i18n('Revert the changes'),
85
 
                                       self.revert),
86
66
                                      ('commit', None,
87
 
                                       _i18n('Commit'), None,
88
 
                                       _i18n('Commit the changes'),
 
67
                                       _('Commit'), None,
 
68
                                       _('Commit the changes'),
89
69
                                       self.commit),
90
 
                                      ('annotate', None,
91
 
                                       _i18n('Annotate'), None,
92
 
                                       _i18n('Annotate the selected file'),
93
 
                                       self.annotate),
94
70
                                      ('diff', None,
95
 
                                       _i18n('Diff'), None,
96
 
                                       _i18n('Show the diff of the file'),
 
71
                                       _('Diff'), None,
 
72
                                       _('Show the diff of the file'),
97
73
                                       self.diff),
98
74
                                      ('bookmark', None,
99
 
                                       _i18n('Bookmark'), None,
100
 
                                       _i18n('Bookmark current location'),
 
75
                                       _('Bookmark'), None,
 
76
                                       _('Bookmark current location'),
101
77
                                       self.bookmark),
102
78
                                      ('edit_bookmark', gtk.STOCK_EDIT,
103
 
                                       _i18n('Edit'), None,
104
 
                                       _i18n('Edit the selected bookmark'),
 
79
                                       _('Edit'), None,
 
80
                                       _('Edit the selected bookmark'),
105
81
                                       self.edit_bookmark),
106
82
                                      ('remove_bookmark', gtk.STOCK_REMOVE,
107
 
                                       _i18n('Remove'), None,
108
 
                                       _i18n('Remove the selected bookmark'),
 
83
                                       _('Remove'), None,
 
84
                                       _('Remove the selected bookmark'),
109
85
                                       self.remove_bookmark),
110
86
                                      ('open_folder', gtk.STOCK_OPEN,
111
 
                                       _i18n('Open Folder'), None,
112
 
                                       _i18n('Open bookmark folder in Nautilus'),
 
87
                                       _('Open Folder'), None,
 
88
                                       _('Open bookmark folder in Nautilus'),
113
89
                                       self.open_folder),
114
90
                                      ('diff_selected', None,
115
 
                                       _i18n('Selected...'), None,
116
 
                                       _i18n('Show the differences of the selected file'),
 
91
                                       _('Selected...'), None,
 
92
                                       _('Show the differences of the selected file'),
117
93
                                       self.diff_selected),
118
94
                                      ('diff_all', None,
119
 
                                       _i18n('All...'), None,
120
 
                                       _i18n('Show the differences of all files'),
121
 
                                       self.diff_all),
122
 
                                      ('view_remote', None,
123
 
                                       _i18n('View contents'), None,
124
 
                                       _i18n('View the contents of the file in a builtin viewer'),
125
 
                                       self.view_remote),
126
 
                                      ('diff_remote', None,
127
 
                                       _i18n('Show differences'), None,
128
 
                                       _i18n('Show the differences between two revisions of the file'),
129
 
                                       self.diff_remote),
130
 
                                      ('revert_remote', None,
131
 
                                       _i18n('Revert to this revision'), None,
132
 
                                       _i18n('Revert the selected file to the selected revision'),
133
 
                                       self.revert_remote)
 
95
                                       _('All...'), None,
 
96
                                       _('Show the differences of all files'),
 
97
                                       self.diff_all)
134
98
                                     ])
135
99
        
136
100
        self.ui.insert_action_group(self.actiongroup, 0)
139
103
        self.cmenu_right = self.ui.get_widget('/context_right')
140
104
        self.cmenu_left = self.ui.get_widget('/context_left')
141
105
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
142
 
        self.cmenu_remote = self.ui.get_widget('/context_remote')
143
106
        
144
107
        # Set icons
145
108
        # TODO: do it without using deprecated comm
162
125
    def left_context_menu(self):
163
126
        return self.cmenu_left
164
127
    
165
 
    def remote_context_menu(self):
166
 
        return self.cmenu_remote
167
 
    
168
 
    @show_bzr_error
169
128
    def add_file(self, action):
170
129
        """ Right context menu -> Add """
171
130
        import bzrlib.add
175
134
        filename = self.selected
176
135
            
177
136
        if filename is None:
178
 
            error_dialog(_i18n('No file was selected'),
179
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
180
 
            return
181
 
        
182
 
        bzrlib.add.smart_add([os.path.join(directory, filename)])
183
 
    
184
 
    @show_bzr_error
185
 
    def annotate(self, action):
186
 
        """ Right context menu -> Annotate """
187
 
        directory = self.path
188
 
        filename = self.selected
189
 
        
190
 
        if filename is None:
191
 
            error_dialog(_i18n('No file was selected'),
192
 
                         _i18n('Please select a file from the list.'))
193
 
            return
194
 
        
195
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
196
 
        
197
 
        branch = wt.branch
198
 
        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
199
 
        
200
 
        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
201
 
        window.set_title(os.path.join(directory, filename) + " - Annotate")
202
 
        config = GAnnotateConfig(window)
203
 
        window.show()
204
 
        branch.lock_read()
 
137
            error_dialog(_('No file was selected'),
 
138
                         _('Please select a file from the list,\nor choose the other option.'))
 
139
            return
 
140
        
205
141
        try:
206
 
            window.annotate(wt, branch, file_id)
207
 
        finally:
208
 
            branch.unlock()
 
142
            bzrlib.add.smart_add([os.path.join(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
209
147
    
210
 
    @show_bzr_error
211
 
    def remove_file(self, action,delete_on_disk=0):
 
148
    def remove_file(self, action):
212
149
        """ Right context menu -> Remove """
213
150
        # Remove only the selected file
214
151
        directory = self.path
215
152
        filename = self.selected
216
153
        
217
154
        if filename is None:
218
 
            error_dialog(_i18n('No file was selected'),
219
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
220
 
            return
221
 
        
222
 
        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
223
 
        wt.remove(path)
224
 
        
225
 
        if delete_on_disk:
226
 
            abs_filename = os.path.join(directory,filename)
227
 
            if os.path.isdir(abs_filename):
228
 
                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
229
 
                if response == gtk.RESPONSE_YES:
230
 
                    shutil.rmtree(abs_filename)
231
 
            else:
232
 
                os.remove(abs_filename)
233
 
                
234
 
        self.app.set_path(self.path)
235
 
        self.app.refresh_right()
236
 
        
237
 
    def remove_and_delete_file(self, action):
238
 
        """ Right context menu -> Remove and delete"""
239
 
        self.remove_file(action,delete_on_disk=1)
240
 
 
241
 
    def rename_file(self, action):
242
 
        """ Right context menu -> Rename """
243
 
        from rename import OliveRename
244
 
        wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0]
245
 
        rename = OliveRename(wt, wt.relpath(self.path), self.selected)
246
 
        rename.display()
247
 
    
 
155
            error_dialog(_('No file was selected'),
 
156
                         _('Please select a file from the list,\nor choose the other option.'))
 
157
            return
 
158
        
 
159
        try:
 
160
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
 
161
            wt.remove(path)
 
162
 
 
163
        except errors.NotBranchError:
 
164
            error_dialog(_('Directory is not a branch'),
 
165
                         _('You can perform this action only in a branch.'))
 
166
            return
 
167
        except errors.NotVersionedError:
 
168
            error_dialog(_('File not versioned'),
 
169
                         _('The selected file is not versioned.'))
 
170
            return
 
171
 
248
172
    def open_file(self, action):
249
173
        """ Right context menu -> Open """
250
174
        # Open only the selected file
251
175
        filename = self.selected
252
176
        
253
177
        if filename is None:
254
 
            error_dialog(_i18n('No file was selected'),
255
 
                         _i18n('Please select a file from the list,\nor choose the other option.'))
 
178
            error_dialog(_('No file was selected'),
 
179
                         _('Please select a file from the list,\nor choose the other option.'))
256
180
            return
257
181
 
258
182
        if filename == '..':
267
191
            else:
268
192
                launch(fullpath) 
269
193
 
270
 
    def revert(self, action):
271
 
        """ Right context menu -> Revert """
272
 
        wt, path = WorkingTree.open_containing(self.path)
273
 
        ret = wt.revert([os.path.join(path, self.selected)])
274
 
        if ret:
275
 
            warning_dialog(_i18n('Conflicts detected'),
276
 
                           _i18n('Please have a look at the working tree before continuing.'))
277
 
        else:
278
 
            info_dialog(_i18n('Revert successful'),
279
 
                        _i18n('All files reverted to last revision.'))
280
 
        self.app.refresh_right()       
281
 
    
282
194
    def commit(self, action):
283
195
        """ Right context menu -> Commit """
284
196
        from commit import CommitDialog
285
 
        branch = None
286
 
        try:
287
 
            wt, path = WorkingTree.open_containing(self.path)
288
 
            branch = wt.branch
289
 
        except NotBranchError, e:
290
 
            path = e.path
291
 
        
292
 
        if self.selected:
293
 
            selected = os.path.join(path, self.selected)
294
 
        else:
295
 
            selected = None
296
 
        commit = CommitDialog(wt=wt, selected=selected, parent=None)
297
 
        response = commit.run()
298
 
        if response != gtk.RESPONSE_NONE:
299
 
            commit.hide()
300
 
        
301
 
            if response == gtk.RESPONSE_OK:
302
 
                self.app.refresh_right()
303
 
            
304
 
            commit.destroy()
 
197
        wt, path = WorkingTree.open_containing(self.path)
 
198
        commit = CommitDialog(wt, path)
 
199
        commit.display()
305
200
    
306
 
    @show_bzr_error
307
201
    def diff(self, action):
308
202
        """ Right context menu -> Diff """
309
 
        wt = WorkingTree.open_containing(self.path)[0]
310
 
        window = DiffWindow(self.app)
 
203
        try:
 
204
            wt = WorkingTree.open_containing(self.path)[0]
 
205
        except errors.NotBranchError:
 
206
            error_dialog(_('File is not in a branch'),
 
207
                         _('The selected file is not in a branch.'))
 
208
            return
 
209
        
 
210
        window = DiffWindow()
311
211
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
312
212
        window.set_diff(wt.branch.nick, wt, parent_tree)
313
 
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
314
213
        window.show()
315
214
    
316
215
    def bookmark(self, action):
317
216
        """ Right context menu -> Bookmark """
318
217
        if self.pref.add_bookmark(self.path):
319
 
            info_dialog(_i18n('Bookmark successfully added'),
320
 
                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
218
            info_dialog(_('Bookmark successfully added'),
 
219
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
321
220
            self.pref.write()
322
221
        else:
323
 
            warning_dialog(_i18n('Location already bookmarked'),
324
 
                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
325
 
        
326
 
        self.app.refresh_left()
 
222
            warning_dialog(_('Location already bookmarked'),
 
223
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
327
224
 
328
225
    def edit_bookmark(self, action):
329
226
        """ Left context menu -> Edit """
330
 
        from bookmark import BookmarkDialog
331
 
        
 
227
        from bookmark import OliveBookmark
 
228
 
332
229
        if self.selected != None:
333
 
            bookmark = BookmarkDialog(self.selected, self.app.window)
334
 
            response = bookmark.run()
335
 
            
336
 
            if response != gtk.RESPONSE_NONE:
337
 
                bookmark.hide()
338
 
        
339
 
                if response == gtk.RESPONSE_OK:
340
 
                    self.app.refresh_left()
341
 
            
342
 
                bookmark.destroy()
 
230
            bookmark = OliveBookmark(self.selected)
 
231
            bookmark.display()
343
232
 
344
233
    def remove_bookmark(self, action):
345
234
        """ Left context menu -> Remove """
346
235
        
347
236
        if self.selected != None:
348
 
            self.pref.remove_bookmark(self.selected)
349
 
            self.pref.write()
350
 
        
351
 
        self.app.refresh_left()
 
237
            self.pref.remove_bookmark(self.comm.get_selected_left())
 
238
            self.comm.refresh_left()
352
239
    
353
240
    def open_folder(self, action):
354
241
        """ Left context menu -> Open Folder """
366
253
        from diff import OliveDiff
367
254
        diff = OliveDiff(self.comm)
368
255
        diff.display()
369
 
    
370
 
    def view_remote(self, action):
371
 
        """ Remote context menu -> View contents """
372
 
        print "DEBUG: view contents."
373
 
    
374
 
    def diff_remote(self, action):
375
 
        """ Remote context menu -> Show differences """
376
 
        print "DEBUG: show differences."
377
 
    
378
 
    def revert_remote(self, action):
379
 
        """ Remote context menu -> Revert to this revision """
380
 
        print "DEBUG: revert to this revision."