/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: Jelmer Vernooij
  • Date: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

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)
30
 
 
31
 
import olive.backend.fileops as fileops
32
 
import olive.backend.errors as errors
33
 
 
 
25
 
 
26
import gtk
 
27
 
 
28
import bzrlib.errors as errors
 
29
from bzrlib.workingtree import WorkingTree
 
30
 
 
31
from dialog import error_dialog, info_dialog, warning_dialog
34
32
from launch import launch
 
33
from olive import OlivePreferences
35
34
 
36
35
class OliveMenu:
37
36
    """ This class is responsible for building the context menus. """
38
 
    def __init__(self, gladefile, comm, dialog):
 
37
    def __init__(self, path, selected):
39
38
        # Load the UI file
40
39
        if sys.platform == 'win32':
41
40
            self.uifile = os.path.dirname(sys.executable) + "/share/olive/cmenu.ui"
51
50
                print _('UI description file cannot be found.')
52
51
                sys.exit(1)
53
52
        
54
 
        self.gladefile = gladefile
55
 
        self.comm = comm
56
 
        self.dialog = dialog
 
53
        # Preferences handler
 
54
        self.pref = OlivePreferences()
 
55
        
 
56
        # Set default values
 
57
        self.path = path
 
58
        self.selected = selected
 
59
        print "DEBUG: path =", self.path
 
60
        print "DEBUG: selected =", self.selected
57
61
        
58
62
        # Create the file list context menu
59
63
        self.ui = gtk.UIManager()
113
117
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
114
118
        
115
119
        # Set icons
116
 
        commit_menu = self.ui.get_widget('/context_right/commit')
117
 
        commit_image = self.comm.menuitem_branch_commit.get_image()
118
 
        commit_pixbuf = commit_image.get_pixbuf()
119
 
        commit_icon = gtk.Image()
120
 
        commit_icon.set_from_pixbuf(commit_pixbuf)
121
 
        commit_menu.set_image(commit_icon)
122
 
        diff_menu = self.ui.get_widget('/context_right/diff')
123
 
        diff_image = self.comm.menuitem_stats_diff.get_image()
124
 
        diff_pixbuf = diff_image.get_pixbuf()
125
 
        diff_icon = gtk.Image()
126
 
        diff_icon.set_from_pixbuf(diff_pixbuf)
127
 
        diff_menu.set_image(diff_icon)
 
120
        # TODO: do it without using deprecated comm
 
121
        #commit_menu = self.ui.get_widget('/context_right/commit')
 
122
        #commit_image = self.comm.menuitem_branch_commit.get_image()
 
123
        #commit_pixbuf = commit_image.get_pixbuf()
 
124
        #commit_icon = gtk.Image()
 
125
        #commit_icon.set_from_pixbuf(commit_pixbuf)
 
126
        #commit_menu.set_image(commit_icon)
 
127
        #diff_menu = self.ui.get_widget('/context_right/diff')
 
128
        #diff_image = self.comm.menuitem_stats_diff.get_image()
 
129
        #diff_pixbuf = diff_image.get_pixbuf()
 
130
        #diff_icon = gtk.Image()
 
131
        #diff_icon.set_from_pixbuf(diff_pixbuf)
 
132
        #diff_menu.set_image(diff_icon)
128
133
 
129
134
    def right_context_menu(self):
130
135
        return self.cmenu_right
134
139
    
135
140
    def add_file(self, action):
136
141
        """ Right context menu -> Add """
 
142
        import bzrlib.add
 
143
        
137
144
        # Add only the selected file
138
 
        directory = self.comm.get_path()
139
 
        filename = self.comm.get_selected_right()
 
145
        directory = self.path
 
146
        filename = self.selected
140
147
            
141
148
        if filename is None:
