← Back to branch summary

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

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/forms/authorsdialog.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/songs/forms/authorsdialog.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 QtWidgets
24
24
 
25
25
from openlp.core.lib import translate, build_icon
26
26
from openlp.core.lib.ui import create_button_box
39
39
        authors_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
40
40
        authors_dialog.resize(300, 10)
41
41
        authors_dialog.setModal(True)
42
 
        self.dialog_layout = QtGui.QVBoxLayout(authors_dialog)
 
42
        self.dialog_layout = QtWidgets.QVBoxLayout(authors_dialog)
43
43
        self.dialog_layout.setObjectName('dialog_layout')
44
 
        self.author_layout = QtGui.QFormLayout()
 
44
        self.author_layout = QtWidgets.QFormLayout()
45
45
        self.author_layout.setObjectName('author_layout')
46
 
        self.first_name_label = QtGui.QLabel(authors_dialog)
 
46
        self.first_name_label = QtWidgets.QLabel(authors_dialog)
47
47
        self.first_name_label.setObjectName('first_name_label')
48
 
        self.first_name_edit = QtGui.QLineEdit(authors_dialog)
 
48
        self.first_name_edit = QtWidgets.QLineEdit(authors_dialog)
49
49
        self.first_name_edit.setObjectName('first_name_edit')
50
50
        self.first_name_label.setBuddy(self.first_name_edit)
51
51
        self.author_layout.addRow(self.first_name_label, self.first_name_edit)
52
 
        self.last_name_label = QtGui.QLabel(authors_dialog)
 
52
        self.last_name_label = QtWidgets.QLabel(authors_dialog)
53
53
        self.last_name_label.setObjectName('last_name_label')
54
 
        self.last_name_edit = QtGui.QLineEdit(authors_dialog)
 
54
        self.last_name_edit = QtWidgets.QLineEdit(authors_dialog)
55
55
        self.last_name_edit.setObjectName('last_name_edit')
56
56
        self.last_name_label.setBuddy(self.last_name_edit)
57
57
        self.author_layout.addRow(self.last_name_label, self.last_name_edit)
58
 
        self.display_label = QtGui.QLabel(authors_dialog)
 
58
        self.display_label = QtWidgets.QLabel(authors_dialog)
59
59
        self.display_label.setObjectName('display_label')
60
 
        self.display_edit = QtGui.QLineEdit(authors_dialog)
 
60
        self.display_edit = QtWidgets.QLineEdit(authors_dialog)
61
61
        self.display_edit.setObjectName('display_edit')
62
62
        self.display_label.setBuddy(self.display_edit)
63
63
        self.author_layout.addRow(self.display_label, self.display_edit)