forked from openlp/openlp
14.02.2011
This commit is contained in:
parent
35ef04697a
commit
cafd7b397d
@ -140,18 +140,18 @@ class SongImportForm(OpenLPWizard):
|
|||||||
QtCore.QObject.connect(self.songBeamerRemoveButton,
|
QtCore.QObject.connect(self.songBeamerRemoveButton,
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
self.onSongBeamerRemoveButtonClicked)
|
self.onSongBeamerRemoveButtonClicked)
|
||||||
QtCore.QObject.connect(self.foilPresenterAddButton,
|
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
|
||||||
self.onFoilPresenterAddButtonClicked),
|
|
||||||
QtCore.QObject.connect(self.foilPresenterRemoveButton,
|
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
|
||||||
self.onFoilPresenterRemoveButtonClicked)
|
|
||||||
QtCore.QObject.connect(self.songShowPlusAddButton,
|
QtCore.QObject.connect(self.songShowPlusAddButton,
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
self.onSongShowPlusAddButtonClicked)
|
self.onSongShowPlusAddButtonClicked)
|
||||||
QtCore.QObject.connect(self.songShowPlusRemoveButton,
|
QtCore.QObject.connect(self.songShowPlusRemoveButton,
|
||||||
QtCore.SIGNAL(u'clicked()'),
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
self.onSongShowPlusRemoveButtonClicked)
|
self.onSongShowPlusRemoveButtonClicked)
|
||||||
|
QtCore.QObject.connect(self.foilPresenterAddButton,
|
||||||
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
|
self.onFoilPresenterAddButtonClicked)
|
||||||
|
QtCore.QObject.connect(self.foilPresenterRemoveButton,
|
||||||
|
QtCore.SIGNAL(u'clicked()'),
|
||||||
|
self.onFoilPresenterRemoveButtonClicked)
|
||||||
|
|
||||||
def addCustomPages(self):
|
def addCustomPages(self):
|
||||||
"""
|
"""
|
||||||
@ -200,10 +200,10 @@ class SongImportForm(OpenLPWizard):
|
|||||||
self.addFileSelectItem(u'ew', single_select=True)
|
self.addFileSelectItem(u'ew', single_select=True)
|
||||||
# Words of Worship
|
# Words of Worship
|
||||||
self.addFileSelectItem(u'songBeamer')
|
self.addFileSelectItem(u'songBeamer')
|
||||||
# Foilpresenter
|
|
||||||
self.addFileSelectItem(u'foilPresenter')
|
|
||||||
# Song Show Plus
|
# Song Show Plus
|
||||||
self.addFileSelectItem(u'songShowPlus')
|
self.addFileSelectItem(u'songShowPlus')
|
||||||
|
# Foilpresenter
|
||||||
|
self.addFileSelectItem(u'foilPresenter')
|
||||||
# Commented out for future use.
|
# Commented out for future use.
|
||||||
# self.addFileSelectItem(u'csv', u'CSV', single_select=True)
|
# self.addFileSelectItem(u'csv', u'CSV', single_select=True)
|
||||||
self.sourceLayout.addLayout(self.formatStack)
|
self.sourceLayout.addLayout(self.formatStack)
|
||||||
@ -475,6 +475,7 @@ class SongImportForm(OpenLPWizard):
|
|||||||
'You need to add at least one SongShow Plus '
|
'You need to add at least one SongShow Plus '
|
||||||
'file to import from.'))
|
'file to import from.'))
|
||||||
self.wordsOfWorshipAddButton.setFocus()
|
self.wordsOfWorshipAddButton.setFocus()
|
||||||
|
return False
|
||||||
elif source_format == SongFormat.FoilPresenter:
|
elif source_format == SongFormat.FoilPresenter:
|
||||||
if self.foilPresenterFileListWidget.count() == 0:
|
if self.foilPresenterFileListWidget.count() == 0:
|
||||||
criticalErrorMessageBox(
|
criticalErrorMessageBox(
|
||||||
|
@ -34,11 +34,8 @@ from wowimport import WowImport
|
|||||||
from cclifileimport import CCLIFileImport
|
from cclifileimport import CCLIFileImport
|
||||||
from ewimport import EasyWorshipSongImport
|
from ewimport import EasyWorshipSongImport
|
||||||
from songbeamerimport import SongBeamerImport
|
from songbeamerimport import SongBeamerImport
|
||||||
<<<<<<< TREE
|
|
||||||
from foilpresenterimport import FoilPresenterImport
|
|
||||||
=======
|
|
||||||
from songshowplusimport import SongShowPlusImport
|
from songshowplusimport import SongShowPlusImport
|
||||||
>>>>>>> MERGE-SOURCE
|
from foilpresenterimport import FoilPresenterImport
|
||||||
# Imports that might fail
|
# Imports that might fail
|
||||||
try:
|
try:
|
||||||
from olp1import import OpenLP1SongImport
|
from olp1import import OpenLP1SongImport
|
||||||
|
Loading…
Reference in New Issue
Block a user