← Back to branch summary

~suutari-olli/openlp/escape-fixes-1294111-1497637

« back to all changes in this revision

Viewing changes to openlp/plugins/presentations/lib/presentationtab.py

  • Committer: suutari-olli
  • Date: 2016-01-07 02:53:59 UTC
  • mfrom: (2557.2.31 openlp)
  • Revision ID: suutari.olli@gmail.com-20160107025359-q2feybbwxaoihqxr
Merge to trunk on 1/7/2015.

I noticed this branch also seems to be fixing this bug:
https://bugs.launchpad.net/openlp/+bug/1531691

However, escape item still remains buggy with problems related to resuming
video and presentations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/presentations/lib/presentationtab.py
4
4
###############################################################################
5
5
# OpenLP - Open Source Lyrics Projection                                      #
6
6
# --------------------------------------------------------------------------- #
7
 
# Copyright (c) 2008-2015 OpenLP Developers                                   #
 
7
# Copyright (c) 2008-2016 OpenLP Developers                                   #
8
8
# --------------------------------------------------------------------------- #
9
9
# This program is free software; you can redistribute it and/or modify it     #
10
10
# under the terms of the GNU General Public License as published by the Free  #
20
20
# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
21
21
###############################################################################
22
22
 
23
 
from PyQt4 import QtGui
 
23
from PyQt5 import QtGui, QtWidgets
24
24
 
25
25
from openlp.core.common import Settings, UiStrings, translate
26
26
from openlp.core.lib import SettingsTab, build_icon
47
47
        """
48
48
        self.setObjectName('PresentationTab')
49
49
        super(PresentationTab, self).setupUi()
50
 
        self.controllers_group_box = QtGui.QGroupBox(self.left_column)
 
50
        self.controllers_group_box = QtWidgets.QGroupBox(self.left_column)
51
51
        self.controllers_group_box.setObjectName('controllers_group_box')
52
 
        self.controllers_layout = QtGui.QVBoxLayout(self.controllers_group_box)
 
52
        self.controllers_layout = QtWidgets.QVBoxLayout(self.controllers_group_box)
53
53
        self.controllers_layout.setObjectName('ccontrollers_layout')
54
54
        self.presenter_check_boxes = {}
55
55
        for key in self.controllers:
56
56
            controller = self.controllers[key]
57
 
            checkbox = QtGui.QCheckBox(self.controllers_group_box)
 
57
            checkbox = QtWidgets.QCheckBox(self.controllers_group_box)
58
58
            checkbox.setObjectName(controller.name + 'CheckBox')
59
59
            self.presenter_check_boxes[controller.name] = checkbox
60
60
            self.controllers_layout.addWidget(checkbox)
61
61
        self.left_layout.addWidget(self.controllers_group_box)
62
62
        # Advanced
63
 
        self.advanced_group_box = QtGui.QGroupBox(self.left_column)
 
63
        self.advanced_group_box = QtWidgets.QGroupBox(self.left_column)
64
64
        self.advanced_group_box.setObjectName('advanced_group_box')
65
 
        self.advanced_layout = QtGui.QVBoxLayout(self.advanced_group_box)
 
65
        self.advanced_layout = QtWidgets.QVBoxLayout(self.advanced_group_box)
66
66
        self.advanced_layout.setObjectName('advanced_layout')
67
 
        self.override_app_check_box = QtGui.QCheckBox(self.advanced_group_box)
 
67
        self.override_app_check_box = QtWidgets.QCheckBox(self.advanced_group_box)
68
68
        self.override_app_check_box.setObjectName('override_app_check_box')
69
69
        self.advanced_layout.addWidget(self.override_app_check_box)
70
70
        self.left_layout.addWidget(self.advanced_group_box)
71
71
        # PowerPoint
72
 
        self.powerpoint_group_box = QtGui.QGroupBox(self.left_column)
 
72
        self.powerpoint_group_box = QtWidgets.QGroupBox(self.left_column)
73
73
        self.powerpoint_group_box.setObjectName('powerpoint_group_box')
74
 
        self.powerpoint_layout = QtGui.QVBoxLayout(self.powerpoint_group_box)
 
74
        self.powerpoint_layout = QtWidgets.QVBoxLayout(self.powerpoint_group_box)
75
75
        self.powerpoint_layout.setObjectName('powerpoint_layout')
76
 
        self.ppt_slide_click_check_box = QtGui.QCheckBox(self.powerpoint_group_box)
 
76
        self.ppt_slide_click_check_box = QtWidgets.QCheckBox(self.powerpoint_group_box)
77
77
        self.ppt_slide_click_check_box.setObjectName('ppt_slide_click_check_box')
78
78
        self.powerpoint_layout.addWidget(self.ppt_slide_click_check_box)
79
 
        self.ppt_window_check_box = QtGui.QCheckBox(self.powerpoint_group_box)
 
79
        self.ppt_window_check_box = QtWidgets.QCheckBox(self.powerpoint_group_box)
80
80
        self.ppt_window_check_box.setObjectName('ppt_window_check_box')
81
81
        self.powerpoint_layout.addWidget(self.ppt_window_check_box)
82
82
        self.left_layout.addWidget(self.powerpoint_group_box)
83
83
        # Pdf options
84
 
        self.pdf_group_box = QtGui.QGroupBox(self.left_column)
 
84
        self.pdf_group_box = QtWidgets.QGroupBox(self.left_column)
85
85
        self.pdf_group_box.setObjectName('pdf_group_box')
86
 
        self.pdf_layout = QtGui.QFormLayout(self.pdf_group_box)
 
86
        self.pdf_layout = QtWidgets.QFormLayout(self.pdf_group_box)
87
87
        self.pdf_layout.setObjectName('pdf_layout')
88
 
        self.pdf_program_check_box = QtGui.QCheckBox(self.pdf_group_box)
 
88
        self.pdf_program_check_box = QtWidgets.QCheckBox(self.pdf_group_box)
89
89
        self.pdf_program_check_box.setObjectName('pdf_program_check_box')
90
90
        self.pdf_layout.addRow(self.pdf_program_check_box)
91
 
        self.pdf_program_path_layout = QtGui.QHBoxLayout()
 
91
        self.pdf_program_path_layout = QtWidgets.QHBoxLayout()
92
92
        self.pdf_program_path_layout.setObjectName('pdf_program_path_layout')
93
 
        self.pdf_program_path = QtGui.QLineEdit(self.pdf_group_box)
 
93
        self.pdf_program_path = QtWidgets.QLineEdit(self.pdf_group_box)
94
94
        self.pdf_program_path.setObjectName('pdf_program_path')
95
95
        self.pdf_program_path.setReadOnly(True)
96
96
        self.pdf_program_path.setPalette(self.get_grey_text_palette(True))
97
97
        self.pdf_program_path_layout.addWidget(self.pdf_program_path)
98
 
        self.pdf_program_browse_button = QtGui.QToolButton(self.pdf_group_box)
 
98
        self.pdf_program_browse_button = QtWidgets.QToolButton(self.pdf_group_box)
99
99
        self.pdf_program_browse_button.setObjectName('pdf_program_browse_button')
100
100
        self.pdf_program_browse_button.setIcon(build_icon(':/general/general_open.png'))
101
101
        self.pdf_program_browse_button.setEnabled(False)
103
103
        self.pdf_layout.addRow(self.pdf_program_path_layout)
104
104
        self.left_layout.addWidget(self.pdf_group_box)
105
105
        self.left_layout.addStretch()
106
 
        self.right_column.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
 
106
        self.right_column.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
107
107
        self.right_layout.addStretch()
108
108
        # Signals and slots
109
109
        self.pdf_program_browse_button.clicked.connect(self.on_pdf_program_browse_button_clicked)
231
231
        """
232
232
        Select the mudraw or ghostscript binary that should be used.
233
233
        """
234
 
        filename = QtGui.QFileDialog.getOpenFileName(self, translate('PresentationPlugin.PresentationTab',
235
 
                                                                     'Select mudraw or ghostscript binary.'),
236
 
                                                     self.pdf_program_path.text())
 
234
        filename, filter_used = QtWidgets.QFileDialog.getOpenFileName(
 
235
            self, translate('PresentationPlugin.PresentationTab', 'Select mudraw or ghostscript binary.'),
 
236
            self.pdf_program_path.text())
237
237
        if filename:
238
238
            program_type = PdfController.check_binary(filename)
239
239
            if not program_type: