/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: 2006-09-30 13:04:15 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930130415-aba4100709e11f0a
Loads of fixes. Pyflakes cleanup.

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
57
59
        
58
60
        # Create the file list context menu
59
61
        self.ui = gtk.UIManager()
113
115
        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
114
116
        
115
117
        # 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)
 
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)
128
131
 
129
132
    def right_context_menu(self):
130
133
        return self.cmenu_right
134
137
    
135
138
    def add_file(self, action):
136
139
        """ Right context menu -> Add """
 
140
        import bzrlib.add
 
141
        
137
142
        # Add only the selected file
138
 
        directory = self.comm.get_path()
139
 
        filename = self.comm.get_selected_right()
 
143
        directory = self.path
 
144
        filename = self.selected
140
145
            
141
146
        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.'))
 
147
            error_dialog(_('No file was selected'),
 
148
                         _('Please select a file from the list,\nor choose the other option.'))
144
149
            return
145
150
        
146
151
        try:
147
 
            fileops.add([directory + '/' + filename])
 
152
            bzrlib.add.smart_add([directory + '/' + filename])
148
153
        except errors.NotBranchError:
149
 
            self.dialog.error_dialog(_('Directory is not a branch'),
150
 
                                     _('You can perform this action only in a branch.'))
 
154
            error_dialog(_('Directory is not a branch'),
 
155
                         _('You can perform this action only in a branch.'))
151
156
            return
152
 
        except:
153
 
            raise
154
 
        
155
 
        self.comm.refresh_right()
156
157
    
157
158
    def remove_file(self, action):
158
159
        """ Right context menu -> Remove """
159
160
        # Remove only the selected file
160
 
        directory = self.comm.get_path()
161
 
        filename = self.comm.get_selected_right()
 
161
        directory = self.path
 
162
        filename = self.selected
162
163
        
163
164
        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.'))
 
165
            error_dialog(_('No file was selected'),
 
166
                         _('Please select a file from the list,\nor choose the other option.'))
166
167
            return
167
168
        
168
169
        try:
169
 
            fileops.remove([directory + '/' + filename])
 
170
            wt, path = WorkingTree.open_containing(directory + os.sep + filename)
 
171
            wt.remove(path)
 
172
 
170
173
        except errors.NotBranchError:
171
 
            self.dialog.error_dialog(_('Directory is not a branch'),
172
 
                                     _('You can perform this action only in a branch.'))
 
174
            error_dialog(_('Directory is not a branch'),
 
175
                         _('You can perform this action only in a branch.'))
173
176
            return
174
177
        except errors.NotVersionedError:
175
 
            self.dialog.error_dialog(_('File not versioned'),
176
 
                                     _('The selected file is not versioned.'))
 
178
            error_dialog(_('File not versioned'),
 
179
                         _('The selected file is not versioned.'))
177
180
            return
178
 
        except:
179
 
            raise
180
 
        
181
 
        self.comm.refresh_right()
182
181
 
183
182
    def open_file(self, action):
184
183
        """ Right context menu -> Open """
185
184
        # Open only the selected file
186
 
        filename = self.comm.get_selected_right()
 
185
        filename = self.selected
187
186
        
188
187
        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.'))
 
188
            error_dialog(_('No file was selected'),
 
189
                         _('Please select a file from the list,\nor choose the other option.'))
191
190
            return
192
191
 
193
192
        if filename == '..':
194
 
            self.comm.set_path(os.path.split(self.comm.get_path())[0])
 
193
            # TODO: how to enter a directory?
 
194
            return
195
195
        else:
196
 
            fullpath = self.comm.get_path() + os.sep + filename
 
196
            fullpath = self.path + os.sep + filename
197
197
            if os.path.isdir(fullpath):
198
198
                # selected item is an existant directory
199
 
                self.comm.set_path(fullpath)
 
199
                # TODO: how to enter a directory?
 
200
                return
200
201
            else:
201
202
                launch(fullpath) 
202
 
        
203
 
        self.comm.refresh_right()
204
203
 
205
204
    def commit(self, action):
206
205
        """ Right context menu -> Commit """
207
206
        from commit import OliveCommit
208
 
        commit = OliveCommit(self.gladefile, self.comm, self.dialog)
 
207
        wt, path = WorkingTree.open_containing(self.path)
 
208
        commit = OliveCommit(wt, path)
209
209
        commit.display()
210
210
    
211
211
    def diff(self, action):
212
212
        """ Right context menu -> Diff """
213
 
        from diff import OliveDiff
214
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
215
 
        diff.display()
 
213
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
214
        
 
215
        try:
 
216
            wt = WorkingTree.open_containing(self.path)[0]
 
217
        except errors.NotBranchError:
 
218
            error_dialog(_('File is not in a branch'),
 
219
                         _('The selected file is not in a branch.'))
 
220
            return
 
221
        
 
222
        window = DiffWindow()
 
223
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
 
224
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
225
        window.show()
216
226
    
217
227
    def bookmark(self, action):
218
228
        """ 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.'))
 
229
        if self.pref.add_bookmark(self.path):
 
230
            info_dialog(_('Bookmark successfully added'),
 
231
                        _('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
 
232
            self.pref.write()
222
233
        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()
 
234
            warning_dialog(_('Location already bookmarked'),
 
235
                           _('The current directory is already bookmarked.\nSee the left panel for reference.'))
227
236
 
228
237
    def edit_bookmark(self, action):
229
238
        """ Left context menu -> Edit """
230
239
        from bookmark import OliveBookmark
231
240
 
232
 
        if self.comm.get_selected_left() != None:
233
 
            bookmark = OliveBookmark(self.gladefile, self.comm, self.dialog)
 
241
        if self.selected != None:
 
242
            bookmark = OliveBookmark(self.selected)
234
243
            bookmark.display()
235
244
 
236
245
    def remove_bookmark(self, action):
237
246
        """ Left context menu -> Remove """
238
247
        
239
 
        if self.comm.get_selected_left() != None:
240
 
            self.comm.pref.remove_bookmark(self.comm.get_selected_left())
 
248
        if self.selected != None:
 
249
            self.pref.remove_bookmark(self.comm.get_selected_left())
241
250
            self.comm.refresh_left()
242
251
    
243
252
    def open_folder(self, action):
244
253
        """ Left context menu -> Open Folder """
245
 
        path = self.comm.get_selected_left()
 
254
        path = self.selected
246
255
 
247
256
        if path != None:
248
257
            launch(path)
254
263
    def diff_all(self, action):
255
264
        """ Diff toolbutton -> All... """
256
265
        from diff import OliveDiff
257
 
        diff = OliveDiff(self.gladefile, self.comm, self.dialog)
 
266
        diff = OliveDiff(self.comm)
258
267
        diff.display()