diff --git a/openlp/core/ui/displaytagdialog.py b/openlp/core/ui/displaytagdialog.py
index 3e76b39d2..5da529302 100644
--- a/openlp/core/ui/displaytagdialog.py
+++ b/openlp/core/ui/displaytagdialog.py
@@ -29,171 +29,29 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, build_icon
from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
-try:
- _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
- _fromUtf8 = lambda s: s
-
class Ui_DisplayTagDialog(object):
def setupUi(self, displayTagDialog):
-# displayTagDialog.setObjectName(u'displayTagDialog')
-# displayTagDialog.resize(700, 500)
-# displayTagDialog.setWindowIcon(
-# build_icon(u':/system/system_settings.png'))
-# self.settingsLayout = QtGui.QVBoxLayout(displayTagDialog)
-# self.settingsLayout.setObjectName(u'settingsLayout')
-# self.editGroupBox = QtGui.QGroupBox(displayTagDialog)
-# self.editGroupBox.setGeometry(QtCore.QRect(10, 220, 650, 181))
-# self.editGroupBox.setObjectName(u'editGroupBox')
-# self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
-# self.updatePushButton.setGeometry(QtCore.QRect(550, 140, 71, 26))
-# self.updatePushButton.setObjectName(u'updatePushButton')
-# self.layoutWidget = QtGui.QWidget(self.editGroupBox)
-# self.layoutWidget.setGeometry(QtCore.QRect(5, 20, 571, 114))
-# self.layoutWidget.setObjectName(u'layoutWidget')
-# self.formLayout = QtGui.QFormLayout(self.layoutWidget)
-# self.formLayout.setObjectName(u'formLayout')
-# self.descriptionLabel = QtGui.QLabel(self.layoutWidget)
-# self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
-# self.descriptionLabel.setObjectName(u'descriptionLabel')
-# self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-# self.descriptionLabel)
-# self.descriptionLineEdit = QtGui.QLineEdit(self.layoutWidget)
-# self.descriptionLineEdit.setObjectName(u'descriptionLineEdit')
-# self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-# self.descriptionLineEdit)
-# self.tagLabel = QtGui.QLabel(self.layoutWidget)
-# self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
-# self.tagLabel.setObjectName(u'tagLabel')
-# self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.tagLabel)
-# self.tagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-# self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
-# self.tagLineEdit.setMaxLength(5)
-# self.tagLineEdit.setObjectName(u'tagLineEdit')
-# self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
-# self.tagLineEdit)
-# self.startTagLabel = QtGui.QLabel(self.layoutWidget)
-# self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
-# self.startTagLabel.setObjectName(u'startTagLabel')
-# self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
-# self.startTagLabel)
-# self.startTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-# self.startTagLineEdit.setObjectName(u'startTagLineEdit')
-# self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
-# self.startTagLineEdit)
-# self.endTagLabel = QtGui.QLabel(self.layoutWidget)
-# self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
-# self.endTagLabel.setObjectName(u'endTagLabel')
-# self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
-# self.endTagLabel)
-# self.endTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
-# self.endTagLineEdit.setObjectName(u'endTagLineEdit')
-# self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
-# self.endTagLineEdit)
-# self.defaultPushButton = QtGui.QPushButton(displayTagDialog)
-# self.defaultPushButton.setGeometry(QtCore.QRect(430, 188, 71, 26))
-# self.defaultPushButton.setObjectName(u'updatePushButton')
-# self.deletePushButton = QtGui.QPushButton(displayTagDialog)
-# self.deletePushButton.setGeometry(QtCore.QRect(510, 188, 71, 26))
-# self.deletePushButton.setObjectName(u'deletePushButton')
-# self.newPushButton = QtGui.QPushButton(displayTagDialog)
-# self.newPushButton.setGeometry(QtCore.QRect(600, 188, 71, 26))
-# self.newPushButton.setObjectName(u'newPushButton')
-# self.tagTableWidget = QtGui.QTableWidget(displayTagDialog)
-# self.tagTableWidget.setGeometry(QtCore.QRect(10, 10, 650, 171))
-# self.tagTableWidget.setHorizontalScrollBarPolicy(
-# QtCore.Qt.ScrollBarAlwaysOff)
-# self.tagTableWidget.setEditTriggers(
-# QtGui.QAbstractItemView.NoEditTriggers)
-# self.tagTableWidget.setAlternatingRowColors(True)
-# self.tagTableWidget.setSelectionMode(
-# QtGui.QAbstractItemView.SingleSelection)
-# self.tagTableWidget.setSelectionBehavior(
-# QtGui.QAbstractItemView.SelectRows)
-# self.tagTableWidget.setCornerButtonEnabled(False)
-# self.tagTableWidget.setObjectName(u'tagTableWidget')
-# self.tagTableWidget.setColumnCount(4)
-# self.tagTableWidget.setRowCount(0)
-# item = QtGui.QTableWidgetItem()
-# self.tagTableWidget.setHorizontalHeaderItem(0, item)
-# item = QtGui.QTableWidgetItem()
-# self.tagTableWidget.setHorizontalHeaderItem(1, item)
-# item = QtGui.QTableWidgetItem()
-# self.tagTableWidget.setHorizontalHeaderItem(2, item)
-# item = QtGui.QTableWidgetItem()
-# self.tagTableWidget.setHorizontalHeaderItem(3, item)
-#
-# self.buttonBox = create_accept_reject_button_box(displayTagDialog, True)
-# self.settingsLayout.addWidget(self.buttonBox)
-# self.retranslateUi(displayTagDialog)
-# QtCore.QMetaObject.connectSlotsByName(displayTagDialog)
- displayTagDialog.setObjectName(_fromUtf8("displayTagDialog"))
- displayTagDialog.resize(717, 554)
- self.editGroupBox = QtGui.QGroupBox(displayTagDialog)
- self.editGroupBox.setGeometry(QtCore.QRect(10, 320, 691, 181))
- self.editGroupBox.setObjectName(_fromUtf8("editGroupBox"))
- self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
- self.updatePushButton.setGeometry(QtCore.QRect(600, 140, 73, 26))
- self.updatePushButton.setObjectName(_fromUtf8("updatePushButton"))
- self.layoutWidget = QtGui.QWidget(self.editGroupBox)
- self.layoutWidget.setGeometry(QtCore.QRect(20, 50, 571, 114))
- self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
- self.formLayout = QtGui.QFormLayout(self.layoutWidget)
- self.formLayout.setMargin(0)
- self.formLayout.setObjectName(_fromUtf8("formLayout"))
- self.descriptionLabel = QtGui.QLabel(self.layoutWidget)
- self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.descriptionLabel.setObjectName(_fromUtf8("descriptionLabel"))
- self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.descriptionLabel)
- self.descriptionLineEdit = QtGui.QLineEdit(self.layoutWidget)
- self.descriptionLineEdit.setObjectName(_fromUtf8("descriptionLineEdit"))
- self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.descriptionLineEdit)
- self.tagLabel = QtGui.QLabel(self.layoutWidget)
- self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.tagLabel.setObjectName(_fromUtf8("tagLabel"))
- self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.tagLabel)
- self.tagLineEdit = QtGui.QLineEdit(self.layoutWidget)
- self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
- self.tagLineEdit.setMaxLength(5)
- self.tagLineEdit.setObjectName(_fromUtf8("tagLineEdit"))
- self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.tagLineEdit)
- self.startTagLabel = QtGui.QLabel(self.layoutWidget)
- self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.startTagLabel.setObjectName(_fromUtf8("startTagLabel"))
- self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.startTagLabel)
- self.startTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
- self.startTagLineEdit.setObjectName(_fromUtf8("startTagLineEdit"))
- self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.startTagLineEdit)
- self.endTagLabel = QtGui.QLabel(self.layoutWidget)
- self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.endTagLabel.setObjectName(_fromUtf8("endTagLabel"))
- self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.endTagLabel)
- self.endTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
- self.endTagLineEdit.setObjectName(_fromUtf8("endTagLineEdit"))
- self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.endTagLineEdit)
- self.addPushButton = QtGui.QPushButton(self.editGroupBox)
- self.addPushButton.setGeometry(QtCore.QRect(600, 40, 71, 26))
- self.addPushButton.setObjectName(_fromUtf8("addPushButton"))
- self.newPushButton = QtGui.QPushButton(self.editGroupBox)
- self.newPushButton.setGeometry(QtCore.QRect(600, 70, 71, 26))
- self.newPushButton.setObjectName(_fromUtf8("newPushButton"))
- self.buttonBox = QtGui.QDialogButtonBox(displayTagDialog)
- self.buttonBox.setGeometry(QtCore.QRect(540, 510, 162, 26))
- self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
- self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
- self.deletePushButton = QtGui.QPushButton(displayTagDialog)
- self.deletePushButton.setGeometry(QtCore.QRect(630, 280, 71, 26))
- self.deletePushButton.setObjectName(_fromUtf8("deletePushButton"))
- self.tagTableWidget = QtGui.QTableWidget(displayTagDialog)
- self.tagTableWidget.setGeometry(QtCore.QRect(10, 10, 691, 271))
- self.tagTableWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
- self.tagTableWidget.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+ displayTagDialog.setObjectName(u'displayTagDialog')
+ displayTagDialog.resize(725, 548)
+ self.widget = QtGui.QWidget(displayTagDialog)
+ self.widget.setGeometry(QtCore.QRect(10, 10, 701, 521))
+ self.widget.setObjectName(u'widget')
+ self.listdataGridLayout = QtGui.QGridLayout(self.widget)
+ self.listdataGridLayout.setMargin(0)
+ self.listdataGridLayout.setObjectName(u'listdataGridLayout')
+ self.tagTableWidget = QtGui.QTableWidget(self.widget)
+ self.tagTableWidget.setHorizontalScrollBarPolicy(
+ QtCore.Qt.ScrollBarAlwaysOff)
+ self.tagTableWidget.setEditTriggers(
+ QtGui.QAbstractItemView.NoEditTriggers)
self.tagTableWidget.setAlternatingRowColors(True)
- self.tagTableWidget.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
- self.tagTableWidget.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+ self.tagTableWidget.setSelectionMode(
+ QtGui.QAbstractItemView.SingleSelection)
+ self.tagTableWidget.setSelectionBehavior(
+ QtGui.QAbstractItemView.SelectRows)
self.tagTableWidget.setCornerButtonEnabled(False)
- self.tagTableWidget.setObjectName(_fromUtf8("tagTableWidget"))
+ self.tagTableWidget.setObjectName(u'tagTableWidget')
self.tagTableWidget.setColumnCount(4)
self.tagTableWidget.setRowCount(0)
item = QtGui.QTableWidgetItem()
@@ -204,9 +62,62 @@ class Ui_DisplayTagDialog(object):
self.tagTableWidget.setHorizontalHeaderItem(2, item)
item = QtGui.QTableWidgetItem()
self.tagTableWidget.setHorizontalHeaderItem(3, item)
- self.defaultPushButton = QtGui.QPushButton(displayTagDialog)
- self.defaultPushButton.setGeometry(QtCore.QRect(550, 280, 71, 26))
- self.defaultPushButton.setObjectName(_fromUtf8("defaultPushButton"))
+ self.listdataGridLayout.addWidget(self.tagTableWidget, 0, 0, 1, 1)
+ self.horizontalLayout = QtGui.QHBoxLayout()
+ self.horizontalLayout.setObjectName(u'horizontalLayout')
+ spacerItem = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout.addItem(spacerItem)
+ self.defaultPushButton = QtGui.QPushButton(self.widget)
+ self.defaultPushButton.setObjectName(u'defaultPushButton')
+ self.horizontalLayout.addWidget(self.defaultPushButton)
+ self.deletePushButton = QtGui.QPushButton(self.widget)
+ self.deletePushButton.setObjectName(u'deletePushButton')
+ self.horizontalLayout.addWidget(self.deletePushButton)
+ self.listdataGridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1)
+ self.editGroupBox = QtGui.QGroupBox(self.widget)
+ self.editGroupBox.setObjectName(u'editGroupBox')
+ self.dataGridLayout = QtGui.QGridLayout(self.editGroupBox)
+ self.dataGridLayout.setObjectName(u'dataGridLayout')
+ self.descriptionLabel = QtGui.QLabel(self.editGroupBox)
+ self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
+ self.descriptionLabel.setObjectName(u'descriptionLabel')
+ self.dataGridLayout.addWidget(self.descriptionLabel, 0, 0, 1, 1)
+ self.descriptionLineEdit = QtGui.QLineEdit(self.editGroupBox)
+ self.descriptionLineEdit.setObjectName(u'descriptionLineEdit')
+ self.dataGridLayout.addWidget(self.descriptionLineEdit, 0, 1, 2, 1)
+ self.newPushButton = QtGui.QPushButton(self.editGroupBox)
+ self.newPushButton.setObjectName(u'newPushButton')
+ self.dataGridLayout.addWidget(self.newPushButton, 0, 2, 2, 1)
+ self.tagLabel = QtGui.QLabel(self.editGroupBox)
+ self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
+ self.tagLabel.setObjectName(u'tagLabel')
+ self.dataGridLayout.addWidget(self.tagLabel, 2, 0, 1, 1)
+ self.tagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+ self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
+ self.tagLineEdit.setMaxLength(5)
+ self.tagLineEdit.setObjectName(u'tagLineEdit')
+ self.dataGridLayout.addWidget(self.tagLineEdit, 2, 1, 1, 1)
+ self.startTagLabel = QtGui.QLabel(self.editGroupBox)
+ self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+ self.startTagLabel.setObjectName(u'startTagLabel')
+ self.dataGridLayout.addWidget(self.startTagLabel, 3, 0, 1, 1)
+ self.startTagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+ self.startTagLineEdit.setObjectName(u'startTagLineEdit')
+ self.dataGridLayout.addWidget(self.startTagLineEdit, 3, 1, 1, 1)
+ self.endTagLabel = QtGui.QLabel(self.editGroupBox)
+ self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+ self.endTagLabel.setObjectName(u'endTagLabel')
+ self.dataGridLayout.addWidget(self.endTagLabel, 4, 0, 1, 1)
+ self.endTagLineEdit = QtGui.QLineEdit(self.editGroupBox)
+ self.endTagLineEdit.setObjectName(u'endTagLineEdit')
+ self.dataGridLayout.addWidget(self.endTagLineEdit, 4, 1, 1, 1)
+ self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
+ self.updatePushButton.setObjectName(u'updatePushButton')
+ self.dataGridLayout.addWidget(self.updatePushButton, 4, 2, 1, 1)
+ self.listdataGridLayout.addWidget(self.editGroupBox, 2, 0, 1, 1)
+ self.buttonBox = create_accept_reject_button_box(displayTagDialog)
+ self.listdataGridLayout.addWidget(self.buttonBox, 3, 0, 1, 1)
self.retranslateUi(displayTagDialog)
QtCore.QMetaObject.connectSlotsByName(displayTagDialog)
@@ -228,33 +139,15 @@ class Ui_DisplayTagDialog(object):
self.defaultPushButton.setText(
translate('OpenLP.DisplayTagTab', 'Default'))
self.newPushButton.setText(UiStrings.New)
- self.tagTableWidget.horizontalHeaderItem(0)\
+ self.tagTableWidget.horizontalHeaderItem(0) \
.setText(translate('OpenLP.DisplayTagTab', 'Description'))
- self.tagTableWidget.horizontalHeaderItem(1)\
+ self.tagTableWidget.horizontalHeaderItem(1) \
.setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
- self.tagTableWidget.horizontalHeaderItem(2)\
+ self.tagTableWidget.horizontalHeaderItem(2) \
.setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
- self.tagTableWidget.horizontalHeaderItem(3)\
+ self.tagTableWidget.horizontalHeaderItem(3) \
.setText(translate('OpenLP.DisplayTagTab', 'End Html'))
self.tagTableWidget.setColumnWidth(0, 120)
self.tagTableWidget.setColumnWidth(1, 40)
self.tagTableWidget.setColumnWidth(2, 240)
- self.tagTableWidget.setColumnWidth(3, 200)
-
- displayTagDialog.setWindowTitle(QtGui.QApplication.translate("displayTagDialog", "Form", None, QtGui.QApplication.UnicodeUTF8))
- self.editGroupBox.setTitle(QtGui.QApplication.translate("displayTagDialog", "Edit Selection", None, QtGui.QApplication.UnicodeUTF8))
- self.updatePushButton.setText(QtGui.QApplication.translate("displayTagDialog", "Update", None, QtGui.QApplication.UnicodeUTF8))
- self.descriptionLabel.setText(QtGui.QApplication.translate("displayTagDialog", "Description", None, QtGui.QApplication.UnicodeUTF8))
- self.tagLabel.setText(QtGui.QApplication.translate("displayTagDialog", "Tag", None, QtGui.QApplication.UnicodeUTF8))
- self.startTagLabel.setText(QtGui.QApplication.translate("displayTagDialog", "Start tag", None, QtGui.QApplication.UnicodeUTF8))
- self.endTagLabel.setText(QtGui.QApplication.translate("displayTagDialog", "End tag", None, QtGui.QApplication.UnicodeUTF8))
- self.addPushButton.setText(QtGui.QApplication.translate("displayTagDialog", "Add", None, QtGui.QApplication.UnicodeUTF8))
- self.newPushButton.setText(QtGui.QApplication.translate("displayTagDialog", "New", None, QtGui.QApplication.UnicodeUTF8))
- self.deletePushButton.setText(QtGui.QApplication.translate("displayTagDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8))
- self.tagTableWidget.horizontalHeaderItem(0).setText(QtGui.QApplication.translate("displayTagDialog", "Description", None, QtGui.QApplication.UnicodeUTF8))
- self.tagTableWidget.horizontalHeaderItem(1).setText(QtGui.QApplication.translate("displayTagDialog", "Key", None, QtGui.QApplication.UnicodeUTF8))
- self.tagTableWidget.horizontalHeaderItem(2).setText(QtGui.QApplication.translate("displayTagDialog", "Start Tag", None, QtGui.QApplication.UnicodeUTF8))
- self.tagTableWidget.horizontalHeaderItem(3).setText(QtGui.QApplication.translate("displayTagDialog", "End Tag", None, QtGui.QApplication.UnicodeUTF8))
- self.defaultPushButton.setText(QtGui.QApplication.translate("displayTagDialog", "Default", None, QtGui.QApplication.UnicodeUTF8))
-
-
+ self.tagTableWidget.setColumnWidth(3, 240)
diff --git a/openlp/core/ui/displaytagform.py b/openlp/core/ui/displaytagform.py
index 491c60693..48924759f 100644
--- a/openlp/core/ui/displaytagform.py
+++ b/openlp/core/ui/displaytagform.py
@@ -63,6 +63,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
Load Display and set field state.
"""
# Create initial copy from master
+ self._resetTable()
DisplayTags.reset_html_tags()
user_expands = QtCore.QSettings().value(u'displayTags/html_tags',
QtCore.QVariant(u'')).toString()
@@ -102,7 +103,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
self.startTagLineEdit.setEnabled(False)
self.endTagLineEdit.setEnabled(False)
- def save(self):
+ def accept(self):
"""
Save Custom tags in a pickle .
"""
@@ -117,13 +118,14 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
else:
QtCore.QSettings().setValue(u'displayTags/html_tags',
QtCore.QVariant(u''))
+ return QtGui.QDialog.accept(self)
- def cancel(self):
+ def reject(self):
"""
Reset Custom tags from Settings.
"""
- self.preLoad()
self._resetTable()
+ return QtGui.QDialog.reject(self)
def onRowSelected(self):
"""
@@ -170,6 +172,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
self._resetTable()
# Highlight new row
self.tagTableWidget.selectRow(self.tagTableWidget.rowCount() - 1)
+ self.onRowSelected()
def onDefaultPushed(self):
"""
@@ -217,7 +220,6 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
"""
self.tagTableWidget.clearContents()
self.tagTableWidget.setRowCount(0)
- self.load()
def _strip(self, tag):
"""
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index f899a23ce..9071016e8 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -243,7 +243,7 @@ class Ui_MainWindow(object):
u'SettingsShortcutsItem',
u':/system/system_configure_shortcuts.png')
self.DisplayTagItem = icon_action(mainWindow,
- u'DisplayTagItem', u':/system/system_settings.png')
+ u'DisplayTagItem', u':/system/tag_editor.png')
self.SettingsConfigureItem = icon_action(mainWindow,
u'SettingsConfigureItem', u':/system/system_settings.png')
mainWindow.actionList.add_action(self.SettingsShortcutsItem,
diff --git a/resources/forms/displaytabdialog.ui b/resources/forms/displaytabdialog.ui
index 2e9c09c01..b181635be 100644
--- a/resources/forms/displaytabdialog.ui
+++ b/resources/forms/displaytabdialog.ui
@@ -6,228 +6,199 @@
0
0
- 717
- 554
+ 725
+ 548
Form
-
-
-
- 10
- 320
- 691
- 181
-
-
-
- Edit Selection
-
-
-
-
- 600
- 140
- 73
- 26
-
-
-
- Update
-
-
-
-
-
- 20
- 50
- 571
- 114
-
-
-
- -
-
-
- Description
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- -
-
-
- Tag
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
- 5
-
-
-
- -
-
-
- Start tag
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- -
-
-
- End tag
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
-
-
-
-
- 600
- 40
- 71
- 26
-
-
-
- Add
-
-
-
-
-
- 600
- 70
- 71
- 26
-
-
-
- New
-
-
-
-
-
-
- 540
- 510
- 162
- 26
-
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Save
-
-
-
-
-
- 630
- 280
- 71
- 26
-
-
-
- Delete
-
-
-
+
10
10
- 691
- 271
+ 701
+ 521
-
- Qt::ScrollBarAlwaysOff
-
-
- QAbstractItemView::NoEditTriggers
-
-
- true
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
-
- Description
-
-
-
-
- Key
-
-
- AlignHCenter|AlignVCenter|AlignCenter
-
-
-
-
- Start Tag
-
-
-
-
- End Tag
-
-
-
-
-
-
- 550
- 280
- 71
- 26
-
-
-
- Default
-
+
+ -
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ false
+
+
+
+ Description
+
+
+
+
+ Key
+
+
+ AlignHCenter|AlignVCenter|AlignCenter
+
+
+
+
+ Start Tag
+
+
+
+
+ End Tag
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Default
+
+
+
+ -
+
+
+ Delete
+
+
+
+
+
+ -
+
+
+ Edit Selection
+
+
+
-
+
+
+ Description
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Add
+
+
+
+ -
+
+
+ New
+
+
+
+ -
+
+
+ Tag
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ 5
+
+
+
+ -
+
+
+ Start tag
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ End tag
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ -
+
+
+ Update
+
+
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Save
+
+
+
+
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 745f20ebf..794e006d9 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -116,6 +116,7 @@
system_exit.png
settings_plugin_list.png
system_settings.png
+ tag_editor.png
system_configure.png
system_edit_copy.png
system_configure_shortcuts.png