/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/remove.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/remove.py
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
32
32
 
33
33
class OliveRemove:
34
34
    """ Display the Remove 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 Remove file(s) dialog. """
37
37
        self.gladefile = gladefile
38
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_remove')
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_remove')
43
46
        
53
56
        self.window.show_all()
54
57
        
55
58
    def remove(self, widget):
56
 
        from dialog import OliveDialog
57
 
        dialog = OliveDialog(self.gladefile)
58
 
        
59
59
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
60
        radio_new = self.glade.get_widget('radiobutton_remove_new')
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.remove([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 errors.NotVersionedError:
80
 
                dialog.error_dialog('Selected file is not versioned.')
 
82
                self.dialog.error_dialog('File not versioned',
 
83
                                         'The selected file is not versioned.')
81
84
                self.comm.set_busy(self.window, False)
82
85
                return
83
86
            except:
84
87
                raise
85
88
        elif radio_new.get_active():
86
 
            # Add unknown files recursively
 
89
            # Remove added files recursively
87
90
            try:
88
91
                fileops.remove([directory], True)
89
92
            except errors.NotBranchError:
90
 
                dialog.error_dialog('The directory is not a branch.')
 
93
                self.dialog.error_dialog('Directory is not a branch',
 
94
                                         'You can perform this action only in a branch.')
91
95
                self.comm.set_busy(self.window, False)
92
96
                return
93
97
            except errors.NoMatchingFiles:
94
 
                dialog.warning_dialog('No matching files were found.')
 
98
                dialog.warning_dialog('No matching files',
 
99
                                      'No added files were found in the working tree.')
95
100
                self.comm.set_busy(self.window, False)
96
101
            except:
97
102
                raise