/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/frontend/gtk/add.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-09 17:43:44 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060809174344-61ca8dac23ebe7cb
Main window preferences (size, position) are stored.

2006-08-09  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/gtk/__init__.py: simplified preference handling
    * olive/frontend/gtk/handler.py: window preferences are stored on quit

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/frontend/gtk/add.py
32
32
 
33
33
class OliveAdd:
34
34
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self, gladefile, comm):
36
36
        """ Initialize the Add file(s) dialog. """
37
37
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_add', 'olive-gtk')
 
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_add')
39
39
        
40
 
        # Communication object
41
40
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
44
41
        
45
42
        self.window = self.glade.get_widget('window_add')
46
43
        
56
53
        self.window.show_all()
57
54
        
58
55
    def add(self, widget):
 
56
        from dialog import OliveDialog
 
57
        dialog = OliveDialog(self.gladefile)
 
58
        
59
59
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
60
60
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
61
61
        
67
67
            filename = self.comm.get_selected_right()
68
68
            
69
69
            if filename is None:
70
 
                self.dialog.error_dialog(_('No file was selected'),
71
 
                                         _('Please select a file from the list,\nor choose the other option.'))
 
70
                dialog.error_dialog('No file was selected.')
72
71
                return
73
72
            
74
73
            try:
75
74
                fileops.add([directory + '/' + filename])
76
75
            except errors.NotBranchError:
77
 
                self.dialog.error_dialog(_('Directory is not a branch'),
78
 
                                         _('You can perform this action only in a branch.'))
 
76
                dialog.error_dialog('The directory is not a branch.')
79
77
                self.comm.set_busy(self.window, False)
80
78
                return
81
79
            except:
85
83
            try:
86
84
                fileops.add([directory], True)
87
85
            except errors.NotBranchError:
88
 
                self.dialog.error_dialog(_('Directory is not a branch'),
89
 
                                         _('You can perform this action only in a branch.'))
 
86
                dialog.error_dialog('The directory is not a branch.')
90
87
                self.comm.set_busy(self.window, False)
91
88
                return
92
89
            except: