← Back to branch summary

~ubuntu-branches/debian/jessie/phatch/jessie

« back to all changes in this revision

Viewing changes to phatch/pyWx/gui.py

  • Committer: Bazaar Package Importer
  • Author(s): Stani M
  • Date: 2009-10-15 18:22:54 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20091015182254-fu9tucj6k2zk8095
Tags: 0.2.4-1
https://launchpad.net/bugs/450693
https://launchpad.net/bugs/449404
https://launchpad.net/bugs/452261
https://launchpad.net/bugs/450800
* Upstream bugfix release (Closes LP: #450693, #449404, #452261,
  #448993)
  
* debian/control: added for phatch: Replaces: phatch-cli (<= 0.2.3-2)
  to fix file overwrite errors (LP: #450800)

Show diffs side-by-side

added added

removed removed

Lines of Context:
phatch/pyWx/gui.py
174
174
        return self.show_message(message, style=style)
175
175
 
176
176
    def show_image_tree(self, result, image_infos, widths, headers,
177
 
            ok_label = '&OK', buttons=False):
 
177
            ok_label = '&OK', buttons=False, modal=False):
178
178
        data = listData.files_data_dict(image_infos)
179
179
        dlg = dialogs.ImageTreeDialog(data, listData.DataDict, headers,
180
180
            self, size=(600, dialogs.get_max_height(300)))
181
181
        dlg.SetColumnWidths(*widths)
182
182
        dlg.SetOkLabel(ok_label)
183
183
        dlg.ShowButtons(buttons)
184
 
        if buttons:
 
184
        if modal or buttons:
185
185
            answer = dlg.ShowModal()
186
186
            result['answer'] = answer == wx.ID_OK
187
187
        else:
194
194
                widths=(200, 60, 60, 60, 500),
195
195
                headers=['filename', 'width', 'height', 'mode',
196
196
                    'source'],
197
 
                buttons=False)
 
197
                buttons=False,
 
198
                modal=not isinstance(self, Frame))
198
199
        else:
199
200
            self.show_message(_('No images have been processed to report.'))
200
201
 
1062
1063
 
1063
1064
    def __init__(self, actionlist, paths, *args, **keyw):
1064
1065
        wx.Frame.__init__(self, *args, **keyw)
 
1066
        self.filename = actionlist
1065
1067
        self._pubsub()
1066
1068
        data = self.load_actionlist_data(actionlist)
1067
1069
        if data: