← Back to branch summary

~ubuntu-branches/ubuntu/vivid/system-config-printer/vivid

« back to all changes in this revision

Viewing changes to optionwidgets.py

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2014-07-06 09:41:43 UTC
  • mfrom: (1.1.81)
  • Revision ID: package-import@ubuntu.com-20140706094143-yvp3kzo7ti1ghih8
Tags: 1.4.5+20140706-0ubuntu1
* New upstream release
   o GIT 1.4.x snapshot from 6 July 2014
   o Some codec fixes
   o Traceback fixes
   o IPv6 address entry fix
   o Auth info saving improvement
   o Some loop/hang bug fixes
   o Use LockButton for fewer auth dialogs
* 30_newprinter-driver-download-override-false-error-alarm.patch,
  33_dont-use-hp-makeuri-with-non-hp-printers.patch:
  Removed, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
optionwidgets.py
167
167
        parent = self.btnConflict
168
168
        while parent != None and not isinstance (parent, Gtk.Window):
169
169
            parent = parent.get_parent ()
170
 
 
171
 
        dialog = Gtk.MessageDialog (parent,
172
 
                                    Gtk.DialogFlags.DESTROY_WITH_PARENT |
173
 
                                    Gtk.DialogFlags.MODAL,
174
 
                                    Gtk.MessageType.WARNING,
175
 
                                    Gtk.ButtonsType.CLOSE,
176
 
                                    self.conflict_message)
 
170
        dialog = Gtk.MessageDialog (parent=parent,
 
171
                                    flags=Gtk.DialogFlags.DESTROY_WITH_PARENT |
 
172
                                          Gtk.DialogFlags.MODAL,
 
173
                                    message_type=Gtk.MessageType.WARNING,
 
174
                                    buttons=Gtk.ButtonsType.CLOSE,
 
175
                                    message_format=self.conflict_message)
177
176
        dialog.run()
178
177
        dialog.destroy()
179
178
        
182
181
class OptionBool(Option):
183
182
 
184
183
    def __init__(self, option, ppd, gui, tab_label=None):
185
 
        self.selector = Gtk.CheckButton(ppdippstr.ppd.get (option.text))
 
184
        self.selector = Gtk.CheckButton.new_with_label(
 
185
                                            ppdippstr.ppd.get (option.text))
186
186
        self.label = None
187
187
        self.false = u"False" # hack to allow "None" instead of "False"
188
188
        self.true = u"True"