/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/dialog.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/dialog.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
42
42
        # Set version
43
43
        dialog.set_version(olive.frontend.gtk.__version__)
44
44
    
45
 
    def _message_dialog(self, type, message):
 
45
    def _message_dialog(self, type, primary, secondary):
46
46
        """ Display a given type of MessageDialog with the given message.
47
47
        
48
48
        :param type: error | warning | info
53
53
            dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
54
54
                                       type=gtk.MESSAGE_ERROR,
55
55
                                       buttons=gtk.BUTTONS_OK)
56
 
            dialog.set_markup('<big><b>Error!</b></big>')
 
56
            dialog.set_markup('<big><b>' + primary + '</b></big>')
57
57
        elif type == 'warning':
58
58
            dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
59
59
                                       type=gtk.MESSAGE_WARNING,
60
60
                                       buttons=gtk.BUTTONS_OK)
61
 
            dialog.set_markup('<big><b>Warning!</b></big>')
 
61
            dialog.set_markup('<big><b>' + primary + '</b></big>')
62
62
        elif type == 'info':
63
63
            dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
64
64
                                       type=gtk.MESSAGE_INFO,
65
65
                                       buttons=gtk.BUTTONS_OK)
66
 
            dialog.set_markup('<big><b>Information</b></big>')
 
66
            dialog.set_markup('<big><b>' + primary + '</b></big>')
67
67
        else:
68
68
            return
69
69
        
70
 
        dialog.format_secondary_text(message)
 
70
        dialog.format_secondary_markup(secondary)
71
71
        
72
72
        if dialog.run() == gtk.RESPONSE_OK:
73
73
            dialog.destroy()
74
74
    
75
 
    def error_dialog(self, message):
 
75
    def error_dialog(self, primary, secondary):
76
76
        """ Display an error dialog with the given message. """
77
 
        self._message_dialog('error', message)
 
77
        self._message_dialog('error', primary, secondary)
78
78
    
79
 
    def info_dialog(self, message):
 
79
    def info_dialog(self, primary, secondary):
80
80
        """ Display an info dialog with the given message. """
81
 
        self._message_dialog('info', message)
 
81
        self._message_dialog('info', primary, secondary)
82
82
    
83
 
    def warning_dialog(self, message):
 
83
    def warning_dialog(self, primary, secondary):
84
84
        """ Display a warning dialog with the given message. """
85
 
        self._message_dialog('warning', message)
 
85
        self._message_dialog('warning', primary, secondary)