OpenLP

Merge lp:~trb143/openlp/bugfixes into lp:openlp

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+9843@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

New Bible Import Screen
Transparent Theme backgrounds
Global Theme Handling improvements

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~trb143/openlp/bugfixes updated
502. By Raoul Snyman

Merge from songmaintenance branch.

503. By Tim Bentley

New bible Import Screen
Transparent Theme backgrounds
Global Theme Handling improvements

-------This line and the following will be ignored --------------

modified:
  openlp/core/lib/renderer.py
  openlp/core/lib/themexmlhandler.py
  openlp/core/ui/amendthemeform.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/thememanager.py
  openlp/core/ui/themestab.py
  openlp/plugins/bibles/forms/bibleimportdialog.py
  resources/forms/bibleimportdialog.ui
pending merges:
  Tim Bentley 2009-08-07 finish Theme handling corrections
    Tim Bentley 2009-08-07 Default handling allows editing and blocks deletes
    Tim Bentley 2009-08-07 New bible import form
    Tim Bentley 2009-08-06 [merge] Head
    Tim Bentley 2009-08-06 Standardize row hight in renderer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/renderer.py'
2--- openlp/core/lib/renderer.py 2009-08-05 17:59:37 +0000
3+++ openlp/core/lib/renderer.py 2009-08-07 17:19:32 +0000
4@@ -154,11 +154,6 @@
5 text.append(line)
6 #print text
7 split_text = self.pre_render_text(text)
8-# print "-----------------------------"
9-# print split_text
10-# split_text = self._split_set_of_lines(text, False)
11-# print "-----------------------------"
12-# print split_text
13 log.debug(u'format_slide - End')
14 return split_text
15
16@@ -168,7 +163,7 @@
17 line_width = self._rect.width() - self._right_margin
18 #number of lines on a page - adjust for rounding up.
19 #print self._rect.height() , metrics.height(), int(self._rect.height() / metrics.height())
20- page_length = int(self._rect.height() / metrics.height()) - 1
21+ page_length = int(self._rect.height() / metrics.height() - 2 ) - 1
22 ave_line_width = line_width / metrics.averageCharWidth()
23 # print "A", ave_line_width
24 ave_line_width = int(ave_line_width + (ave_line_width * 0.5))
25@@ -272,113 +267,49 @@
26 log.debug(u'render background %s start', self._theme.background_type)
27 painter = QtGui.QPainter()
28 painter.begin(self._bg_frame)
29- if self._theme.background_type == u'solid':
30- painter.fillRect(self._frame.rect(), QtGui.QColor(self._theme.background_color))
31- elif self._theme.background_type == u'gradient':
32- # gradient
33- gradient = None
34- if self._theme.background_direction == u'horizontal':
35- w = int(self._frame.width()) / 2
36- # vertical
37- gradient = QtGui.QLinearGradient(w, 0, w, self._frame.height())
38- elif self._theme.background_direction == u'vertical':
39- h = int(self._frame.height()) / 2
40- # Horizontal
41- gradient = QtGui.QLinearGradient(0, h, self._frame.width(), h)
42- else:
43- w = int(self._frame.width()) / 2
44- h = int(self._frame.height()) / 2
45- # Circular
46- gradient = QtGui.QRadialGradient(w, h, w)
47- gradient.setColorAt(0, QtGui.QColor(self._theme.background_startColor))
48- gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor))
49- painter.setBrush(QtGui.QBrush(gradient))
50- rectPath = QtGui.QPainterPath()
51- max_x = self._frame.width()
52- max_y = self._frame.height()
53- rectPath.moveTo(0, 0)
54- rectPath.lineTo(0, max_y)
55- rectPath.lineTo(max_x, max_y)
56- rectPath.lineTo(max_x, 0)
57- rectPath.closeSubpath()
58- painter.drawPath(rectPath)
59- elif self._theme.background_type== u'image':
60- # image
61- painter.fillRect(self._frame.rect(), QtCore.Qt.black)
62- if self.bg_image is not None:
63- painter.drawImage(0 ,0 , self.bg_image)
64+ if self._theme.background_mode == u'transparent':
65+ painter.fillRect(self._frame.rect(), QtCore.Qt.transparent)
66+ else:
67+ if self._theme.background_type == u'solid':
68+ painter.fillRect(self._frame.rect(), QtGui.QColor(self._theme.background_color))
69+ elif self._theme.background_type == u'gradient':
70+ # gradient
71+ gradient = None
72+ if self._theme.background_direction == u'horizontal':
73+ w = int(self._frame.width()) / 2
74+ # vertical
75+ gradient = QtGui.QLinearGradient(w, 0, w, self._frame.height())
76+ elif self._theme.background_direction == u'vertical':
77+ h = int(self._frame.height()) / 2
78+ # Horizontal
79+ gradient = QtGui.QLinearGradient(0, h, self._frame.width(), h)
80+ else:
81+ w = int(self._frame.width()) / 2
82+ h = int(self._frame.height()) / 2
83+ # Circular
84+ gradient = QtGui.QRadialGradient(w, h, w)
85+ gradient.setColorAt(0, QtGui.QColor(self._theme.background_startColor))
86+ gradient.setColorAt(1, QtGui.QColor(self._theme.background_endColor))
87+ painter.setBrush(QtGui.QBrush(gradient))
88+ rectPath = QtGui.QPainterPath()
89+ max_x = self._frame.width()
90+ max_y = self._frame.height()
91+ rectPath.moveTo(0, 0)
92+ rectPath.lineTo(0, max_y)
93+ rectPath.lineTo(max_x, max_y)
94+ rectPath.lineTo(max_x, 0)
95+ rectPath.closeSubpath()
96+ painter.drawPath(rectPath)
97+ elif self._theme.background_type== u'image':
98+ # image
99+ painter.fillRect(self._frame.rect(), QtCore.Qt.black)
100+ if self.bg_image is not None:
101+ painter.drawImage(0 ,0 , self.bg_image)
102 painter.end()
103 self._bg_frame_small = self._bg_frame.scaled(QtCore.QSize(280, 210), QtCore.Qt.KeepAspectRatio,
104 QtCore.Qt.SmoothTransformation)
105 log.debug(u'render background End')
106
107-# def _split_set_of_lines(self, lines, footer):
108-# """
109-# Given a list of lines, decide how to split them best if they don't all
110-# fit on the screen. This is done by splitting at 1/2, 1/3 or 1/4 of the
111-# set. If it doesn't fit, even at this size, just split at each
112-# opportunity. We'll do this by getting the bounding box of each line,
113-# and then summing them appropriately.
114-#
115-# Returns a list of [lists of lines], one set for each screenful.
116-#
117-# ``lines``
118-# The lines of text to split.
119-#
120-# ``footer``
121-# The footer text.
122-# """
123-# bboxes = []
124-# for line in lines:
125-# bboxes.append(self._render_and_wrap_single_line(line, footer))
126-# numlines = len(lines)
127-# bottom = self._rect.bottom()
128-# for ratio in (numlines, numlines/2, numlines/3, numlines/4):
129-# good = 1
130-# startline = 0
131-# endline = startline + ratio
132-# while (endline <= numlines and endline != 0):
133-# by = 0
134-# for (x,y) in bboxes[startline:endline]:
135-# by += y
136-# if by > bottom:
137-# good = 0
138-# break
139-# startline += ratio
140-# endline = startline + ratio
141-# if good == 1:
142-# break
143-# retval = []
144-# numlines_per_page = ratio
145-# if good:
146-# c = 0
147-# thislines = []
148-# while c < numlines:
149-# thislines.append(lines[c])
150-# c += 1
151-# if len(thislines) == numlines_per_page:
152-# retval.append(thislines)
153-# thislines = []
154-# if len(thislines) > 0:
155-# retval.append(thislines)
156-# else:
157-# # print "Just split where you can"
158-# retval = []
159-# startline = 0
160-# endline = startline + 1
161-# while (endline <= numlines):
162-# by = 0
163-# for (x,y) in bboxes[startline:endline]:
164-# by += y
165-# if by > bottom:
166-# retval.append(lines[startline:endline-1])
167-# startline = endline-1
168-# # gets incremented below
169-# endline = startline
170-# by = 0
171-# endline += 1
172-# return retval
173-
174 def _correctAlignment(self, rect, bbox):
175 """
176 Corrects the vertical alignment of text.
177
178=== modified file 'openlp/core/lib/themexmlhandler.py'
179--- openlp/core/lib/themexmlhandler.py 2009-08-05 17:59:37 +0000
180+++ openlp/core/lib/themexmlhandler.py 2009-08-07 17:19:32 +0000
181@@ -331,6 +331,11 @@
182 for element in iter:
183 if len(element.getchildren()) > 0:
184 master = element.tag + u'_'
185+ else:
186+ #background transparent tags have no children so special case
187+ if element.tag == u'background':
188+ for e in element.attrib.iteritems():
189+ setattr(self, element.tag + u'_' + e[0], e[1])
190 if len(element.attrib) > 0:
191 for e in element.attrib.iteritems():
192 if master == u'font_' and e[0] == u'type':
193
194=== modified file 'openlp/core/ui/amendthemeform.py'
195--- openlp/core/ui/amendthemeform.py 2009-08-03 19:49:21 +0000
196+++ openlp/core/ui/amendthemeform.py 2009-08-07 17:19:32 +0000
197@@ -108,16 +108,19 @@
198 new_theme.new_document(theme_name)
199 save_from = None
200 save_to = None
201- if self.theme.background_type == u'solid':
202- new_theme.add_background_solid(unicode(self.theme.background_color))
203- elif self.theme.background_type == u'gradient':
204- new_theme.add_background_gradient(unicode(self.theme.background_startColor),
205- unicode(self.theme.background_endColor), self.theme.background_direction)
206+ if self.theme.background_mode == u'transparent':
207+ new_theme.add_background_transparent()
208 else:
209- (path, filename) =os.path.split(unicode(self.theme.background_filename))
210- new_theme.add_background_image(filename)
211- save_to= os.path.join(self.path, theme_name, filename )
212- save_from = self.theme.background_filename
213+ if self.theme.background_type == u'solid':
214+ new_theme.add_background_solid(unicode(self.theme.background_color))
215+ elif self.theme.background_type == u'gradient':
216+ new_theme.add_background_gradient(unicode(self.theme.background_startColor),
217+ unicode(self.theme.background_endColor), self.theme.background_direction)
218+ else:
219+ (path, filename) =os.path.split(unicode(self.theme.background_filename))
220+ new_theme.add_background_image(filename)
221+ save_to= os.path.join(self.path, theme_name, filename )
222+ save_from = self.theme.background_filename
223
224 new_theme.add_font(unicode(self.theme.font_main_name), unicode(self.theme.font_main_color),
225 unicode(self.theme.font_main_proportion), unicode(self.theme.font_main_override), u'main',
226
227=== modified file 'openlp/core/ui/servicemanager.py'
228--- openlp/core/ui/servicemanager.py 2009-08-02 16:13:59 +0000
229+++ openlp/core/ui/servicemanager.py 2009-08-06 17:43:53 +0000
230@@ -161,7 +161,7 @@
231 # Last little bits of setting up
232 self.config = PluginConfig(u'ServiceManager')
233 self.servicePath = self.config.get_data_path()
234- self.service_theme = self.config.get_config(u'theme service theme', u'')
235+ self.service_theme = unicode(self.config.get_config(u'theme service theme', u''))
236
237 def onMoveSelectionUp(self):
238 """
239@@ -412,7 +412,11 @@
240
241 def addServiceItem(self, item):
242 """
243- Add an item to the list
244+ Add a Service item to the list
245+
246+ ``item``
247+ Service Item to be added
248+
249 """
250 self.serviceItems.append({u'data': item, u'order': len(self.serviceItems)+1, u'expanded':True})
251 treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
252@@ -465,13 +469,21 @@
253 def dragEnterEvent(self, event):
254 """
255 Accept Drag events
256+
257+ ``event``
258+ Handle of the event pint passed
259+
260 """
261 event.accept()
262
263 def dropEvent(self, event):
264 """
265- Handle the release of the event and trigger the plugin
266- to add the data
267+ Receive drop event and trigger an internal event to get the
268+ plugins to build and push the correct service item
269+ The drag event payload carries the plugin name
270+
271+ ``event``
272+ Handle of the event pint passed
273 """
274 link = event.mimeData()
275 if link.hasText():
276@@ -481,12 +493,16 @@
277 def updateThemeList(self, theme_list):
278 """
279 Called from ThemeManager when the Themes have changed
280+
281+ ``theme_list``
282+ A list of current themes to be displayed
283+
284 """
285 self.ThemeComboBox.clear()
286 self.ThemeComboBox.addItem(u'')
287 for theme in theme_list:
288 self.ThemeComboBox.addItem(theme)
289- id = self.ThemeComboBox.findText(unicode(self.service_theme), QtCore.Qt.MatchExactly)
290+ id = self.ThemeComboBox.findText(self.service_theme, QtCore.Qt.MatchExactly)
291 # Not Found
292 if id == -1:
293 id = 0
294
295=== modified file 'openlp/core/ui/thememanager.py'
296--- openlp/core/ui/thememanager.py 2009-08-02 16:13:59 +0000
297+++ openlp/core/ui/thememanager.py 2009-08-07 19:05:00 +0000
298@@ -28,7 +28,7 @@
299
300 from openlp.core.ui import AmendThemeForm, ServiceManager
301 from openlp.core.theme import Theme
302-from openlp.core.lib import Event, EventType, EventManager, OpenLPToolbar, ThemeXML, Renderer, translate, file_to_xml, buildIcon
303+from openlp.core.lib import PluginConfig, Event, EventType, EventManager, OpenLPToolbar, ThemeXML, Renderer, translate, file_to_xml, buildIcon
304 from openlp.core.utils import ConfigHelper
305
306 class ThemeManager(QtGui.QWidget):
307@@ -68,10 +68,33 @@
308 self.ThemeListWidget.setAlternatingRowColors(True)
309 self.ThemeListWidget.setIconSize(QtCore.QSize(88,50))
310 self.Layout.addWidget(self.ThemeListWidget)
311+ #Signals
312+ QtCore.QObject.connect(self.ThemeListWidget,
313+ QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.changeGlobal)
314+ #Variables
315 self.themelist = []
316 self.path = os.path.join(ConfigHelper.get_data_path(), u'themes')
317 self.checkThemesExists(self.path)
318 self.amendThemeForm.path = self.path
319+ # Last little bits of setting up
320+ self.config = PluginConfig(u'themes')
321+ self.servicePath = self.config.get_data_path()
322+ self.global_theme = unicode(self.config.get_config(u'theme global theme', u''))
323+
324+ def changeGlobal(self, index):
325+ for count in range (0, self.ThemeListWidget.count()):
326+ item = self.ThemeListWidget.item(count)
327+ oldName = item.text()
328+ #reset the old name
329+ if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()):
330+ self.ThemeListWidget.item(count).setText(unicode(item.data(QtCore.Qt.UserRole).toString()))
331+ #Set the new name
332+ if count == index.row():
333+ self.global_theme = unicode(self.ThemeListWidget.item(count).text())
334+ name = (u'(%s):%s' % (translate(u'ThemeManager', u'default'), self.global_theme))
335+ self.ThemeListWidget.item(count).setText(name)
336+ self.config.set_config(u'theme global theme', self.global_theme)
337+ self.push_themes()
338
339 def onAddTheme(self):
340 self.amendThemeForm.loadTheme(None)
341@@ -80,30 +103,38 @@
342 def onEditTheme(self):
343 item = self.ThemeListWidget.currentItem()
344 if item is not None:
345- self.amendThemeForm.loadTheme(unicode(item.text()))
346+ self.amendThemeForm.loadTheme(unicode(item.data(QtCore.Qt.UserRole).toString()))
347 self.amendThemeForm.exec_()
348
349 def onDeleteTheme(self):
350+ self.global_theme = unicode(self.config.get_config(u'theme global theme', u''))
351 item = self.ThemeListWidget.currentItem()
352 if item is not None:
353 theme = unicode(item.text())
354- th = theme + u'.png'
355- row = self.ThemeListWidget.row(item)
356- self.ThemeListWidget.takeItem(row)
357- try:
358- os.remove(os.path.join(self.path, th))
359- except:
360- #if not present do not worry
361- pass
362- try:
363- shutil.rmtree(os.path.join(self.path, theme))
364- except:
365- #if not present do not worry
366- pass
367- #As we do not reload the themes push out the change
368- self.parent.EventManager.post_event(Event(EventType.ThemeListChanged))
369- self.parent.ServiceManagerContents.updateThemeList(self.getThemes())
370- self.parent.settingsForm.ThemesTab.updateThemeList(self.getThemes())
371+ # should be the same unless default
372+ if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
373+ QtGui.QMessageBox.critical(self,
374+ translate(u'ThemeManager', u'Error'),
375+ translate(u'ThemeManager', u'You are unable to delete the default theme!'),
376+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
377+ else:
378+ self.themelist.remove(theme)
379+ th = theme + u'.png'
380+ row = self.ThemeListWidget.row(item)
381+ self.ThemeListWidget.takeItem(row)
382+ try:
383+ os.remove(os.path.join(self.path, th))
384+ except:
385+ #if not present do not worry
386+ pass
387+ try:
388+ shutil.rmtree(os.path.join(self.path, theme))
389+ except:
390+ #if not present do not worry
391+ pass
392+ #As we do not reload the themes push out the change
393+ #Reaload the list as the internal lists and events need to be triggered
394+ self.push_themes()
395
396 def onExportTheme(self):
397 pass
398@@ -136,11 +167,18 @@
399 if os.path.exists(theme):
400 (path, filename) = os.path.split(unicode(file))
401 textName = os.path.splitext(name)[0]
402- item_name = QtGui.QListWidgetItem(textName)
403+ if textName == self.global_theme:
404+ name = (u'(%s):%s' % (translate(u'ThemeManager', u'default'), textName))
405+ else:
406+ name = textName
407+ item_name = QtGui.QListWidgetItem(name)
408 item_name.setIcon(buildIcon(theme))
409 item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(textName))
410 self.ThemeListWidget.addItem(item_name)
411 self.themelist.append(textName)
412+ self.push_themes()
413+
414+ def push_themes(self):
415 self.parent.EventManager.post_event(Event(EventType.ThemeListChanged))
416 self.parent.ServiceManagerContents.updateThemeList(self.getThemes())
417 self.parent.settingsForm.ThemesTab.updateThemeList(self.getThemes())
418@@ -153,6 +191,7 @@
419 xml_file = os.path.join(self.path, unicode(themename), unicode(themename) + u'.xml')
420 try:
421 xml = file_to_xml(xml_file)
422+ #print xml
423 except:
424 newtheme = ThemeXML()
425 newtheme.new_document(u'New Theme')
426@@ -163,7 +202,9 @@
427 unicode(0), unicode(0), unicode(0))
428 xml = newtheme.extract_xml()
429 theme = ThemeXML()
430+ #print theme
431 theme.parse(xml)
432+ #print "A ", theme
433 theme.extend_image_filename(self.path)
434 return theme
435
436@@ -211,6 +252,9 @@
437 self.generateAndSaveImage(dir, themename, filexml)
438
439 def checkVersion1(self, xmlfile):
440+ """
441+ Am I a version 1 theme
442+ """
443 log.debug(u'checkVersion1 ')
444 theme = xmlfile
445 tree = ElementTree(element=XML(theme)).getroot()
446@@ -220,6 +264,11 @@
447 return True
448
449 def migrateVersion122(self, filename, fullpath, xml_data):
450+ """
451+ Called by convert the xml data from version 1 format
452+ to the current format.
453+ New fields are defaulted but the new theme is useable
454+ """
455 log.debug(u'migrateVersion122 %s %s', filename, fullpath)
456 theme = Theme(xml_data)
457 newtheme = ThemeXML()
458
459=== modified file 'openlp/core/ui/themestab.py'
460--- openlp/core/ui/themestab.py 2009-06-16 18:21:24 +0000
461+++ openlp/core/ui/themestab.py 2009-08-07 19:05:00 +0000
462@@ -99,8 +99,6 @@
463 QtCore.QObject.connect(self.DefaultComboBox,
464 QtCore.SIGNAL(u'activated(int)'), self.onDefaultComboBoxChanged)
465
466- #self.DefaultListView.setScaledContents(True)
467-
468 def retranslateUi(self):
469 self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme'))
470 self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level'))
471@@ -138,9 +136,9 @@
472 self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
473
474 def onDefaultComboBoxChanged(self, value):
475- self.global_theme = self.DefaultComboBox.currentText()
476+ self.global_theme = unicode(self.DefaultComboBox.currentText())
477 self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
478- image = self.parent.ThemeManagerContents.getPreviewImage(unicode(self.global_theme))
479+ image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
480 preview = QtGui.QPixmap(unicode(image))
481 display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
482 self.DefaultListView.setPixmap(display)
483@@ -149,17 +147,19 @@
484 """
485 Called from ThemeManager when the Themes have changed
486 """
487+ #reload as may have been triggered by the ThemeManager
488+ self.global_theme = self.config.get_config(u'theme global theme', u'')
489 self.DefaultComboBox.clear()
490 for theme in theme_list:
491 self.DefaultComboBox.addItem(theme)
492- id = self.DefaultComboBox.findText(unicode(self.global_theme), QtCore.Qt.MatchExactly)
493+ id = self.DefaultComboBox.findText(self.global_theme, QtCore.Qt.MatchExactly)
494 if id == -1:
495 id = 0 # Not Found
496 self.global_theme = u''
497 self.DefaultComboBox.setCurrentIndex(id)
498 self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
499 if self.global_theme is not u'':
500- image = self.parent.ThemeManagerContents.getPreviewImage(unicode(self.global_theme))
501+ image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
502 preview = QtGui.QPixmap(unicode(image))
503 display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
504- self.DefaultListView.setPixmap(display)
505\ No newline at end of file
506+ self.DefaultListView.setPixmap(display)
507
508=== modified file 'openlp/plugins/bibles/forms/bibleimportdialog.py'
509--- openlp/plugins/bibles/forms/bibleimportdialog.py 2009-06-19 19:49:00 +0000
510+++ openlp/plugins/bibles/forms/bibleimportdialog.py 2009-08-07 17:19:32 +0000
511@@ -2,49 +2,110 @@
512
513 # Form implementation generated from reading ui file 'bibleimportdialog.ui'
514 #
515-# Created: Fri Feb 20 05:45:22 2009
516+# Created: Fri Aug 7 06:07:06 2009
517 # by: PyQt4 UI code generator 4.4.4
518 #
519 # WARNING! All changes made in this file will be lost!
520
521 from PyQt4 import QtCore, QtGui
522-from openlp.core.lib import translate
523
524 class Ui_BibleImportDialog(object):
525 def setupUi(self, BibleImportDialog):
526 BibleImportDialog.setObjectName(u'BibleImportDialog')
527- BibleImportDialog.resize(494, 725)
528+ BibleImportDialog.resize(500, 686)
529 icon = QtGui.QIcon()
530- icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
531+ icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
532 BibleImportDialog.setWindowIcon(icon)
533- self.ImportToolBox = QtGui.QToolBox(BibleImportDialog)
534- self.ImportToolBox.setGeometry(QtCore.QRect(20, 20, 451, 401))
535- self.ImportToolBox.setFrameShape(QtGui.QFrame.StyledPanel)
536- self.ImportToolBox.setObjectName(u'ImportToolBox')
537- self.FileImportPage = QtGui.QWidget()
538- self.FileImportPage.setGeometry(QtCore.QRect(0, 0, 447, 337))
539- self.FileImportPage.setObjectName(u'FileImportPage')
540- self.OSISGroupBox = QtGui.QGroupBox(self.FileImportPage)
541- self.OSISGroupBox.setGeometry(QtCore.QRect(18, 65, 411, 81))
542+ self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog)
543+ self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 400, 480, 151))
544+ self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123))
545+ self.LicenceDetailsGroupBox.setObjectName(u'LicenceDetailsGroupBox')
546+ self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox)
547+ self.formLayout.setMargin(8)
548+ self.formLayout.setHorizontalSpacing(8)
549+ self.formLayout.setObjectName(u'formLayout')
550+ self.VersionNameLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
551+ self.VersionNameLabel.setObjectName(u'VersionNameLabel')
552+ self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VersionNameLabel)
553+ self.VersionNameEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
554+ self.VersionNameEdit.setObjectName(u'VersionNameEdit')
555+ self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.VersionNameEdit)
556+ self.CopyrightLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
557+ self.CopyrightLabel.setObjectName(u'CopyrightLabel')
558+ self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightLabel)
559+ self.CopyrightEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
560+ self.CopyrightEdit.setObjectName(u'CopyrightEdit')
561+ self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightEdit)
562+ self.PermisionLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
563+ self.PermisionLabel.setObjectName(u'PermisionLabel')
564+ self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PermisionLabel)
565+ self.PermisionEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
566+ self.PermisionEdit.setObjectName(u'PermisionEdit')
567+ self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit)
568+ self.MessageLabel = QtGui.QLabel(BibleImportDialog)
569+ self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 271, 17))
570+ self.MessageLabel.setObjectName(u'MessageLabel')
571+ self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog)
572+ self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 550, 480, 70))
573+ self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
574+ self.gridLayout_3 = QtGui.QGridLayout(self.ProgressGroupBox)
575+ self.gridLayout_3.setObjectName(u'gridLayout_3')
576+ self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
577+ self.ProgressBar.setProperty(u'value', QtCore.QVariant(0))
578+ self.ProgressBar.setInvertedAppearance(False)
579+ self.ProgressBar.setObjectName(u'ProgressBar')
580+ self.gridLayout_3.addWidget(self.ProgressBar, 0, 0, 1, 1)
581+ self.layoutWidget = QtGui.QWidget(BibleImportDialog)
582+ self.layoutWidget.setGeometry(QtCore.QRect(310, 630, 180, 38))
583+ self.layoutWidget.setObjectName(u'layoutWidget')
584+ self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget)
585+ self.horizontalLayout.setMargin(6)
586+ self.horizontalLayout.setObjectName(u'horizontalLayout')
587+ self.ImportButton = QtGui.QPushButton(self.layoutWidget)
588+ self.ImportButton.setObjectName(u'ImportButton')
589+ self.horizontalLayout.addWidget(self.ImportButton)
590+ self.CancelButton = QtGui.QPushButton(self.layoutWidget)
591+ self.CancelButton.setObjectName(u'CancelButton')
592+ self.horizontalLayout.addWidget(self.CancelButton)
593+ self.tabWidget = QtGui.QTabWidget(BibleImportDialog)
594+ self.tabWidget.setGeometry(QtCore.QRect(10, 30, 480, 361))
595+ self.tabWidget.setObjectName(u'tabWidget')
596+ self.OsisTab = QtGui.QWidget()
597+ self.OsisTab.setObjectName(u'OsisTab')
598+ self.OSISGroupBox = QtGui.QGroupBox(self.OsisTab)
599+ self.OSISGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 141))
600 self.OSISGroupBox.setObjectName(u'OSISGroupBox')
601 self.gridLayout_2 = QtGui.QGridLayout(self.OSISGroupBox)
602- self.gridLayout_2.setMargin(8)
603- self.gridLayout_2.setSpacing(8)
604 self.gridLayout_2.setObjectName(u'gridLayout_2')
605+ self.horizontalLayout_2 = QtGui.QHBoxLayout()
606+ self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
607+ self.BibleNameLabel = QtGui.QLabel(self.OSISGroupBox)
608+ self.BibleNameLabel.setObjectName(u'BibleNameLabel')
609+ self.horizontalLayout_2.addWidget(self.BibleNameLabel)
610+ self.BibleNameEdit = QtGui.QLineEdit(self.OSISGroupBox)
611+ self.BibleNameEdit.setObjectName(u'BibleNameEdit')
612+ self.horizontalLayout_2.addWidget(self.BibleNameEdit)
613+ self.gridLayout_2.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
614+ self.horizontalLayout_3 = QtGui.QHBoxLayout()
615+ self.horizontalLayout_3.setObjectName(u'horizontalLayout_3')
616 self.LocatioLabel = QtGui.QLabel(self.OSISGroupBox)
617 self.LocatioLabel.setObjectName(u'LocatioLabel')
618- self.gridLayout_2.addWidget(self.LocatioLabel, 0, 0, 1, 1)
619+ self.horizontalLayout_3.addWidget(self.LocatioLabel)
620 self.OSISLocationEdit = QtGui.QLineEdit(self.OSISGroupBox)
621 self.OSISLocationEdit.setObjectName(u'OSISLocationEdit')
622- self.gridLayout_2.addWidget(self.OSISLocationEdit, 0, 1, 1, 1)
623+ self.horizontalLayout_3.addWidget(self.OSISLocationEdit)
624 self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox)
625 icon1 = QtGui.QIcon()
626 icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
627 self.OsisFileButton.setIcon(icon1)
628 self.OsisFileButton.setObjectName(u'OsisFileButton')
629- self.gridLayout_2.addWidget(self.OsisFileButton, 0, 2, 1, 1)
630- self.CVSGroupBox = QtGui.QGroupBox(self.FileImportPage)
631- self.CVSGroupBox.setGeometry(QtCore.QRect(20, 170, 411, 191))
632+ self.horizontalLayout_3.addWidget(self.OsisFileButton)
633+ self.gridLayout_2.addLayout(self.horizontalLayout_3, 1, 0, 1, 1)
634+ self.tabWidget.addTab(self.OsisTab, u'')
635+ self.CsvTab = QtGui.QWidget()
636+ self.CsvTab.setObjectName(u'CsvTab')
637+ self.CVSGroupBox = QtGui.QGroupBox(self.CsvTab)
638+ self.CVSGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 191))
639 self.CVSGroupBox.setObjectName(u'CVSGroupBox')
640 self.gridLayout = QtGui.QGridLayout(self.CVSGroupBox)
641 self.gridLayout.setMargin(8)
642@@ -70,43 +131,39 @@
643 self.VersesFileButton.setIcon(icon1)
644 self.VersesFileButton.setObjectName(u'VersesFileButton')
645 self.gridLayout.addWidget(self.VersesFileButton, 4, 2, 1, 1)
646- self.BibleNameEdit = QtGui.QLineEdit(self.FileImportPage)
647- self.BibleNameEdit.setGeometry(QtCore.QRect(100, 20, 280, 28))
648- self.BibleNameEdit.setObjectName(u'BibleNameEdit')
649- self.BibleNameLabel = QtGui.QLabel(self.FileImportPage)
650- self.BibleNameLabel.setGeometry(QtCore.QRect(18, 20, 98, 22))
651- self.BibleNameLabel.setObjectName(u'BibleNameLabel')
652- self.ImportToolBox.addItem(self.FileImportPage, u'')
653- self.WebBiblePage = QtGui.QWidget()
654- self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 447, 337))
655- self.WebBiblePage.setObjectName(u'WebBiblePage')
656- self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage)
657- self.WebBibleLayout.setSpacing(8)
658- self.WebBibleLayout.setMargin(8)
659- self.WebBibleLayout.setObjectName(u'WebBibleLayout')
660- self.OptionsGroupBox = QtGui.QGroupBox(self.WebBiblePage)
661+ self.tabWidget.addTab(self.CsvTab, u'')
662+ self.HttpTab = QtGui.QWidget()
663+ self.HttpTab.setObjectName(u'HttpTab')
664+ self.OptionsGroupBox = QtGui.QGroupBox(self.HttpTab)
665+ self.OptionsGroupBox.setGeometry(QtCore.QRect(10, 10, 460, 141))
666 self.OptionsGroupBox.setObjectName(u'OptionsGroupBox')
667- self.formLayout_2 = QtGui.QFormLayout(self.OptionsGroupBox)
668- self.formLayout_2.setObjectName(u'formLayout_2')
669+ self.verticalLayout = QtGui.QVBoxLayout(self.OptionsGroupBox)
670+ self.verticalLayout.setObjectName(u'verticalLayout')
671+ self.horizontalLayout_4 = QtGui.QHBoxLayout()
672+ self.horizontalLayout_4.setObjectName(u'horizontalLayout_4')
673 self.LocationLabel = QtGui.QLabel(self.OptionsGroupBox)
674 self.LocationLabel.setObjectName(u'LocationLabel')
675- self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.LocationLabel)
676+ self.horizontalLayout_4.addWidget(self.LocationLabel)
677 self.LocationComboBox = QtGui.QComboBox(self.OptionsGroupBox)
678 self.LocationComboBox.setObjectName(u'LocationComboBox')
679 self.LocationComboBox.addItem(QtCore.QString())
680- self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.LocationComboBox)
681+ self.horizontalLayout_4.addWidget(self.LocationComboBox)
682+ self.verticalLayout.addLayout(self.horizontalLayout_4)
683+ self.horizontalLayout_5 = QtGui.QHBoxLayout()
684+ self.horizontalLayout_5.setObjectName(u'horizontalLayout_5')
685 self.BibleLabel = QtGui.QLabel(self.OptionsGroupBox)
686 self.BibleLabel.setObjectName(u'BibleLabel')
687- self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.BibleLabel)
688+ self.horizontalLayout_5.addWidget(self.BibleLabel)
689 self.BibleComboBox = QtGui.QComboBox(self.OptionsGroupBox)
690 self.BibleComboBox.setObjectName(u'BibleComboBox')
691 self.BibleComboBox.addItem(QtCore.QString())
692 self.BibleComboBox.setItemText(0, u'')
693 self.BibleComboBox.addItem(QtCore.QString())
694 self.BibleComboBox.addItem(QtCore.QString())
695- self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.BibleComboBox)
696- self.WebBibleLayout.addWidget(self.OptionsGroupBox)
697- self.ProxyGroupBox = QtGui.QGroupBox(self.WebBiblePage)
698+ self.horizontalLayout_5.addWidget(self.BibleComboBox)
699+ self.verticalLayout.addLayout(self.horizontalLayout_5)
700+ self.ProxyGroupBox = QtGui.QGroupBox(self.HttpTab)
701+ self.ProxyGroupBox.setGeometry(QtCore.QRect(10, 160, 460, 161))
702 self.ProxyGroupBox.setObjectName(u'ProxyGroupBox')
703 self.ProxySettingsLayout = QtGui.QFormLayout(self.ProxyGroupBox)
704 self.ProxySettingsLayout.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
705@@ -129,66 +186,12 @@
706 self.PasswordLabel.setObjectName(u'PasswordLabel')
707 self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PasswordLabel)
708 self.PasswordEdit = QtGui.QLineEdit(self.ProxyGroupBox)
709- self.PasswordEdit.setEchoMode(QtGui.QLineEdit.Password)
710 self.PasswordEdit.setObjectName(u'PasswordEdit')
711 self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit)
712- self.WebBibleLayout.addWidget(self.ProxyGroupBox)
713- self.ImportToolBox.addItem(self.WebBiblePage, u'')
714- self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog)
715- self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 435, 471, 151))
716- self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123))
717- self.LicenceDetailsGroupBox.setObjectName(u'LicenceDetailsGroupBox')
718- self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox)
719- self.formLayout.setMargin(8)
720- self.formLayout.setHorizontalSpacing(8)
721- self.formLayout.setObjectName(u'formLayout')
722- self.VersionNameLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
723- self.VersionNameLabel.setObjectName(u'VersionNameLabel')
724- self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VersionNameLabel)
725- self.VersionNameEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
726- self.VersionNameEdit.setObjectName(u'VersionNameEdit')
727- self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.VersionNameEdit)
728- self.CopyrightLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
729- self.CopyrightLabel.setObjectName(u'CopyrightLabel')
730- self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightLabel)
731- self.CopyrightEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
732- self.CopyrightEdit.setObjectName(u'CopyrightEdit')
733- self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightEdit)
734- self.PermisionLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
735- self.PermisionLabel.setObjectName(u'PermisionLabel')
736- self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PermisionLabel)
737- self.PermisionEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
738- self.PermisionEdit.setObjectName(u'PermisionEdit')
739- self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit)
740- self.MessageLabel = QtGui.QLabel(BibleImportDialog)
741- self.MessageLabel.setGeometry(QtCore.QRect(20, 670, 271, 17))
742- self.MessageLabel.setObjectName(u'MessageLabel')
743- self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog)
744- self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 600, 471, 70))
745- self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
746- self.gridLayout_3 = QtGui.QGridLayout(self.ProgressGroupBox)
747- self.gridLayout_3.setObjectName(u'gridLayout_3')
748- self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
749- self.ProgressBar.setProperty(u'value', QtCore.QVariant(0))
750- self.ProgressBar.setInvertedAppearance(False)
751- self.ProgressBar.setObjectName(u'ProgressBar')
752- self.gridLayout_3.addWidget(self.ProgressBar, 0, 0, 1, 1)
753- self.layoutWidget = QtGui.QWidget(BibleImportDialog)
754- self.layoutWidget.setGeometry(QtCore.QRect(300, 680, 180, 38))
755- self.layoutWidget.setObjectName(u'layoutWidget')
756- self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget)
757- self.horizontalLayout.setMargin(6)
758- self.horizontalLayout.setObjectName(u'horizontalLayout')
759- self.ImportButton = QtGui.QPushButton(self.layoutWidget)
760- self.ImportButton.setObjectName(u'ImportButton')
761- self.horizontalLayout.addWidget(self.ImportButton)
762- self.CancelButton = QtGui.QPushButton(self.layoutWidget)
763- self.CancelButton.setObjectName(u'CancelButton')
764- self.horizontalLayout.addWidget(self.CancelButton)
765+ self.tabWidget.addTab(self.HttpTab, u'')
766
767 self.retranslateUi(BibleImportDialog)
768- self.ImportToolBox.setCurrentIndex(1)
769-
770+ self.tabWidget.setCurrentIndex(2)
771 QtCore.QMetaObject.connectSlotsByName(BibleImportDialog)
772 BibleImportDialog.setTabOrder(self.BibleNameEdit, self.OSISLocationEdit)
773 BibleImportDialog.setTabOrder(self.OSISLocationEdit, self.OsisFileButton)
774@@ -206,30 +209,31 @@
775 BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit)
776
777 def retranslateUi(self, BibleImportDialog):
778- BibleImportDialog.setWindowTitle(translate(u'BibleImportDialog', u'Bible Registration'))
779- self.OSISGroupBox.setTitle(translate(u'BibleImportDialog', u'OSIS Bible'))
780- self.LocatioLabel.setText(translate(u'BibleImportDialog', u'File Location:'))
781- self.CVSGroupBox.setTitle(translate(u'BibleImportDialog', u'CVS Bible'))
782- self.BooksLocationLabel.setText(translate(u'BibleImportDialog', u'Books Location:'))
783- self.VerseLocationLabel.setText(translate(u'BibleImportDialog', u'Verse Location:'))
784- self.BibleNameLabel.setText(translate(u'BibleImportDialog', u'Bible Name:'))
785- self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.FileImportPage), translate(u'BibleImportDialog', u'File Import Page'))
786- self.OptionsGroupBox.setTitle(translate(u'BibleImportDialog', u'Download Options'))
787- self.LocationLabel.setText(translate(u'BibleImportDialog', u'Location:'))
788- self.LocationComboBox.setItemText(0, translate(u'BibleImportDialog', u'Crosswalk'))
789- self.BibleLabel.setText(translate(u'BibleImportDialog', u'Bible:'))
790- self.BibleComboBox.setItemText(1, translate(u'BibleImportDialog', u'NIV'))
791- self.BibleComboBox.setItemText(2, translate(u'BibleImportDialog', u'KJV'))
792- self.ProxyGroupBox.setTitle(translate(u'BibleImportDialog', u'Proxy Settings (Optional)'))
793- self.AddressLabel.setText(translate(u'BibleImportDialog', u'Proxy Address:'))
794- self.UsernameLabel.setText(translate(u'BibleImportDialog', u'Username:'))
795- self.PasswordLabel.setText(translate(u'BibleImportDialog', u'Password:'))
796- self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.WebBiblePage), translate(u'BibleImportDialog', u'Web Bible Import page'))
797- self.LicenceDetailsGroupBox.setTitle(translate(u'BibleImportDialog', u'Licence Details'))
798- self.VersionNameLabel.setText(translate(u'BibleImportDialog', u'Version Name:'))
799- self.CopyrightLabel.setText(translate(u'BibleImportDialog', u'Copyright:'))
800- self.PermisionLabel.setText(translate(u'BibleImportDialog', u'Permission:'))
801- self.ProgressGroupBox.setTitle(translate(u'BibleImportDialog', u'Import Progress'))
802- self.ProgressBar.setFormat(translate(u'BibleImportDialog', u'%p'))
803- self.ImportButton.setText(translate(u'BibleImportDialog', u'Import'))
804- self.CancelButton.setText(translate(u'BibleImportDialog', u'Cancel'))
805+ BibleImportDialog.setWindowTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Registration', None, QtGui.QApplication.UnicodeUTF8))
806+ self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Licence Details', None, QtGui.QApplication.UnicodeUTF8))
807+ self.VersionNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Version Name:', None, QtGui.QApplication.UnicodeUTF8))
808+ self.CopyrightLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Copyright:', None, QtGui.QApplication.UnicodeUTF8))
809+ self.PermisionLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Permission:', None, QtGui.QApplication.UnicodeUTF8))
810+ self.ProgressGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Import Progress', None, QtGui.QApplication.UnicodeUTF8))
811+ self.ProgressBar.setFormat(QtGui.QApplication.translate(u'BibleImportDialog', u'%p', None, QtGui.QApplication.UnicodeUTF8))
812+ self.ImportButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Import', None, QtGui.QApplication.UnicodeUTF8))
813+ self.CancelButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Cancel', None, QtGui.QApplication.UnicodeUTF8))
814+ self.OSISGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'OSIS Bible', None, QtGui.QApplication.UnicodeUTF8))
815+ self.BibleNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Name:', None, QtGui.QApplication.UnicodeUTF8))
816+ self.LocatioLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'File Location:', None, QtGui.QApplication.UnicodeUTF8))
817+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.OsisTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Osis (Sword) Imports', None, QtGui.QApplication.UnicodeUTF8))
818+ self.CVSGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'CVS Bible', None, QtGui.QApplication.UnicodeUTF8))
819+ self.BooksLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Books Location:', None, QtGui.QApplication.UnicodeUTF8))
820+ self.VerseLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Verse Location:', None, QtGui.QApplication.UnicodeUTF8))
821+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.CsvTab), QtGui.QApplication.translate(u'BibleImportDialog', u'CSV File Imports', None, QtGui.QApplication.UnicodeUTF8))
822+ self.OptionsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Download Options', None, QtGui.QApplication.UnicodeUTF8))
823+ self.LocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Location:', None, QtGui.QApplication.UnicodeUTF8))
824+ self.LocationComboBox.setItemText(0, QtGui.QApplication.translate(u'BibleImportDialog', u'Crosswalk', None, QtGui.QApplication.UnicodeUTF8))
825+ self.BibleLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible:', None, QtGui.QApplication.UnicodeUTF8))
826+ self.BibleComboBox.setItemText(1, QtGui.QApplication.translate(u'BibleImportDialog', u'NIV', None, QtGui.QApplication.UnicodeUTF8))
827+ self.BibleComboBox.setItemText(2, QtGui.QApplication.translate(u'BibleImportDialog', u'KJV', None, QtGui.QApplication.UnicodeUTF8))
828+ self.ProxyGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Settings (Optional)', None, QtGui.QApplication.UnicodeUTF8))
829+ self.AddressLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Address:', None, QtGui.QApplication.UnicodeUTF8))
830+ self.UsernameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Username:', None, QtGui.QApplication.UnicodeUTF8))
831+ self.PasswordLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Password:', None, QtGui.QApplication.UnicodeUTF8))
832+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.HttpTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Web Downloads', None, QtGui.QApplication.UnicodeUTF8))
833
834=== modified file 'resources/forms/bibleimportdialog.ui'
835--- resources/forms/bibleimportdialog.ui 2009-02-20 17:10:30 +0000
836+++ resources/forms/bibleimportdialog.ui 2009-08-07 17:19:32 +0000
837@@ -6,307 +6,23 @@
838 <rect>
839 <x>0</x>
840 <y>0</y>
841- <width>494</width>
842- <height>725</height>
843+ <width>500</width>
844+ <height>686</height>
845 </rect>
846 </property>
847 <property name="windowTitle">
848 <string>Bible Registration</string>
849 </property>
850 <property name="windowIcon">
851- <iconset resource="../images/openlp-2.qrc">
852+ <iconset>
853 <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
854 </property>
855- <widget class="QToolBox" name="ImportToolBox">
856- <property name="geometry">
857- <rect>
858- <x>20</x>
859- <y>20</y>
860- <width>451</width>
861- <height>401</height>
862- </rect>
863- </property>
864- <property name="frameShape">
865- <enum>QFrame::StyledPanel</enum>
866- </property>
867- <property name="currentIndex">
868- <number>1</number>
869- </property>
870- <widget class="QWidget" name="FileImportPage">
871- <property name="geometry">
872- <rect>
873- <x>0</x>
874- <y>0</y>
875- <width>447</width>
876- <height>337</height>
877- </rect>
878- </property>
879- <attribute name="label">
880- <string>File Import Page</string>
881- </attribute>
882- <widget class="QGroupBox" name="OSISGroupBox">
883- <property name="geometry">
884- <rect>
885- <x>18</x>
886- <y>65</y>
887- <width>411</width>
888- <height>81</height>
889- </rect>
890- </property>
891- <property name="title">
892- <string>OSIS Bible</string>
893- </property>
894- <layout class="QGridLayout" name="gridLayout_2">
895- <property name="margin">
896- <number>8</number>
897- </property>
898- <property name="spacing">
899- <number>8</number>
900- </property>
901- <item row="0" column="0">
902- <widget class="QLabel" name="LocatioLabel">
903- <property name="text">
904- <string>File Location:</string>
905- </property>
906- </widget>
907- </item>
908- <item row="0" column="1">
909- <widget class="QLineEdit" name="OSISLocationEdit"/>
910- </item>
911- <item row="0" column="2">
912- <widget class="QPushButton" name="OsisFileButton">
913- <property name="text">
914- <string/>
915- </property>
916- <property name="icon">
917- <iconset resource="../images/openlp-2.qrc">
918- <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
919- </property>
920- </widget>
921- </item>
922- </layout>
923- </widget>
924- <widget class="QGroupBox" name="CVSGroupBox">
925- <property name="geometry">
926- <rect>
927- <x>20</x>
928- <y>170</y>
929- <width>411</width>
930- <height>191</height>
931- </rect>
932- </property>
933- <property name="title">
934- <string>CVS Bible</string>
935- </property>
936- <layout class="QGridLayout" name="gridLayout">
937- <property name="margin">
938- <number>8</number>
939- </property>
940- <property name="spacing">
941- <number>8</number>
942- </property>
943- <item row="0" column="0">
944- <widget class="QLabel" name="BooksLocationLabel">
945- <property name="text">
946- <string>Books Location:</string>
947- </property>
948- </widget>
949- </item>
950- <item row="4" column="0">
951- <widget class="QLabel" name="VerseLocationLabel">
952- <property name="text">
953- <string>Verse Location:</string>
954- </property>
955- </widget>
956- </item>
957- <item row="4" column="1">
958- <widget class="QLineEdit" name="VerseLocationEdit"/>
959- </item>
960- <item row="0" column="1">
961- <widget class="QLineEdit" name="BooksLocationEdit"/>
962- </item>
963- <item row="0" column="2">
964- <widget class="QPushButton" name="BooksFileButton">
965- <property name="text">
966- <string/>
967- </property>
968- <property name="icon">
969- <iconset resource="../images/openlp-2.qrc">
970- <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
971- </property>
972- </widget>
973- </item>
974- <item row="4" column="2">
975- <widget class="QPushButton" name="VersesFileButton">
976- <property name="text">
977- <string/>
978- </property>
979- <property name="icon">
980- <iconset resource="../images/openlp-2.qrc">
981- <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
982- </property>
983- </widget>
984- </item>
985- </layout>
986- </widget>
987- <widget class="QLineEdit" name="BibleNameEdit">
988- <property name="geometry">
989- <rect>
990- <x>100</x>
991- <y>20</y>
992- <width>280</width>
993- <height>28</height>
994- </rect>
995- </property>
996- </widget>
997- <widget class="QLabel" name="BibleNameLabel">
998- <property name="geometry">
999- <rect>
1000- <x>18</x>
1001- <y>20</y>
1002- <width>98</width>
1003- <height>22</height>
1004- </rect>
1005- </property>
1006- <property name="text">
1007- <string>Bible Name:</string>
1008- </property>
1009- </widget>
1010- </widget>
1011- <widget class="QWidget" name="WebBiblePage">
1012- <property name="geometry">
1013- <rect>
1014- <x>0</x>
1015- <y>0</y>
1016- <width>447</width>
1017- <height>337</height>
1018- </rect>
1019- </property>
1020- <attribute name="label">
1021- <string>Web Bible Import page</string>
1022- </attribute>
1023- <layout class="QVBoxLayout" name="WebBibleLayout">
1024- <property name="spacing">
1025- <number>8</number>
1026- </property>
1027- <property name="margin">
1028- <number>8</number>
1029- </property>
1030- <item>
1031- <widget class="QGroupBox" name="OptionsGroupBox">
1032- <property name="title">
1033- <string>Download Options</string>
1034- </property>
1035- <layout class="QFormLayout" name="formLayout_2">
1036- <item row="0" column="0">
1037- <widget class="QLabel" name="LocationLabel">
1038- <property name="text">
1039- <string>Location:</string>
1040- </property>
1041- </widget>
1042- </item>
1043- <item row="0" column="1">
1044- <widget class="QComboBox" name="LocationComboBox">
1045- <item>
1046- <property name="text">
1047- <string>Crosswalk</string>
1048- </property>
1049- </item>
1050- </widget>
1051- </item>
1052- <item row="1" column="0">
1053- <widget class="QLabel" name="BibleLabel">
1054- <property name="text">
1055- <string>Bible:</string>
1056- </property>
1057- </widget>
1058- </item>
1059- <item row="1" column="1">
1060- <widget class="QComboBox" name="BibleComboBox">
1061- <item>
1062- <property name="text">
1063- <string/>
1064- </property>
1065- </item>
1066- <item>
1067- <property name="text">
1068- <string>NIV</string>
1069- </property>
1070- </item>
1071- <item>
1072- <property name="text">
1073- <string>KJV</string>
1074- </property>
1075- </item>
1076- </widget>
1077- </item>
1078- </layout>
1079- <zorder>BibleComboBox</zorder>
1080- <zorder>LocationLabel</zorder>
1081- <zorder>BibleLabel</zorder>
1082- <zorder>LocationComboBox</zorder>
1083- </widget>
1084- </item>
1085- <item>
1086- <widget class="QGroupBox" name="ProxyGroupBox">
1087- <property name="title">
1088- <string>Proxy Settings (Optional)</string>
1089- </property>
1090- <layout class="QFormLayout" name="ProxySettingsLayout">
1091- <property name="fieldGrowthPolicy">
1092- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
1093- </property>
1094- <property name="horizontalSpacing">
1095- <number>8</number>
1096- </property>
1097- <property name="verticalSpacing">
1098- <number>8</number>
1099- </property>
1100- <property name="margin">
1101- <number>8</number>
1102- </property>
1103- <item row="0" column="0">
1104- <widget class="QLabel" name="AddressLabel">
1105- <property name="text">
1106- <string>Proxy Address:</string>
1107- </property>
1108- </widget>
1109- </item>
1110- <item row="0" column="1">
1111- <widget class="QLineEdit" name="AddressEdit"/>
1112- </item>
1113- <item row="1" column="0">
1114- <widget class="QLabel" name="UsernameLabel">
1115- <property name="text">
1116- <string>Username:</string>
1117- </property>
1118- </widget>
1119- </item>
1120- <item row="1" column="1">
1121- <widget class="QLineEdit" name="UsernameEdit"/>
1122- </item>
1123- <item row="2" column="0">
1124- <widget class="QLabel" name="PasswordLabel">
1125- <property name="text">
1126- <string>Password:</string>
1127- </property>
1128- </widget>
1129- </item>
1130- <item row="2" column="1">
1131- <widget class="QLineEdit" name="PasswordEdit"/>
1132- </item>
1133- </layout>
1134- </widget>
1135- </item>
1136- </layout>
1137- </widget>
1138- </widget>
1139 <widget class="QGroupBox" name="LicenceDetailsGroupBox">
1140 <property name="geometry">
1141 <rect>
1142 <x>10</x>
1143- <y>435</y>
1144- <width>471</width>
1145+ <y>400</y>
1146+ <width>480</width>
1147 <height>151</height>
1148 </rect>
1149 </property>
1150@@ -375,8 +91,8 @@
1151 <property name="geometry">
1152 <rect>
1153 <x>10</x>
1154- <y>600</y>
1155- <width>471</width>
1156+ <y>550</y>
1157+ <width>480</width>
1158 <height>70</height>
1159 </rect>
1160 </property>
1161@@ -402,8 +118,8 @@
1162 <widget class="QWidget" name="layoutWidget">
1163 <property name="geometry">
1164 <rect>
1165- <x>300</x>
1166- <y>680</y>
1167+ <x>310</x>
1168+ <y>630</y>
1169 <width>180</width>
1170 <height>38</height>
1171 </rect>
1172@@ -428,6 +144,280 @@
1173 </item>
1174 </layout>
1175 </widget>
1176+ <widget class="QTabWidget" name="tabWidget">
1177+ <property name="geometry">
1178+ <rect>
1179+ <x>10</x>
1180+ <y>30</y>
1181+ <width>480</width>
1182+ <height>361</height>
1183+ </rect>
1184+ </property>
1185+ <property name="currentIndex">
1186+ <number>2</number>
1187+ </property>
1188+ <widget class="QWidget" name="OsisTab">
1189+ <attribute name="title">
1190+ <string>Osis (Sword) Imports</string>
1191+ </attribute>
1192+ <widget class="QGroupBox" name="OSISGroupBox">
1193+ <property name="geometry">
1194+ <rect>
1195+ <x>10</x>
1196+ <y>10</y>
1197+ <width>460</width>
1198+ <height>141</height>
1199+ </rect>
1200+ </property>
1201+ <property name="title">
1202+ <string>OSIS Bible</string>
1203+ </property>
1204+ <layout class="QGridLayout" name="gridLayout_2">
1205+ <item row="0" column="0">
1206+ <layout class="QHBoxLayout" name="horizontalLayout_2">
1207+ <item>
1208+ <widget class="QLabel" name="BibleNameLabel">
1209+ <property name="text">
1210+ <string>Bible Name:</string>
1211+ </property>
1212+ </widget>
1213+ </item>
1214+ <item>
1215+ <widget class="QLineEdit" name="BibleNameEdit"/>
1216+ </item>
1217+ </layout>
1218+ </item>
1219+ <item row="1" column="0">
1220+ <layout class="QHBoxLayout" name="horizontalLayout_3">
1221+ <item>
1222+ <widget class="QLabel" name="LocatioLabel">
1223+ <property name="text">
1224+ <string>File Location:</string>
1225+ </property>
1226+ </widget>
1227+ </item>
1228+ <item>
1229+ <widget class="QLineEdit" name="OSISLocationEdit"/>
1230+ </item>
1231+ <item>
1232+ <widget class="QPushButton" name="OsisFileButton">
1233+ <property name="text">
1234+ <string/>
1235+ </property>
1236+ <property name="icon">
1237+ <iconset resource="../images/openlp-2.qrc">
1238+ <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
1239+ </property>
1240+ </widget>
1241+ </item>
1242+ </layout>
1243+ </item>
1244+ </layout>
1245+ </widget>
1246+ </widget>
1247+ <widget class="QWidget" name="CsvTab">
1248+ <attribute name="title">
1249+ <string>CSV File Imports</string>
1250+ </attribute>
1251+ <widget class="QGroupBox" name="CVSGroupBox">
1252+ <property name="geometry">
1253+ <rect>
1254+ <x>10</x>
1255+ <y>10</y>
1256+ <width>460</width>
1257+ <height>191</height>
1258+ </rect>
1259+ </property>
1260+ <property name="title">
1261+ <string>CVS Bible</string>
1262+ </property>
1263+ <layout class="QGridLayout" name="gridLayout">
1264+ <property name="margin">
1265+ <number>8</number>
1266+ </property>
1267+ <property name="spacing">
1268+ <number>8</number>
1269+ </property>
1270+ <item row="0" column="0">
1271+ <widget class="QLabel" name="BooksLocationLabel">
1272+ <property name="text">
1273+ <string>Books Location:</string>
1274+ </property>
1275+ </widget>
1276+ </item>
1277+ <item row="4" column="0">
1278+ <widget class="QLabel" name="VerseLocationLabel">
1279+ <property name="text">
1280+ <string>Verse Location:</string>
1281+ </property>
1282+ </widget>
1283+ </item>
1284+ <item row="4" column="1">
1285+ <widget class="QLineEdit" name="VerseLocationEdit"/>
1286+ </item>
1287+ <item row="0" column="1">
1288+ <widget class="QLineEdit" name="BooksLocationEdit"/>
1289+ </item>
1290+ <item row="0" column="2">
1291+ <widget class="QPushButton" name="BooksFileButton">
1292+ <property name="text">
1293+ <string/>
1294+ </property>
1295+ <property name="icon">
1296+ <iconset resource="../images/openlp-2.qrc">
1297+ <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
1298+ </property>
1299+ </widget>
1300+ </item>
1301+ <item row="4" column="2">
1302+ <widget class="QPushButton" name="VersesFileButton">
1303+ <property name="text">
1304+ <string/>
1305+ </property>
1306+ <property name="icon">
1307+ <iconset resource="../images/openlp-2.qrc">
1308+ <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
1309+ </property>
1310+ </widget>
1311+ </item>
1312+ </layout>
1313+ </widget>
1314+ </widget>
1315+ <widget class="QWidget" name="HttpTab">
1316+ <attribute name="title">
1317+ <string>Web Downloads</string>
1318+ </attribute>
1319+ <widget class="QGroupBox" name="OptionsGroupBox">
1320+ <property name="geometry">
1321+ <rect>
1322+ <x>10</x>
1323+ <y>10</y>
1324+ <width>460</width>
1325+ <height>141</height>
1326+ </rect>
1327+ </property>
1328+ <property name="title">
1329+ <string>Download Options</string>
1330+ </property>
1331+ <layout class="QVBoxLayout" name="verticalLayout">
1332+ <item>
1333+ <layout class="QHBoxLayout" name="horizontalLayout_4">
1334+ <item>
1335+ <widget class="QLabel" name="LocationLabel">
1336+ <property name="text">
1337+ <string>Location:</string>
1338+ </property>
1339+ </widget>
1340+ </item>
1341+ <item>
1342+ <widget class="QComboBox" name="LocationComboBox">
1343+ <item>
1344+ <property name="text">
1345+ <string>Crosswalk</string>
1346+ </property>
1347+ </item>
1348+ </widget>
1349+ </item>
1350+ </layout>
1351+ </item>
1352+ <item>
1353+ <layout class="QHBoxLayout" name="horizontalLayout_5">
1354+ <item>
1355+ <widget class="QLabel" name="BibleLabel">
1356+ <property name="text">
1357+ <string>Bible:</string>
1358+ </property>
1359+ </widget>
1360+ </item>
1361+ <item>
1362+ <widget class="QComboBox" name="BibleComboBox">
1363+ <item>
1364+ <property name="text">
1365+ <string/>
1366+ </property>
1367+ </item>
1368+ <item>
1369+ <property name="text">
1370+ <string>NIV</string>
1371+ </property>
1372+ </item>
1373+ <item>
1374+ <property name="text">
1375+ <string>KJV</string>
1376+ </property>
1377+ </item>
1378+ </widget>
1379+ </item>
1380+ </layout>
1381+ </item>
1382+ </layout>
1383+ <zorder>BibleComboBox</zorder>
1384+ <zorder>LocationLabel</zorder>
1385+ <zorder>BibleLabel</zorder>
1386+ <zorder>LocationComboBox</zorder>
1387+ </widget>
1388+ <widget class="QGroupBox" name="ProxyGroupBox">
1389+ <property name="geometry">
1390+ <rect>
1391+ <x>10</x>
1392+ <y>160</y>
1393+ <width>460</width>
1394+ <height>161</height>
1395+ </rect>
1396+ </property>
1397+ <property name="title">
1398+ <string>Proxy Settings (Optional)</string>
1399+ </property>
1400+ <layout class="QFormLayout" name="ProxySettingsLayout">
1401+ <property name="fieldGrowthPolicy">
1402+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
1403+ </property>
1404+ <property name="horizontalSpacing">
1405+ <number>8</number>
1406+ </property>
1407+ <property name="verticalSpacing">
1408+ <number>8</number>
1409+ </property>
1410+ <property name="margin">
1411+ <number>8</number>
1412+ </property>
1413+ <item row="0" column="0">
1414+ <widget class="QLabel" name="AddressLabel">
1415+ <property name="text">
1416+ <string>Proxy Address:</string>
1417+ </property>
1418+ </widget>
1419+ </item>
1420+ <item row="0" column="1">
1421+ <widget class="QLineEdit" name="AddressEdit"/>
1422+ </item>
1423+ <item row="1" column="0">
1424+ <widget class="QLabel" name="UsernameLabel">
1425+ <property name="text">
1426+ <string>Username:</string>
1427+ </property>
1428+ </widget>
1429+ </item>
1430+ <item row="1" column="1">
1431+ <widget class="QLineEdit" name="UsernameEdit"/>
1432+ </item>
1433+ <item row="2" column="0">
1434+ <widget class="QLabel" name="PasswordLabel">
1435+ <property name="text">
1436+ <string>Password:</string>
1437+ </property>
1438+ </widget>
1439+ </item>
1440+ <item row="2" column="1">
1441+ <widget class="QLineEdit" name="PasswordEdit"/>
1442+ </item>
1443+ </layout>
1444+ </widget>
1445+ <zorder>OptionsGroupBox</zorder>
1446+ <zorder>OptionsGroupBox</zorder>
1447+ <zorder>ProxyGroupBox</zorder>
1448+ </widget>
1449+ </widget>
1450 </widget>
1451 <tabstops>
1452 <tabstop>BibleNameEdit</tabstop>