/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: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

Show diffs side-by-side

added added

removed removed

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