/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/branch.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/branch.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 OliveBranch:
34
34
    """ Display branch dialog and perform the needed operations. """
35
 
    def __init__(self, gladefile, comm):
 
35
    def __init__(self, gladefile, comm, dialog):
36
36
        """ Initialize the Branch dialog. """
37
37
        self.gladefile = gladefile
38
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_branch')
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_branch')
43
46
        
57
60
        self.window.show_all()
58
61
    
59
62
    def branch(self, widget):
60
 
        from dialog import OliveDialog
61
 
        dialog = OliveDialog(self.gladefile)
62
 
        
63
63
        entry_location = self.glade.get_widget('entry_branch_location')
64
64
        location = entry_location.get_text()
65
65
        if location is '':
66
 
            dialog.error_dialog('You must specify a branch location.')
 
66
            self.dialog.error_dialog('Missing branch location',
 
67
                                     'You must specify a branch location.')
67
68
            return
68
69
        
69
70
        destination = self.filechooser.get_filename()
75
76
        
76
77
        self.comm.set_busy(self.window)
77
78
        try:
78
 
            init.branch(location, destination, revno)
 
79
            revs = init.branch(location, destination, revno)
79
80
        except errors.NonExistingSource, errmsg:
80
 
            dialog.error_dialog('Non existing source: %s' % errmsg)
 
81
            self.dialog.error_dialog('Non existing source',
 
82
                                     "The location (%s)\ndoesn't exist." % errmsg)
81
83
            self.comm.set_busy(self.window, False)
82
84
            return
83
85
        except errors.TargetAlreadyExists, errmsg:
84
 
            dialog.error_dialog('Target already exists: %s' % errmsg)
 
86
            self.dialog.error_dialog('Target already exists',
 
87
                                     'Target directory (%s)\nalready exists. Please select another target.' % errmsg)
85
88
            self.comm.set_busy(self.window, False)
86
89
            return
87
90
        except errors.NonExistingParent, errmsg:
88
 
            dialog.error_dialog('Parent directory doesn\'t exist: %s' % errmsg)
 
91
            self.dialog.error_dialog("Non existing parent directory",
 
92
                                     "The parent directory (%s)\ndoesn't exist." % errmsg)
89
93
            self.comm.set_busy(self.window, False)
90
94
            return
91
95
        except errors.NonExistingRevision:
92
 
            dialog.error_dialog('The given revision doesn\'t exist.')
 
96
            self.dialog.error_dialog('Non existing revision',
 
97
                                     "The revision you specified doesn't exist.")
93
98
            self.comm.set_busy(self.window, False)
94
99
            return
95
100
        except errors.NotBranchError, errmsg:
96
 
            dialog.error_dialog('Not a branch: %s' % errmsg)
 
101
            self.dialog.error_dialog('Location is not a branch'
 
102
                                     'The specified location has to be a branch')
97
103
            self.comm.set_busy(self.window, False)
98
104
            return
99
105
        except:
100
106
            raise
101
107
        
102
108
        self.close()
 
109
        self.dialog.info_dialog('Branching successful',
 
110
                                '%d revision(s) branched.' % revs)
103
111
        self.comm.refresh_right()
104
112
 
105
113
    def close(self, widget=None):