← Back to branch summary

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

« back to all changes in this revision

Viewing changes to openlp/plugins/custom/lib/customtab.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/custom/lib/customtab.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  #
24
24
for the Custom Slides plugin, which is inserted into the configuration dialog.
25
25
"""
26
26
 
27
 
from PyQt4 import QtCore, QtGui
 
27
from PyQt5 import QtCore, QtWidgets
28
28
 
29
29
from openlp.core.common import Settings, translate
30
30
from openlp.core.lib import SettingsTab
40
40
    def setupUi(self):
41
41
        self.setObjectName('CustomTab')
42
42
        super(CustomTab, self).setupUi()
43
 
        self.custom_mode_group_box = QtGui.QGroupBox(self.left_column)
 
43
        self.custom_mode_group_box = QtWidgets.QGroupBox(self.left_column)
44
44
        self.custom_mode_group_box.setObjectName('custom_mode_group_box')
45
 
        self.custom_mode_layout = QtGui.QFormLayout(self.custom_mode_group_box)
 
45
        self.custom_mode_layout = QtWidgets.QFormLayout(self.custom_mode_group_box)
46
46
        self.custom_mode_layout.setObjectName('custom_mode_layout')
47
 
        self.display_footer_check_box = QtGui.QCheckBox(self.custom_mode_group_box)
 
47
        self.display_footer_check_box = QtWidgets.QCheckBox(self.custom_mode_group_box)
48
48
        self.display_footer_check_box.setObjectName('display_footer_check_box')
49
49
        self.custom_mode_layout.addRow(self.display_footer_check_box)
50
 
        self.add_from_service_checkbox = QtGui.QCheckBox(self.custom_mode_group_box)
 
50
        self.add_from_service_checkbox = QtWidgets.QCheckBox(self.custom_mode_group_box)
51
51
        self.add_from_service_checkbox.setObjectName('add_from_service_checkbox')
52
52
        self.custom_mode_layout.addRow(self.add_from_service_checkbox)
53
53
        self.left_layout.addWidget(self.custom_mode_group_box)