From 06ff5ec618307e23e377b3ca964d5f2689cb11bc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 7 Aug 2009 18:19:32 +0100 Subject: [PATCH] New bible import form Start of default theme handling Add Transparent backgrounds --- openlp/core/lib/renderer.py | 73 +-- openlp/core/lib/themexmlhandler.py | 5 + openlp/core/ui/amendthemeform.py | 21 +- openlp/core/ui/thememanager.py | 9 +- .../plugins/bibles/forms/bibleimportdialog.py | 310 +++++----- resources/forms/bibleimportdialog.ui | 576 +++++++++--------- 6 files changed, 503 insertions(+), 491 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 068753a81..55c484d5e 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -267,41 +267,44 @@ class Renderer(object): log.debug(u'render background %s start', self._theme.background_type) painter = QtGui.QPainter() painter.begin(self._bg_frame) - if self._theme.background_type == u'solid': - painter.fillRect(self._frame.rect(), QtGui.QColor(self._theme.background_color)) - elif self._theme.background_type == u'gradient': - # gradient - gradient = None - if self._theme.background_direction == u'horizontal': - w = int(self._frame.width()) / 2 - # vertical - gradient = QtGui.QLinearGradient(w, 0, w, self._frame.height()) - elif self._theme.background_direction == u'vertical': - h = int(self._frame.height()) / 2 - # Horizontal - gradient = QtGui.QLinearGradient(0, h, self._frame.width(), h) - else: - w = int(self._frame.width()) / 2 - h = int(self._frame.height()) / 2 - # Circular - gradient = QtGui.QRadialGradient(w, h, w) - gradient.setColorAt(0, QtGui.QColor(self._theme.background_startColor)) - gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor)) - painter.setBrush(QtGui.QBrush(gradient)) - rectPath = QtGui.QPainterPath() - max_x = self._frame.width() - max_y = self._frame.height() - rectPath.moveTo(0, 0) - rectPath.lineTo(0, max_y) - rectPath.lineTo(max_x, max_y) - rectPath.lineTo(max_x, 0) - rectPath.closeSubpath() - painter.drawPath(rectPath) - elif self._theme.background_type== u'image': - # image - painter.fillRect(self._frame.rect(), QtCore.Qt.black) - if self.bg_image is not None: - painter.drawImage(0 ,0 , self.bg_image) + if self._theme.background_mode == u'transparent': + painter.fillRect(self._frame.rect(), QtCore.Qt.transparent) + else: + if self._theme.background_type == u'solid': + painter.fillRect(self._frame.rect(), QtGui.QColor(self._theme.background_color)) + elif self._theme.background_type == u'gradient': + # gradient + gradient = None + if self._theme.background_direction == u'horizontal': + w = int(self._frame.width()) / 2 + # vertical + gradient = QtGui.QLinearGradient(w, 0, w, self._frame.height()) + elif self._theme.background_direction == u'vertical': + h = int(self._frame.height()) / 2 + # Horizontal + gradient = QtGui.QLinearGradient(0, h, self._frame.width(), h) + else: + w = int(self._frame.width()) / 2 + h = int(self._frame.height()) / 2 + # Circular + gradient = QtGui.QRadialGradient(w, h, w) + gradient.setColorAt(0, QtGui.QColor(self._theme.background_startColor)) + gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor)) + painter.setBrush(QtGui.QBrush(gradient)) + rectPath = QtGui.QPainterPath() + max_x = self._frame.width() + max_y = self._frame.height() + rectPath.moveTo(0, 0) + rectPath.lineTo(0, max_y) + rectPath.lineTo(max_x, max_y) + rectPath.lineTo(max_x, 0) + rectPath.closeSubpath() + painter.drawPath(rectPath) + elif self._theme.background_type== u'image': + # image + painter.fillRect(self._frame.rect(), QtCore.Qt.black) + if self.bg_image is not None: + painter.drawImage(0 ,0 , self.bg_image) painter.end() self._bg_frame_small = self._bg_frame.scaled(QtCore.QSize(280, 210), QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/themexmlhandler.py index accd9cf53..73fe78d66 100644 --- a/openlp/core/lib/themexmlhandler.py +++ b/openlp/core/lib/themexmlhandler.py @@ -331,6 +331,11 @@ class ThemeXML(object): for element in iter: if len(element.getchildren()) > 0: master = element.tag + u'_' + else: + #background transparent tags have no children so special case + if element.tag == u'background': + for e in element.attrib.iteritems(): + setattr(self, element.tag + u'_' + e[0], e[1]) if len(element.attrib) > 0: for e in element.attrib.iteritems(): if master == u'font_' and e[0] == u'type': diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index f22c9212a..ef6f8368f 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -108,16 +108,19 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): new_theme.new_document(theme_name) save_from = None save_to = None - if self.theme.background_type == u'solid': - new_theme.add_background_solid(unicode(self.theme.background_color)) - elif self.theme.background_type == u'gradient': - new_theme.add_background_gradient(unicode(self.theme.background_startColor), - unicode(self.theme.background_endColor), self.theme.background_direction) + if self.theme.background_mode == u'transparent': + new_theme.add_background_transparent() else: - (path, filename) =os.path.split(unicode(self.theme.background_filename)) - new_theme.add_background_image(filename) - save_to= os.path.join(self.path, theme_name, filename ) - save_from = self.theme.background_filename + if self.theme.background_type == u'solid': + new_theme.add_background_solid(unicode(self.theme.background_color)) + elif self.theme.background_type == u'gradient': + new_theme.add_background_gradient(unicode(self.theme.background_startColor), + unicode(self.theme.background_endColor), self.theme.background_direction) + else: + (path, filename) =os.path.split(unicode(self.theme.background_filename)) + new_theme.add_background_image(filename) + save_to= os.path.join(self.path, theme_name, filename ) + save_from = self.theme.background_filename new_theme.add_font(unicode(self.theme.font_main_name), unicode(self.theme.font_main_color), unicode(self.theme.font_main_proportion), unicode(self.theme.font_main_override), u'main', diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 9b809ee66..765e25c96 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -146,7 +146,11 @@ class ThemeManager(QtGui.QWidget): if os.path.exists(theme): (path, filename) = os.path.split(unicode(file)) textName = os.path.splitext(name)[0] - item_name = QtGui.QListWidgetItem(textName) + if textName == self.global_theme: + name = (u'(%s):%s' % (translate(u'ThemeManager', u'default'), textName)) + else: + name = textName + item_name = QtGui.QListWidgetItem(name) item_name.setIcon(buildIcon(theme)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(textName)) self.ThemeListWidget.addItem(item_name) @@ -163,6 +167,7 @@ class ThemeManager(QtGui.QWidget): xml_file = os.path.join(self.path, unicode(themename), unicode(themename) + u'.xml') try: xml = file_to_xml(xml_file) + #print xml except: newtheme = ThemeXML() newtheme.new_document(u'New Theme') @@ -173,7 +178,9 @@ class ThemeManager(QtGui.QWidget): unicode(0), unicode(0), unicode(0)) xml = newtheme.extract_xml() theme = ThemeXML() + #print theme theme.parse(xml) + #print "A ", theme theme.extend_image_filename(self.path) return theme diff --git a/openlp/plugins/bibles/forms/bibleimportdialog.py b/openlp/plugins/bibles/forms/bibleimportdialog.py index 591178acd..8a8ec16a3 100644 --- a/openlp/plugins/bibles/forms/bibleimportdialog.py +++ b/openlp/plugins/bibles/forms/bibleimportdialog.py @@ -2,140 +2,22 @@ # Form implementation generated from reading ui file 'bibleimportdialog.ui' # -# Created: Fri Feb 20 05:45:22 2009 +# Created: Fri Aug 7 06:07:06 2009 # by: PyQt4 UI code generator 4.4.4 # # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_BibleImportDialog(object): def setupUi(self, BibleImportDialog): BibleImportDialog.setObjectName(u'BibleImportDialog') - BibleImportDialog.resize(494, 725) + BibleImportDialog.resize(500, 686) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) BibleImportDialog.setWindowIcon(icon) - self.ImportToolBox = QtGui.QToolBox(BibleImportDialog) - self.ImportToolBox.setGeometry(QtCore.QRect(20, 20, 451, 401)) - self.ImportToolBox.setFrameShape(QtGui.QFrame.StyledPanel) - self.ImportToolBox.setObjectName(u'ImportToolBox') - self.FileImportPage = QtGui.QWidget() - self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 447, 337)) - self.FileImportPage.setObjectName(u'FileImportPage') - self.OSISGroupBox = QtGui.QGroupBox(self.FileImportPage) - self.OSISGroupBox.setGeometry(QtCore.QRect(18, 65, 411, 81)) - self.OSISGroupBox.setObjectName(u'OSISGroupBox') - self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox) - self.gridLayout_2.setMargin(8) - self.gridLayout_2.setSpacing(8) - self.gridLayout_2.setObjectName(u'gridLayout_2') - self.LocatioLabel = QtGui.QLabel(self.OSISGroupBox) - self.LocatioLabel.setObjectName(u'LocatioLabel') - self.gridLayout_2.addWidget(self.LocatioLabel, 0, 0, 1, 1) - self.OSISLocationEdit = QtGui.QLineEdit(self.OSISGroupBox) - self.OSISLocationEdit.setObjectName(u'OSISLocationEdit') - self.gridLayout_2.addWidget(self.OSISLocationEdit, 0, 1, 1, 1) - self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.OsisFileButton.setIcon(icon1) - self.OsisFileButton.setObjectName(u'OsisFileButton') - self.gridLayout_2.addWidget(self.OsisFileButton, 0, 2, 1, 1) - self.CVSGroupBox = QtGui.QGroupBox(self.FileImportPage) - self.CVSGroupBox.setGeometry(QtCore.QRect(20, 170, 411, 191)) - self.CVSGroupBox.setObjectName(u'CVSGroupBox') - self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox) - self.gridLayout.setMargin(8) - self.gridLayout.setSpacing(8) - self.gridLayout.setObjectName(u'gridLayout') - self.BooksLocationLabel = QtGui.QLabel(self.CVSGroupBox) - self.BooksLocationLabel.setObjectName(u'BooksLocationLabel') - self.gridLayout.addWidget(self.BooksLocationLabel, 0, 0, 1, 1) - self.VerseLocationLabel = QtGui.QLabel(self.CVSGroupBox) - self.VerseLocationLabel.setObjectName(u'VerseLocationLabel') - self.gridLayout.addWidget(self.VerseLocationLabel, 4, 0, 1, 1) - self.VerseLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) - self.VerseLocationEdit.setObjectName(u'VerseLocationEdit') - self.gridLayout.addWidget(self.VerseLocationEdit, 4, 1, 1, 1) - self.BooksLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) - self.BooksLocationEdit.setObjectName(u'BooksLocationEdit') - self.gridLayout.addWidget(self.BooksLocationEdit, 0, 1, 1, 1) - self.BooksFileButton = QtGui.QPushButton(self.CVSGroupBox) - self.BooksFileButton.setIcon(icon1) - self.BooksFileButton.setObjectName(u'BooksFileButton') - self.gridLayout.addWidget(self.BooksFileButton, 0, 2, 1, 1) - self.VersesFileButton = QtGui.QPushButton(self.CVSGroupBox) - self.VersesFileButton.setIcon(icon1) - self.VersesFileButton.setObjectName(u'VersesFileButton') - self.gridLayout.addWidget(self.VersesFileButton, 4, 2, 1, 1) - self.BibleNameEdit = QtGui.QLineEdit(self.FileImportPage) - self.BibleNameEdit.setGeometry(QtCore.QRect(100, 20, 280, 28)) - self.BibleNameEdit.setObjectName(u'BibleNameEdit') - self.BibleNameLabel = QtGui.QLabel(self.FileImportPage) - self.BibleNameLabel.setGeometry(QtCore.QRect(18, 20, 98, 22)) - self.BibleNameLabel.setObjectName(u'BibleNameLabel') - self.ImportToolBox.addItem(self.FileImportPage, u'') - self.WebBiblePage = QtGui.QWidget() - self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 447, 337)) - self.WebBiblePage.setObjectName(u'WebBiblePage') - self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage) - self.WebBibleLayout.setSpacing(8) - self.WebBibleLayout.setMargin(8) - self.WebBibleLayout.setObjectName(u'WebBibleLayout') - self.OptionsGroupBox = QtGui.QGroupBox(self.WebBiblePage) - self.OptionsGroupBox.setObjectName(u'OptionsGroupBox') - self.formLayout_2 = QtGui.QFormLayout(self.OptionsGroupBox) - self.formLayout_2.setObjectName(u'formLayout_2') - self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox) - self.LocationLabel.setObjectName(u'LocationLabel') - self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.LocationLabel) - self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox) - self.LocationComboBox.setObjectName(u'LocationComboBox') - self.LocationComboBox.addItem(QtCore.QString()) - self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.LocationComboBox) - self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox) - self.BibleLabel.setObjectName(u'BibleLabel') - self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.BibleLabel) - self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox) - self.BibleComboBox.setObjectName(u'BibleComboBox') - self.BibleComboBox.addItem(QtCore.QString()) - self.BibleComboBox.setItemText(0, u'') - self.BibleComboBox.addItem(QtCore.QString()) - self.BibleComboBox.addItem(QtCore.QString()) - self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.BibleComboBox) - self.WebBibleLayout.addWidget(self.OptionsGroupBox) - self.ProxyGroupBox = QtGui.QGroupBox(self.WebBiblePage) - self.ProxyGroupBox.setObjectName(u'ProxyGroupBox') - self.ProxySettingsLayout = QtGui.QFormLayout(self.ProxyGroupBox) - self.ProxySettingsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow) - self.ProxySettingsLayout.setMargin(8) - self.ProxySettingsLayout.setSpacing(8) - self.ProxySettingsLayout.setObjectName(u'ProxySettingsLayout') - self.AddressLabel = QtGui.QLabel(self.ProxyGroupBox) - self.AddressLabel.setObjectName(u'AddressLabel') - self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AddressLabel) - self.AddressEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.AddressEdit.setObjectName(u'AddressEdit') - self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.AddressEdit) - self.UsernameLabel = QtGui.QLabel(self.ProxyGroupBox) - self.UsernameLabel.setObjectName(u'UsernameLabel') - self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.UsernameLabel) - self.UsernameEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.UsernameEdit.setObjectName(u'UsernameEdit') - self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.UsernameEdit) - self.PasswordLabel = QtGui.QLabel(self.ProxyGroupBox) - self.PasswordLabel.setObjectName(u'PasswordLabel') - self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PasswordLabel) - self.PasswordEdit = QtGui.QLineEdit(self.ProxyGroupBox) - self.PasswordEdit.setEchoMode(QtGui.QLineEdit.Password) - self.PasswordEdit.setObjectName(u'PasswordEdit') - self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit) - self.WebBibleLayout.addWidget(self.ProxyGroupBox) - self.ImportToolBox.addItem(self.WebBiblePage, u'') self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog) - self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 435, 471, 151)) + self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 400, 480, 151)) self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123)) self.LicenceDetailsGroupBox.setObjectName(u'LicenceDetailsGroupBox') self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox) @@ -164,7 +46,7 @@ class Ui_BibleImportDialog(object): self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 271, 17)) self.MessageLabel.setObjectName(u'MessageLabel') self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog) - self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 600, 471, 70)) + self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 550, 480, 70)) self.ProgressGroupBox.setObjectName(u'ProgressGroupBox') self.gridLayout_3 = QtGui.QGridLayout(self.ProgressGroupBox) self.gridLayout_3.setObjectName(u'gridLayout_3') @@ -174,7 +56,7 @@ class Ui_BibleImportDialog(object): self.ProgressBar.setObjectName(u'ProgressBar') self.gridLayout_3.addWidget(self.ProgressBar, 0, 0, 1, 1) self.layoutWidget = QtGui.QWidget(BibleImportDialog) - self.layoutWidget.setGeometry(QtCore.QRect(300, 680, 180, 38)) + self.layoutWidget.setGeometry(QtCore.QRect(310, 630, 180, 38)) self.layoutWidget.setObjectName(u'layoutWidget') self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget) self.horizontalLayout.setMargin(6) @@ -185,10 +67,131 @@ class Ui_BibleImportDialog(object): self.CancelButton = QtGui.QPushButton(self.layoutWidget) self.CancelButton.setObjectName(u'CancelButton') self.horizontalLayout.addWidget(self.CancelButton) + self.tabWidget = QtGui.QTabWidget(BibleImportDialog) + self.tabWidget.setGeometry(QtCore.QRect(10, 30, 480, 361)) + self.tabWidget.setObjectName(u'tabWidget') + self.OsisTab = QtGui.QWidget() + self.OsisTab.setObjectName(u'OsisTab') + self.OSISGroupBox = QtGui.QGroupBox(self.OsisTab) + self.OSISGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 141)) + self.OSISGroupBox.setObjectName(u'OSISGroupBox') + self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox) + self.gridLayout_2.setObjectName(u'gridLayout_2') + self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') + self.BibleNameLabel = QtGui.QLabel(self.OSISGroupBox) + self.BibleNameLabel.setObjectName(u'BibleNameLabel') + self.horizontalLayout_2.addWidget(self.BibleNameLabel) + self.BibleNameEdit = QtGui.QLineEdit(self.OSISGroupBox) + self.BibleNameEdit.setObjectName(u'BibleNameEdit') + self.horizontalLayout_2.addWidget(self.BibleNameEdit) + self.gridLayout_2.addLayout(self.horizontalLayout_2, 0, 0, 1, 1) + self.horizontalLayout_3 = QtGui.QHBoxLayout() + self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') + self.LocatioLabel = QtGui.QLabel(self.OSISGroupBox) + self.LocatioLabel.setObjectName(u'LocatioLabel') + self.horizontalLayout_3.addWidget(self.LocatioLabel) + self.OSISLocationEdit = QtGui.QLineEdit(self.OSISGroupBox) + self.OSISLocationEdit.setObjectName(u'OSISLocationEdit') + self.horizontalLayout_3.addWidget(self.OSISLocationEdit) + self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.OsisFileButton.setIcon(icon1) + self.OsisFileButton.setObjectName(u'OsisFileButton') + self.horizontalLayout_3.addWidget(self.OsisFileButton) + self.gridLayout_2.addLayout(self.horizontalLayout_3, 1, 0, 1, 1) + self.tabWidget.addTab(self.OsisTab, u'') + self.CsvTab = QtGui.QWidget() + self.CsvTab.setObjectName(u'CsvTab') + self.CVSGroupBox = QtGui.QGroupBox(self.CsvTab) + self.CVSGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 191)) + self.CVSGroupBox.setObjectName(u'CVSGroupBox') + self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox) + self.gridLayout.setMargin(8) + self.gridLayout.setSpacing(8) + self.gridLayout.setObjectName(u'gridLayout') + self.BooksLocationLabel = QtGui.QLabel(self.CVSGroupBox) + self.BooksLocationLabel.setObjectName(u'BooksLocationLabel') + self.gridLayout.addWidget(self.BooksLocationLabel, 0, 0, 1, 1) + self.VerseLocationLabel = QtGui.QLabel(self.CVSGroupBox) + self.VerseLocationLabel.setObjectName(u'VerseLocationLabel') + self.gridLayout.addWidget(self.VerseLocationLabel, 4, 0, 1, 1) + self.VerseLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) + self.VerseLocationEdit.setObjectName(u'VerseLocationEdit') + self.gridLayout.addWidget(self.VerseLocationEdit, 4, 1, 1, 1) + self.BooksLocationEdit = QtGui.QLineEdit(self.CVSGroupBox) + self.BooksLocationEdit.setObjectName(u'BooksLocationEdit') + self.gridLayout.addWidget(self.BooksLocationEdit, 0, 1, 1, 1) + self.BooksFileButton = QtGui.QPushButton(self.CVSGroupBox) + self.BooksFileButton.setIcon(icon1) + self.BooksFileButton.setObjectName(u'BooksFileButton') + self.gridLayout.addWidget(self.BooksFileButton, 0, 2, 1, 1) + self.VersesFileButton = QtGui.QPushButton(self.CVSGroupBox) + self.VersesFileButton.setIcon(icon1) + self.VersesFileButton.setObjectName(u'VersesFileButton') + self.gridLayout.addWidget(self.VersesFileButton, 4, 2, 1, 1) + self.tabWidget.addTab(self.CsvTab, u'') + self.HttpTab = QtGui.QWidget() + self.HttpTab.setObjectName(u'HttpTab') + self.OptionsGroupBox = QtGui.QGroupBox(self.HttpTab) + self.OptionsGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 141)) + self.OptionsGroupBox.setObjectName(u'OptionsGroupBox') + self.verticalLayout = QtGui.QVBoxLayout(self.OptionsGroupBox) + self.verticalLayout.setObjectName(u'verticalLayout') + self.horizontalLayout_4 = QtGui.QHBoxLayout() + self.horizontalLayout_4.setObjectName(u'horizontalLayout_4') + self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox) + self.LocationLabel.setObjectName(u'LocationLabel') + self.horizontalLayout_4.addWidget(self.LocationLabel) + self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox) + self.LocationComboBox.setObjectName(u'LocationComboBox') + self.LocationComboBox.addItem(QtCore.QString()) + self.horizontalLayout_4.addWidget(self.LocationComboBox) + self.verticalLayout.addLayout(self.horizontalLayout_4) + self.horizontalLayout_5 = QtGui.QHBoxLayout() + self.horizontalLayout_5.setObjectName(u'horizontalLayout_5') + self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox) + self.BibleLabel.setObjectName(u'BibleLabel') + self.horizontalLayout_5.addWidget(self.BibleLabel) + self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox) + self.BibleComboBox.setObjectName(u'BibleComboBox') + self.BibleComboBox.addItem(QtCore.QString()) + self.BibleComboBox.setItemText(0, u'') + self.BibleComboBox.addItem(QtCore.QString()) + self.BibleComboBox.addItem(QtCore.QString()) + self.horizontalLayout_5.addWidget(self.BibleComboBox) + self.verticalLayout.addLayout(self.horizontalLayout_5) + self.ProxyGroupBox = QtGui.QGroupBox(self.HttpTab) + self.ProxyGroupBox.setGeometry(QtCore.QRect(10, 160, 460, 161)) + self.ProxyGroupBox.setObjectName(u'ProxyGroupBox') + self.ProxySettingsLayout = QtGui.QFormLayout(self.ProxyGroupBox) + self.ProxySettingsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow) + self.ProxySettingsLayout.setMargin(8) + self.ProxySettingsLayout.setSpacing(8) + self.ProxySettingsLayout.setObjectName(u'ProxySettingsLayout') + self.AddressLabel = QtGui.QLabel(self.ProxyGroupBox) + self.AddressLabel.setObjectName(u'AddressLabel') + self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.AddressLabel) + self.AddressEdit = QtGui.QLineEdit(self.ProxyGroupBox) + self.AddressEdit.setObjectName(u'AddressEdit') + self.ProxySettingsLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.AddressEdit) + self.UsernameLabel = QtGui.QLabel(self.ProxyGroupBox) + self.UsernameLabel.setObjectName(u'UsernameLabel') + self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.UsernameLabel) + self.UsernameEdit = QtGui.QLineEdit(self.ProxyGroupBox) + self.UsernameEdit.setObjectName(u'UsernameEdit') + self.ProxySettingsLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.UsernameEdit) + self.PasswordLabel = QtGui.QLabel(self.ProxyGroupBox) + self.PasswordLabel.setObjectName(u'PasswordLabel') + self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PasswordLabel) + self.PasswordEdit = QtGui.QLineEdit(self.ProxyGroupBox) + self.PasswordEdit.setObjectName(u'PasswordEdit') + self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit) + self.tabWidget.addTab(self.HttpTab, u'') self.retranslateUi(BibleImportDialog) - self.ImportToolBox.setCurrentIndex(1) - + self.tabWidget.setCurrentIndex(2) QtCore.QMetaObject.connectSlotsByName(BibleImportDialog) BibleImportDialog.setTabOrder(self.BibleNameEdit, self.OSISLocationEdit) BibleImportDialog.setTabOrder(self.OSISLocationEdit, self.OsisFileButton) @@ -206,30 +209,31 @@ class Ui_BibleImportDialog(object): BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit) def retranslateUi(self, BibleImportDialog): - BibleImportDialog.setWindowTitle(translate(u'BibleImportDialog', u'Bible Registration')) - self.OSISGroupBox.setTitle(translate(u'BibleImportDialog', u'OSIS Bible')) - self.LocatioLabel.setText(translate(u'BibleImportDialog', u'File Location:')) - self.CVSGroupBox.setTitle(translate(u'BibleImportDialog', u'CVS Bible')) - self.BooksLocationLabel.setText(translate(u'BibleImportDialog', u'Books Location:')) - self.VerseLocationLabel.setText(translate(u'BibleImportDialog', u'Verse Location:')) - self.BibleNameLabel.setText(translate(u'BibleImportDialog', u'Bible Name:')) - self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.FileImportPage), translate(u'BibleImportDialog', u'File Import Page')) - self.OptionsGroupBox.setTitle(translate(u'BibleImportDialog', u'Download Options')) - self.LocationLabel.setText(translate(u'BibleImportDialog', u'Location:')) - self.LocationComboBox.setItemText(0, translate(u'BibleImportDialog', u'Crosswalk')) - self.BibleLabel.setText(translate(u'BibleImportDialog', u'Bible:')) - self.BibleComboBox.setItemText(1, translate(u'BibleImportDialog', u'NIV')) - self.BibleComboBox.setItemText(2, translate(u'BibleImportDialog', u'KJV')) - self.ProxyGroupBox.setTitle(translate(u'BibleImportDialog', u'Proxy Settings (Optional)')) - self.AddressLabel.setText(translate(u'BibleImportDialog', u'Proxy Address:')) - self.UsernameLabel.setText(translate(u'BibleImportDialog', u'Username:')) - self.PasswordLabel.setText(translate(u'BibleImportDialog', u'Password:')) - self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.WebBiblePage), translate(u'BibleImportDialog', u'Web Bible Import page')) - self.LicenceDetailsGroupBox.setTitle(translate(u'BibleImportDialog', u'Licence Details')) - self.VersionNameLabel.setText(translate(u'BibleImportDialog', u'Version Name:')) - self.CopyrightLabel.setText(translate(u'BibleImportDialog', u'Copyright:')) - self.PermisionLabel.setText(translate(u'BibleImportDialog', u'Permission:')) - self.ProgressGroupBox.setTitle(translate(u'BibleImportDialog', u'Import Progress')) - self.ProgressBar.setFormat(translate(u'BibleImportDialog', u'%p')) - self.ImportButton.setText(translate(u'BibleImportDialog', u'Import')) - self.CancelButton.setText(translate(u'BibleImportDialog', u'Cancel')) + BibleImportDialog.setWindowTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Registration', None, QtGui.QApplication.UnicodeUTF8)) + self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Licence Details', None, QtGui.QApplication.UnicodeUTF8)) + self.VersionNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Version Name:', None, QtGui.QApplication.UnicodeUTF8)) + self.CopyrightLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Copyright:', None, QtGui.QApplication.UnicodeUTF8)) + self.PermisionLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Permission:', None, QtGui.QApplication.UnicodeUTF8)) + self.ProgressGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Import Progress', None, QtGui.QApplication.UnicodeUTF8)) + self.ProgressBar.setFormat(QtGui.QApplication.translate(u'BibleImportDialog', u'%p', None, QtGui.QApplication.UnicodeUTF8)) + self.ImportButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Import', None, QtGui.QApplication.UnicodeUTF8)) + self.CancelButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Cancel', None, QtGui.QApplication.UnicodeUTF8)) + self.OSISGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'OSIS Bible', None, QtGui.QApplication.UnicodeUTF8)) + self.BibleNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Name:', None, QtGui.QApplication.UnicodeUTF8)) + self.LocatioLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'File Location:', None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.OsisTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Osis (Sword) Imports', None, QtGui.QApplication.UnicodeUTF8)) + self.CVSGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'CVS Bible', None, QtGui.QApplication.UnicodeUTF8)) + self.BooksLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Books Location:', None, QtGui.QApplication.UnicodeUTF8)) + self.VerseLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Verse Location:', None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.CsvTab), QtGui.QApplication.translate(u'BibleImportDialog', u'CSV File Imports', None, QtGui.QApplication.UnicodeUTF8)) + self.OptionsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Download Options', None, QtGui.QApplication.UnicodeUTF8)) + self.LocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Location:', None, QtGui.QApplication.UnicodeUTF8)) + self.LocationComboBox.setItemText(0, QtGui.QApplication.translate(u'BibleImportDialog', u'Crosswalk', None, QtGui.QApplication.UnicodeUTF8)) + self.BibleLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible:', None, QtGui.QApplication.UnicodeUTF8)) + self.BibleComboBox.setItemText(1, QtGui.QApplication.translate(u'BibleImportDialog', u'NIV', None, QtGui.QApplication.UnicodeUTF8)) + self.BibleComboBox.setItemText(2, QtGui.QApplication.translate(u'BibleImportDialog', u'KJV', None, QtGui.QApplication.UnicodeUTF8)) + self.ProxyGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Settings (Optional)', None, QtGui.QApplication.UnicodeUTF8)) + self.AddressLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Address:', None, QtGui.QApplication.UnicodeUTF8)) + self.UsernameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Username:', None, QtGui.QApplication.UnicodeUTF8)) + self.PasswordLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Password:', None, QtGui.QApplication.UnicodeUTF8)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.HttpTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Web Downloads', None, QtGui.QApplication.UnicodeUTF8)) diff --git a/resources/forms/bibleimportdialog.ui b/resources/forms/bibleimportdialog.ui index a53e47e35..87740ec9e 100644 --- a/resources/forms/bibleimportdialog.ui +++ b/resources/forms/bibleimportdialog.ui @@ -6,307 +6,23 @@ 0 0 - 494 - 725 + 500 + 686 Bible Registration - + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 20 - 20 - 451 - 401 - - - - QFrame::StyledPanel - - - 1 - - - - - 0 - 0 - 447 - 337 - - - - File Import Page - - - - - 18 - 65 - 411 - 81 - - - - OSIS Bible - - - - 8 - - - 8 - - - - - File Location: - - - - - - - - - - - - - - :/imports/import_load.png:/imports/import_load.png - - - - - - - - - 20 - 170 - 411 - 191 - - - - CVS Bible - - - - 8 - - - 8 - - - - - Books Location: - - - - - - - Verse Location: - - - - - - - - - - - - - - - - - :/imports/import_load.png:/imports/import_load.png - - - - - - - - - - - :/imports/import_load.png:/imports/import_load.png - - - - - - - - - 100 - 20 - 280 - 28 - - - - - - - 18 - 20 - 98 - 22 - - - - Bible Name: - - - - - - - 0 - 0 - 447 - 337 - - - - Web Bible Import page - - - - 8 - - - 8 - - - - - Download Options - - - - - - Location: - - - - - - - - Crosswalk - - - - - - - - Bible: - - - - - - - - - - - - - NIV - - - - - KJV - - - - - - BibleComboBox - LocationLabel - BibleLabel - LocationComboBox - - - - - - Proxy Settings (Optional) - - - - QFormLayout::AllNonFixedFieldsGrow - - - 8 - - - 8 - - - 8 - - - - - Proxy Address: - - - - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - - - - - - 10 - 435 - 471 + 400 + 480 151 @@ -375,8 +91,8 @@ 10 - 600 - 471 + 550 + 480 70 @@ -402,8 +118,8 @@ - 300 - 680 + 310 + 630 180 38 @@ -428,6 +144,280 @@ + + + + 10 + 30 + 480 + 361 + + + + 2 + + + + Osis (Sword) Imports + + + + + 10 + 10 + 460 + 141 + + + + OSIS Bible + + + + + + + + Bible Name: + + + + + + + + + + + + + + File Location: + + + + + + + + + + + + + + :/imports/import_load.png:/imports/import_load.png + + + + + + + + + + + CSV File Imports + + + + + 10 + 10 + 460 + 191 + + + + CVS Bible + + + + 8 + + + 8 + + + + + Books Location: + + + + + + + Verse Location: + + + + + + + + + + + + + + + + + :/imports/import_load.png:/imports/import_load.png + + + + + + + + + + + :/imports/import_load.png:/imports/import_load.png + + + + + + + + + Web Downloads + + + + + 10 + 10 + 460 + 141 + + + + Download Options + + + + + + + + Location: + + + + + + + + Crosswalk + + + + + + + + + + + + Bible: + + + + + + + + + + + + + NIV + + + + + KJV + + + + + + + + BibleComboBox + LocationLabel + BibleLabel + LocationComboBox + + + + + 10 + 160 + 460 + 161 + + + + Proxy Settings (Optional) + + + + QFormLayout::AllNonFixedFieldsGrow + + + 8 + + + 8 + + + 8 + + + + + Proxy Address: + + + + + + + + + + Username: + + + + + + + + + + Password: + + + + + + + + + OptionsGroupBox + OptionsGroupBox + ProxyGroupBox + + BibleNameEdit