/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-13 14:08:06 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-20060813140806-3364d3e02a086d51
Modified OliveDialog class interface; huge cleanups.

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

    * olive/frontend/gtk/branch.py: display number of revisions branched
    * olive/frontend/gtk/*: use new dialog interface with detailed descriptions
    * olive/frontend/gtk/dialog.py: modified according to GNOME HIG (primary
      and secondary text)

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):
 
35
    def __init__(self, gladefile, comm, dialog):
36
36
        """ Initialize the Add file(s) dialog. """
37
37
        self.gladefile = gladefile
38
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_add')
39
39
        
 
40
        # Communication object
40
41
        self.comm = comm
 
42
        # Dialog object
 
43
        self.dialog = dialog
41
44
        
42
45
        self.window = self.glade.get_widget('window_add')
43
46
        
53
56
        self.window.show_all()
54
57
        
55
58
    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
 
                dialog.error_dialog('No file was selected.')
 
70
                self.dialog.error_dialog('No file was selected',
 
71
                                         'Please select a file from the list,\nor choose the other option.')
71
72
                return
72
73
            
73
74
            try:
74
75
                fileops.add([directory + '/' + filename])
75
76
            except errors.NotBranchError:
76
 
                dialog.error_dialog('The directory is not a branch.')
 
77
                self.dialog.error_dialog('Directory is not a branch',
 
78
                                         'You can perform this action only in a branch.')
77
79
                self.comm.set_busy(self.window, False)
78
80
                return
79
81
            except:
83
85
            try:
84
86
                fileops.add([directory], True)
85
87
            except errors.NotBranchError:
86
 
                dialog.error_dialog('The directory is not a branch.')
 
88
                self.dialog.error_dialog('Directory is not a branch',
 
89
                                         'You can perform this action only in a branch.')
87
90
                self.comm.set_busy(self.window, False)
88
91
                return
89
92
            except: