raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge errors

This commit is contained in:
Tim Bentley 2011-01-09 13:54:40 +00:00
parent c63fc9dfc8
commit c4891f27ed
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/__init__.py
View File

@ -316,7 +316,7 @@ def check_directory_exists(dir):
""" """
log.debug(u'check_directory_exists') log.debug(u'check_directory_exists')
if not os.path.exists(dir): if not os.path.exists(dir):
os.mkdir(dir) os.makedirs(dir)
from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \ from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
BackgroundType, HorizontalType, VerticalType BackgroundType, HorizontalType, VerticalType

16
openlp/core/ui/displaytagtab.py
View File

@ -166,14 +166,14 @@ class DisplayTagTab(SettingsTab):
self.defaultPushButton.setText( self.defaultPushButton.setText(
translate('OpenLP.DisplayTagTab', 'Default')) translate('OpenLP.DisplayTagTab', 'Default'))
self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New')) self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New'))
self.tagTableWidget.horizontalHeaderItem(0). \ self.tagTableWidget.horizontalHeaderItem(0)\
setText(translate('OpenLP.DisplayTagTab', 'Description')) .setText(translate('OpenLP.DisplayTagTab', 'Description'))
self.tagTableWidget.horizontalHeaderItem(1). \ self.tagTableWidget.horizontalHeaderItem(1)\
setText(translate('OpenLP.DisplayTagTab', 'Tag id')) .setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
self.tagTableWidget.horizontalHeaderItem(2). \ self.tagTableWidget.horizontalHeaderItem(2)\
setText(translate('OpenLP.DisplayTagTab', 'Start Html')) .setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
self.tagTableWidget.horizontalHeaderItem(3). \ self.tagTableWidget.horizontalHeaderItem(3)\
setText(translate('OpenLP.DisplayTagTab', 'End Html')) .setText(translate('OpenLP.DisplayTagTab', 'End Html'))
QtCore.QMetaObject.connectSlotsByName(self.displayTagEdit) QtCore.QMetaObject.connectSlotsByName(self.displayTagEdit)
self.tagTableWidget.setColumnWidth(0, 120) self.tagTableWidget.setColumnWidth(0, 120)
self.tagTableWidget.setColumnWidth(1, 40) self.tagTableWidget.setColumnWidth(1, 40)

1
openlp/core/ui/maindisplay.py
View File

@ -105,7 +105,6 @@ class MainDisplay(DisplayWidget):
self.hideMode = None self.hideMode = None
mainIcon = build_icon(u':/icon/openlp-logo-16x16.png') mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
self.setWindowIcon(mainIcon) self.setWindowIcon(mainIcon)
self.setWindowTitle(u'OpenLP Display')
self.retranslateUi() self.retranslateUi()
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;') self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | self.setWindowFlags(QtCore.Qt.FramelessWindowHint |

6
openlp/core/ui/settingsform.py
View File

@ -55,9 +55,9 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
# Advanced tab # Advanced tab
self.advancedTab = AdvancedTab() self.advancedTab = AdvancedTab()
self.addTab(u'Advanced', self.advancedTab) self.addTab(u'Advanced', self.advancedTab)
# Edit Tags tab # Edit Display Tags tab
displayTagTab = DisplayTagTab() self.displayTagTab = DisplayTagTab()
self.addTab(u'Display Tags', displayTagTab) self.addTab(u'Display Tags', self.displayTagTab)
def addTab(self, name, tab): def addTab(self, name, tab):
""" """