142
 
            self.dialog.error_dialog(_('No file was selected'),
143
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
149
            error_dialog(_('No file was selected'),
 
150
                         _('Please select a file from the list,\nor choose the other option.'))
144
151
            return
145
152
        
146
153
        try:
147
 
            fileops.add([directory + '/' + filename])
 
154
            bzrlib.add.smart_add([directory + '/' + filename])
148
155
        except errors.NotBranchError:
149
 
            self.dialog.error_dialog(_('Directory is not a branch'),
150
 
                                     _('You can perform this action only in a branch.'))
 
156
            error_dialog(_('Directory is not a branch'),
 
157
                         _('You can perform this action only in a branch.'))
151
158
            return
152
 
        except:
153
 
            raise
154
 
        
155
 
        self.comm.refresh_right()
156
159
    
157
160
    def remove_file(self, action):
158
161
        """ Right context menu -> Remove """
159
162
        # Remove only the selected file
160
 
        directory = self.comm.get_path()
161
 
        filename = self.comm.get_selected_right()
 
163
        directory = self.path
 
164
        filename = self.selected
162
165
        
163
166
        if filename is None:
164
 
            self.dialog.error_dialog(_('No file was selected'),
165
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
167
            error_dialog(_('No file was selected'),
 
168
                         _('Please select a file from the list,\nor choose the other option.'))
166
169
            return
167
170
        
168
171
        try:
169
 
            fileops.remove([directory + '/' + filename])
 
172
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
 
173
            wt.remove(path)
 
174
 
170
175
        except errors.NotBranchError:
171
 
            self.dialog.error_dialog(_('Directory is not a branch'),
172
 
                                     _('You can perform this action only in a branch.'))
 
176
            error_dialog(_('Directory is not a branch'),
 
177
                         _('You can perform this action only in a branch.'))
173
178
            return
174
179
        except errors.NotVersionedError:
175
 
            self.dialog.error_dialog(_('File not versioned'),
176
 
                                     _('The selected file is not versioned.'))
 
180
            error_dialog(_('File not versioned'),
 
181
                         _('The selected file is not versioned.'))
177
182
            return
178
 
        except:
179
 
            raise
180
 
        
181
 
        self.comm.refresh_right()
182
183
 
183
184
    def open_file(self, action):
184
185
        """ Right context menu -> Open """
185
186
        # Open only the selected file
186
 
        filename = self.comm.get_selected_right()
 
187
        filename = self.selected
187
188
        
188
189
        if filename is None:
189
 
            self.dialog.error_dialog(_('No file was selected'),
190
 
                                     _('Please select a file from the list,\nor choose the other option.'))
 
190
            error_dialog(_('No file was selected'),
 
191
                         _('Please select a file from the list,\nor choose the other option.'))
191
192
            return
192
193
 
193
194
        if filename == '..':
194
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
195
            # TODO: how to enter a directory?
 
196
            return
195
197
        else:
196
 
            fullpath = self.comm.get_path() + os.sep + filename
 
198
            fullpath = self.path + os.sep + filename
197
199
            if os.path.isdir(fullpath):
198
200
                # selected item is an existant directory
199
 
                self.comm.set_path(fullpath)
 
201
                # TODO: how to enter a directory?
 
202
                return
200
203
            else:
201
204
                launch(fullpath) 
202
 
        
203
 
        self.comm.refresh_right()
204
205
 
205
206
    def commit(self, action):
206
207
        """ Right context menu -> Commit """
207
208
        from commit import OliveCommit
208
 
        commit = OliveCommit(self.gladefile, self.comm, self.dialog)
 
209
        wt, path = WorkingTree.open_containing(self.path)
 
210
        commit = OliveCommit(wt, path)
209
211
        commit.display()
210
212
    
211
213
    def diff(self, action):
212
214
        """ Right context menu -> Diff """
213
215
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
216
        diff = OliveDiff(self.comm)
215
217
        diff.display()
216
218
    
217
219
    def bookmark(self, action):
218
220
        """ Right context menu -> Bookmark """
219
 
        if self.comm.pref.add_bookmark(self.comm.get_path()):
220
 
            self.dialog.info_dialog(_('Bookmark successfully added'),
221
 
                                    _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
221
        if self.pref.add_bookmark(self.comm.get_path()):
 
222
            info_dialog(_('Bookmark successfully added'),
 
223
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
222
224
        else:
223
 
            self.dialog.warning_dialog(_('Location already bookmarked'),
224
 
                                       _('The current directory is already bookmarked.\nSee the left panel for reference.'))
225
 
        
226
 
        self.comm.refresh_left()
 
225
            warning_dialog(_('Location already bookmarked'),
 
226
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
227
227
 
228
228
    def edit_bookmark(self, action):
229
229
        """ Left context menu -> Edit """
230
230
        from bookmark import OliveBookmark
231
231
 
232
 
        if self.comm.get_selected_left() != None:
233
 
            bookmark = OliveBookmark(self.gladefile, self.comm, self.dialog)
 
232
        if self.selected != None:
 
233
            bookmark = OliveBookmark(self.selected)
234
234
            bookmark.display()
235
235
 
236
236
    def remove_bookmark(self, action):
237
237
        """ Left context menu -> Remove """
238
238
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
239
        if self.selected != None:
 
240
            self.pref.remove_bookmark(self.comm.get_selected_left())
241
241
            self.comm.refresh_left()
242
242
    
243
243
    def open_folder(self, action):
244
244
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
245
        path = self.selected
246
246
 
247
247
        if path != None:
248
248
            launch(path)
254
254
    def diff_all(self, action):
255
255
        """ Diff toolbutton -> All... """
256
256
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
257
        diff = OliveDiff(self.comm)
258
258
        diff.display()