1
=== modified file 'openlp/core/lib/mediamanageritem.py'
2
--- openlp/core/lib/mediamanageritem.py	2009-09-16 04:59:38 +0000
3
+++ openlp/core/lib/mediamanageritem.py	2009-09-21 19:26:10 +0000
4
@@ -136,7 +136,8 @@
5
136
            self.Toolbar = OpenLPToolbar(self)
136
            self.Toolbar = OpenLPToolbar(self)
6
137
            self.PageLayout.addWidget(self.Toolbar)
137
            self.PageLayout.addWidget(self.Toolbar)
7
138
138
9
139
    def addToolbarButton(self, title, tooltip, icon, slot=None, objectname=None):
139
    def addToolbarButton(self, title, tooltip, icon, slot=None,
10
140
        objectname=None):
11
140
        """
141
        """
12
141
        A method to help developers easily add a button to the toolbar.
142
        A method to help developers easily add a button to the toolbar.
13
142
143
14
@@ -192,31 +193,46 @@
15
192
        ## File Button ##
193
        ## File Button ##
16
193
        if self.hasFileIcon:
194
        if self.hasFileIcon:
17
194
            self.addToolbarButton(
195
            self.addToolbarButton(
21
195
                translate(self.TranslationContext, u'Load '+self.PluginTextShort),
196
                translate(
22
196
                translate(self.TranslationContext, u'Load a new '+self.PluginTextShort),
197
                    self.TranslationContext, u'Load ' + self.PluginTextShort),
23
197
                u':'+self.IconPath+ u'_load.png', self.onFileClick, self.PluginTextShort+u'FileItem')
198
                translate(
24
199
                    self.TranslationContext,
25
200
                    u'Load a new ' + self.PluginTextShort),
26
201
                u':' + self.IconPath + u'_load.png', self.onFileClick,
27
202
                self.PluginTextShort + u'FileItem')
28
198
        ## New Button ##
203
        ## New Button ##
29
199
        if self.hasNewIcon:
204
        if self.hasNewIcon:
30
200
            self.addToolbarButton(
205
            self.addToolbarButton(
34
201
                translate(self.TranslationContext, u'New '+self.PluginTextShort),
206
                translate(
35
202
                translate(self.TranslationContext, u'Add a new '+self.PluginTextShort),
207
                    self.TranslationContext, u'New ' + self.PluginTextShort),
36
203
                u':'+self.IconPath+ u'_new.png', self.onNewClick, self.PluginTextShort+u'NewItem')
208
                translate(
37
209
                    self.TranslationContext,
38
210
                    u'Add a new ' + self.PluginTextShort),
39
211
                u':' + self.IconPath + u'_new.png', self.onNewClick,
40
212
                self.PluginTextShort + u'NewItem')
41
204
        ## Edit Button ##
213
        ## Edit Button ##
42
205
        if self.hasEditIcon:
214
        if self.hasEditIcon:
43
206
            self.addToolbarButton(
215
            self.addToolbarButton(
47
207
                translate(self.TranslationContext, u'Edit '+self.PluginTextShort),
216
                translate(
48
208
                translate(self.TranslationContext, u'Edit the selected '+self.PluginTextShort),
217
                    self.TranslationContext, u'Edit ' + self.PluginTextShort),
49
209
                u':'+self.IconPath+ u'_edit.png', self.onEditClick, self.PluginTextShort+u'EditItem')
218
                translate(
50
219
                    self.TranslationContext,
51
220
                    u'Edit the selected ' + self.PluginTextShort),
52
221
                u':' + self.IconPath + u'_edit.png', self.onEditClick,
53
222
                self.PluginTextShort + u'EditItem')
54
210
        ## Delete Button ##
223
        ## Delete Button ##
55
211
        self.addToolbarButton(
224
        self.addToolbarButton(
57
212
            translate(self.TranslationContext, u'Delete '+self.PluginTextShort),
225
            translate(
58
226
                self.TranslationContext, u'Delete ' + self.PluginTextShort),
59
213
            translate(self.TranslationContext, u'Delete the selected item'),
227
            translate(self.TranslationContext, u'Delete the selected item'),
61
214
            u':'+self.IconPath+ u'_delete.png', self.onDeleteClick, self.PluginTextShort+u'DeleteItem')
228
            u':' + self.IconPath + u'_delete.png', self.onDeleteClick,
62
229
            self.PluginTextShort + u'DeleteItem')
63
215
        ## Separator Line ##
230
        ## Separator Line ##
64
216
        self.addToolbarSeparator()
231
        self.addToolbarSeparator()
65
217
        ## Preview ##
232
        ## Preview ##
66
218
        self.addToolbarButton(
233
        self.addToolbarButton(
68
219
            translate(self.TranslationContext, u'Preview '+self.PluginTextShort),
234
            translate(
69
235
                self.TranslationContext, u'Preview ' + self.PluginTextShort),
70
220
            translate(self.TranslationContext, u'Preview the selected item'),
236
            translate(self.TranslationContext, u'Preview the selected item'),
71
221
            u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem')
237
            u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem')
72
222
        ## Live  Button ##
238
        ## Live  Button ##
73
@@ -226,9 +242,14 @@
74
226
            u':/system/system_live.png', self.onLiveClick, u'LiveItem')
242
            u':/system/system_live.png', self.onLiveClick, u'LiveItem')
75
227
        ## Add to service Button ##
243
        ## Add to service Button ##
76
228
        self.addToolbarButton(
244
        self.addToolbarButton(
80
229
            translate(self.TranslationContext, u'Add '+self.PluginTextShort+u' To Service'),
245
            translate(
81
230
            translate(self.TranslationContext, u'Add the selected item(s) to the service'),
246
                self.TranslationContext,
82
231
            u':/system/system_add.png', self.onAddClick, self.PluginTextShort+u'AddItem')
247
                u'Add ' + self.PluginTextShort + u' To Service'),
83
248
            translate(
84
249
                self.TranslationContext,
85
250
                u'Add the selected item(s) to the service'),
86
251
            u':/system/system_add.png', self.onAddClick,
87
252
            self.PluginTextShort + u'AddItem')
88
232
253
89
233
    def addListViewToToolBar(self):
254
    def addListViewToToolBar(self):
90
234
        #Add the List widget
255
        #Add the List widget
91
@@ -236,7 +257,8 @@
92
236
        self.ListView.uniformItemSizes = True
257
        self.ListView.uniformItemSizes = True
93
237
        self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591))
258
        self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591))
94
238
        self.ListView.setSpacing(1)
259
        self.ListView.setSpacing(1)
96
239
        self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
260
        self.ListView.setSelectionMode(
97
261
            QtGui.QAbstractItemView.ExtendedSelection)
98
240
        self.ListView.setAlternatingRowColors(True)
262
        self.ListView.setAlternatingRowColors(True)
99
241
        self.ListView.setDragEnabled(True)
263
        self.ListView.setDragEnabled(True)
100
242
        self.ListView.setObjectName(self.PluginTextShort+u'ListView')
264
        self.ListView.setObjectName(self.PluginTextShort+u'ListView')
101
@@ -247,12 +269,14 @@
102
247
        if self.hasEditIcon:
269
        if self.hasEditIcon:
103
248
            self.ListView.addAction(contextMenuAction(self.ListView,
270
            self.ListView.addAction(contextMenuAction(self.ListView,
104
249
                ':' +self.IconPath+u'_new.png',
271
                ':' +self.IconPath+u'_new.png',
106
250
                translate(self.TranslationContext, u'&Edit '+self.PluginTextShort),
272
                translate(self.TranslationContext,
107
273
                u'&Edit ' + self.PluginTextShort),
108
251
                self.onEditClick))
274
                self.onEditClick))
109
252
            self.ListView.addAction(contextMenuSeparator(self.ListView))
275
            self.ListView.addAction(contextMenuSeparator(self.ListView))
110
253
        self.ListView.addAction(contextMenuAction(
276
        self.ListView.addAction(contextMenuAction(
111
254
            self.ListView, ':/system/system_preview.png',
277
            self.ListView, ':/system/system_preview.png',
113
255
            translate(self.TranslationContext, u'&Preview '+self.PluginTextShort),
278
            translate(self.TranslationContext,
114
279
                u'&Preview ' + self.PluginTextShort),
115
256
            self.onPreviewClick))
280
            self.onPreviewClick))
116
257
        self.ListView.addAction(contextMenuAction(
281
        self.ListView.addAction(contextMenuAction(
117
258
            self.ListView, ':/system/system_live.png',
282
            self.ListView, ':/system/system_live.png',
118
@@ -301,20 +325,23 @@
119
301
        count = 0
325
        count = 0
120
302
        filelist = []
326
        filelist = []
121
303
        while  count < self.ListView.count():
327
        while  count < self.ListView.count():
123
304
            bitem =  self.ListView.item(count)
328
            bitem = self.ListView.item(count)
124
305
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
329
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
125
306
            filelist.append(filename)
330
            filelist.append(filename)
126
307
            count += 1
331
            count += 1
127
308
        return filelist
332
        return filelist
128
309
333
129
310
    def loadList(self, list):
334
    def loadList(self, list):
131
311
        raise NotImplementedError(u'MediaManagerItem.loadList needs to be defined by the plugin')
335
        raise NotImplementedError(
132
336
            u'MediaManagerItem.loadList needs to be defined by the plugin')
133
312
337
134
313
    def onNewClick(self):
338
    def onNewClick(self):
136
314
        raise NotImplementedError(u'MediaManagerItem.onNewClick needs to be defined by the plugin')
339
        raise NotImplementedError(
137
340
            u'MediaManagerItem.onNewClick needs to be defined by the plugin')
138
315
341
139
316
    def onEditClick(self):
342
    def onEditClick(self):
141
317
        raise NotImplementedError(u'MediaManagerItem.onEditClick needs to be defined by the plugin')
343
        raise NotImplementedError(
142
344
            u'MediaManagerItem.onEditClick needs to be defined by the plugin')
143
318
345
144
319
    def onDeleteClick(self):
346
    def onDeleteClick(self):
145
320
        raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to be defined by the plugin')
347
        raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to be defined by the plugin')
146
@@ -323,7 +350,7 @@
147
323
        raise NotImplementedError(u'MediaManagerItem.generateSlideData needs to be defined by the plugin')
350
        raise NotImplementedError(u'MediaManagerItem.generateSlideData needs to be defined by the plugin')
148
324
351
149
325
    def onPreviewClick(self):
352
    def onPreviewClick(self):
151
326
        log.debug(self.PluginTextShort+u' Preview Requested')
353
        log.debug(self.PluginTextShort + u' Preview Requested')
152
327
        service_item = self.buildServiceItem()
354
        service_item = self.buildServiceItem()
153
328
        if service_item is not None:
355
        if service_item is not None:
154
329
            self.parent.preview_controller.addServiceItem(service_item)
356
            self.parent.preview_controller.addServiceItem(service_item)
155
@@ -335,7 +362,7 @@
156
335
            self.parent.live_controller.addServiceItem(service_item)
362
            self.parent.live_controller.addServiceItem(service_item)
157
336
363
158
337
    def onAddClick(self):
364
    def onAddClick(self):
160
338
        log.debug(self.PluginTextShort+u' Add Requested')
365
        log.debug(self.PluginTextShort + u' Add Requested')
161
339
        service_item = self.buildServiceItem()
366
        service_item = self.buildServiceItem()
162
340
        if service_item is not None:
367
        if service_item is not None:
163
341
            self.parent.service_manager.addServiceItem(service_item)
368
            self.parent.service_manager.addServiceItem(service_item)
164
@@ -345,7 +372,8 @@
165
345
        Common method for generating a service item
372
        Common method for generating a service item
166
346
        """
373
        """
167
347
        service_item = ServiceItem(self.parent)
374
        service_item = ServiceItem(self.parent)
169
348
        service_item.addIcon(u':/media/media_'+self.PluginTextShort.lower()+u'.png')
375
        service_item.addIcon(
170
376
            u':/media/media_' + self.PluginTextShort.lower() + u'.png')
171
349
        if self.generateSlideData(service_item):
377
        if self.generateSlideData(service_item):
172
350
            self.ListView.clearSelection()
378
            self.ListView.clearSelection()
173
351
            return service_item
379
            return service_item
174
352
380
175
=== modified file 'openlp/core/lib/pluginmanager.py'
176
--- openlp/core/lib/pluginmanager.py	2009-09-19 23:05:30 +0000
177
+++ openlp/core/lib/pluginmanager.py	2009-09-21 17:56:36 +0000
178
@@ -26,7 +26,7 @@
179
26
import sys
26
import sys
180
27
import logging
27
import logging
181
28
28
183
29
from openlp.core.lib import Plugin,  PluginStatus
29
from openlp.core.lib import Plugin, PluginStatus
184
30
30
185
31
class PluginManager(object):
31
class PluginManager(object):
186
32
    """
32
    """
187
33
33
188
=== modified file 'openlp/core/lib/renderer.py'
189
--- openlp/core/lib/renderer.py	2009-09-20 13:21:05 +0000
190
+++ openlp/core/lib/renderer.py	2009-09-21 17:56:36 +0000
191
@@ -188,13 +188,13 @@
192
188
                else:
188
                else:
193
189
                    pos = len(line)
189
                    pos = len(line)
194
190
                    split_text = line
190
                    split_text = line
196
191
                while metrics.width(split_text,  -1) > line_width:
191
                while metrics.width(split_text, -1) > line_width:
197
192
                    #Find the next space to the left
192
                    #Find the next space to the left
198
193
                    pos = line[:pos].rfind(u' ')
193
                    pos = line[:pos].rfind(u' ')
199
194
                    #no more spaces found
194
                    #no more spaces found
200
195
                    if pos  == 0:
195
                    if pos  == 0:
201
196
                        split_text = line
196
                        split_text = line
203
197
                        while metrics.width(split_text,  -1) > line_width:
197
                        while metrics.width(split_text, -1) > line_width:
204
198
                            split_text = split_text[:-1]
198
                            split_text = split_text[:-1]
205
199
                        pos = len(split_text)
199
                        pos = len(split_text)
206
200
                    else:
200
                    else:
207
@@ -242,7 +242,7 @@
208
242
        # reset the frame. first time do not worry about what you paint on.
242
        # reset the frame. first time do not worry about what you paint on.
209
243
        self._frame = QtGui.QImage(self.bg_frame)
243
        self._frame = QtGui.QImage(self.bg_frame)
210
244
        x, y = self._correctAlignment(self._rect, bbox)
244
        x, y = self._correctAlignment(self._rect, bbox)
212
245
        bbox = self._render_lines_unaligned(lines, False,  (x, y), True)
245
        bbox = self._render_lines_unaligned(lines, False, (x, y), True)
213
246
        if footer_lines is not None:
246
        if footer_lines is not None:
214
247
            bbox = self._render_lines_unaligned(footer_lines, True,
247
            bbox = self._render_lines_unaligned(footer_lines, True,
215
248
                (self._rect_footer.left(), self._rect_footer.top()), True)
248
                (self._rect_footer.left(), self._rect_footer.top()), True)
216
@@ -327,7 +327,8 @@
217
327
            # centre align
327
            # centre align
218
328
            y = rect.top() + (rect.height() - bbox.height()) / 2
328
            y = rect.top() + (rect.height() - bbox.height()) / 2
219
329
        else:
329
        else:
221
330
            log.error(u'Invalid value for theme.VerticalAlign:%s' % self._theme.display_verticalAlign)
330
            log.error(u'Invalid value for theme.VerticalAlign:%s',
222
331
                self._theme.display_verticalAlign)
223
331
        return x, y
332
        return x, y
224
332
333
225
333
    def _render_lines_unaligned(self, lines, footer, tlcorner=(0, 0),
334
    def _render_lines_unaligned(self, lines, footer, tlcorner=(0, 0),
226
@@ -400,7 +401,7 @@
227
400
        startx = x
401
        startx = x
228
401
        starty = y
402
        starty = y
229
402
        rightextent = None
403
        rightextent = None
231
403
        #print "inputs",  startx,  starty, maxx, maxy
404
        #print "inputs", startx, starty, maxx, maxy
232
404
        # dont allow alignment messing with footers
405
        # dont allow alignment messing with footers
233
405
        if footer:
406
        if footer:
234
406
            align = 0
407
            align = 0
235
@@ -412,7 +413,7 @@
236
412
        for linenum in range(len(lines)):
413
        for linenum in range(len(lines)):
237
413
            line = lines[linenum]
414
            line = lines[linenum]
238
414
            #find out how wide line is
415
            #find out how wide line is
240
415
            w, h = self._get_extent_and_render(line, footer,  tlcorner=(x, y),
416
            w, h = self._get_extent_and_render(line, footer, tlcorner=(x, y),
241
416
                draw=False)
417
                draw=False)
242
417
            if self._theme.display_shadow:
418
            if self._theme.display_shadow:
243
418
                w += shadow_offset
419
                w += shadow_offset
244
419
420
245
=== modified file 'openlp/core/lib/rendermanager.py'
246
--- openlp/core/lib/rendermanager.py	2009-09-20 07:12:47 +0000
247
+++ openlp/core/lib/rendermanager.py	2009-09-21 17:56:36 +0000
248
@@ -121,7 +121,8 @@
249
121
        else:
121
        else:
250
122
            if theme is not None:
122
            if theme is not None:
251
123
                self.theme = theme
123
                self.theme = theme
253
124
            elif self.global_style == u'Song' or self.global_style == u'Service':
124
            elif self.global_style == u'Song' or \
254
125
                self.global_style == u'Service':
255
125
                if self.service_theme == u'':
126
                if self.service_theme == u'':
256
126
                    self.theme = self.global_theme
127
                    self.theme = self.global_theme
257
127
                else:
128
                else:
258
@@ -129,9 +130,10 @@
259
129
            else:
130
            else:
260
130
                self.theme = self.global_theme
131
                self.theme = self.global_theme
261
131
        if self.theme != self.renderer.theme_name:
132
        if self.theme != self.renderer.theme_name:
263
132
            log.debug(u'theme is now %s',  self.theme)
133
            log.debug(u'theme is now %s', self.theme)
264
133
            self.themedata = self.theme_manager.getThemeData(self.theme)
134
            self.themedata = self.theme_manager.getThemeData(self.theme)
266
134
            self.calculate_default(self.screen_list[self.current_display][u'size'])
135
            self.calculate_default(
267
136
                self.screen_list[self.current_display][u'size'])
268
135
            self.renderer.set_theme(self.themedata)
137
            self.renderer.set_theme(self.themedata)
269
136
            self.build_text_rectangle(self.themedata)
138
            self.build_text_rectangle(self.themedata)
270
137
139
271
@@ -212,7 +214,7 @@
272
212
        self.renderer.set_frame_dest(self.width, self.height)
214
        self.renderer.set_frame_dest(self.width, self.height)
273
213
        return self.renderer.generate_frame_from_lines(main_text, footer_text)
215
        return self.renderer.generate_frame_from_lines(main_text, footer_text)
274
214
216
276
215
    def resize_image(self, image, width = 0,  height = 0):
217
    def resize_image(self, image, width=0, height=0):
277
216
        """
218
        """
278
217
        Resize an image to fit on the current screen.
219
        Resize an image to fit on the current screen.
279
218
220
280
@@ -253,6 +255,7 @@
281
253
            self.width = screen.width()
255
            self.width = screen.width()
282
254
            self.height = screen.height()
256
            self.height = screen.height()
283
255
        self.screen_ratio = float(self.height) / float(self.width)
257
        self.screen_ratio = float(self.height) / float(self.width)
285
256
        log.debug(u'calculate default %d, %d, %f', self.width, self.height, self.screen_ratio )
258
        log.debug(u'calculate default %d, %d, %f',
286
259
            self.width, self.height, self.screen_ratio )
287
257
        # 90% is start of footer
260
        # 90% is start of footer
288
258
        self.footer_start = int(self.height * 0.90)
261
        self.footer_start = int(self.height * 0.90)
289
259
262
290
=== modified file 'openlp/core/ui/__init__.py'
291
--- openlp/core/ui/__init__.py	2009-09-08 19:58:05 +0000
292
+++ openlp/core/ui/__init__.py	2009-09-21 17:56:36 +0000
293
@@ -39,5 +39,5 @@
294
39
from mainwindow import MainWindow
39
from mainwindow import MainWindow
295
40
40
296
41
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
41
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
298
42
           'MainWindow', 'MainDisplay',  'SlideController', 'ServiceManager',
42
           'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager',
299
43
           'ThemeManager', 'AmendThemeForm']
43
           'ThemeManager', 'AmendThemeForm']
300
44
44
301
=== modified file 'openlp/core/ui/alertstab.py'
302
--- openlp/core/ui/alertstab.py	2009-09-08 19:58:05 +0000
303
+++ openlp/core/ui/alertstab.py	2009-09-21 17:56:36 +0000
304
@@ -24,7 +24,7 @@
305
24
24
306
25
from PyQt4 import QtCore, QtGui
25
from PyQt4 import QtCore, QtGui
307
26
26
309
27
from openlp.core.lib import SettingsTab,  translate
27
from openlp.core.lib import SettingsTab, translate
310
28
28
311
29
class AlertsTab(SettingsTab):
29
class AlertsTab(SettingsTab):
312
30
    """
30
    """
313
@@ -33,7 +33,8 @@
314
33
    def __init__(self):
33
    def __init__(self):
315
34
        self.font_color = '#ffffff'
34
        self.font_color = '#ffffff'
316
35
        self.bg_color = '#660000'
35
        self.bg_color = '#660000'
318
36
        SettingsTab.__init__(self, translate(u'AlertsTab', u'Alerts'), u'Alerts')
36
        SettingsTab.__init__(
319
37
            self, translate(u'AlertsTab', u'Alerts'), u'Alerts')
320
37
38
321
38
    def setupUi(self):
39
    def setupUi(self):
322
39
        self.setObjectName(u'AlertsTab')
40
        self.setObjectName(u'AlertsTab')
323
@@ -110,10 +111,12 @@
324
110
        self.SlideRightLayout.setMargin(0)
111
        self.SlideRightLayout.setMargin(0)
325
111
        self.SlideRightLayout.setObjectName(u'SlideRightLayout')
112
        self.SlideRightLayout.setObjectName(u'SlideRightLayout')
326
112
        self.PreviewGroupBox = QtGui.QGroupBox(self.AlertRightColumn)
113
        self.PreviewGroupBox = QtGui.QGroupBox(self.AlertRightColumn)
328
113
        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
114
        sizePolicy = QtGui.QSizePolicy(
329
115
            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
330
114
        sizePolicy.setHorizontalStretch(0)
116
        sizePolicy.setHorizontalStretch(0)
331
115
        sizePolicy.setVerticalStretch(0)
117
        sizePolicy.setVerticalStretch(0)
333
116
        sizePolicy.setHeightForWidth(self.PreviewGroupBox.sizePolicy().hasHeightForWidth())
118
        sizePolicy.setHeightForWidth(
334
119
            self.PreviewGroupBox.sizePolicy().hasHeightForWidth())
335
117
        self.PreviewGroupBox.setSizePolicy(sizePolicy)
120
        self.PreviewGroupBox.setSizePolicy(sizePolicy)
336
118
        self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
121
        self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
337
119
        self.PreviewLayout = QtGui.QVBoxLayout(self.PreviewGroupBox)
122
        self.PreviewLayout = QtGui.QVBoxLayout(self.PreviewGroupBox)
338
@@ -124,7 +127,8 @@
339
124
        self.FontPreview.setMinimumSize(QtCore.QSize(280, 100))
127
        self.FontPreview.setMinimumSize(QtCore.QSize(280, 100))
340
125
        self.FontPreview.setReadOnly(True)
128
        self.FontPreview.setReadOnly(True)
341
126
        self.FontPreview.setFocusPolicy(QtCore.Qt.NoFocus)
129
        self.FontPreview.setFocusPolicy(QtCore.Qt.NoFocus)
343
127
        self.FontPreview.setAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
130
        self.FontPreview.setAlignment(
344
131
            QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
345
128
        self.FontPreview.setObjectName(u'FontPreview')
132
        self.FontPreview.setObjectName(u'FontPreview')
346
129
        self.PreviewLayout.addWidget(self.FontPreview)
133
        self.PreviewLayout.addWidget(self.FontPreview)
347
130
        self.SlideRightLayout.addWidget(self.PreviewGroupBox)
134
        self.SlideRightLayout.addWidget(self.PreviewGroupBox)
348
@@ -146,11 +150,13 @@
349
146
        self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font'))
150
        self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font'))
350
147
        self.FontLabel.setText(translate(u'AlertsTab', u'Font Name:'))
151
        self.FontLabel.setText(translate(u'AlertsTab', u'Font Name:'))
351
148
        self.FontColorLabel.setText(translate(u'AlertsTab', u'Font Color:'))
152
        self.FontColorLabel.setText(translate(u'AlertsTab', u'Font Color:'))
353
149
        self.BackgroundColorLabel.setText(translate(u'AlertsTab', u'Background Color:'))
153
        self.BackgroundColorLabel.setText(
354
154
            translate(u'AlertsTab', u'Background Color:'))
355
150
        self.TimeoutLabel.setText(translate(u'AlertsTab', u'Alert timeout:'))
155
        self.TimeoutLabel.setText(translate(u'AlertsTab', u'Alert timeout:'))
356
151
        self.TimeoutSpinBox.setSuffix(translate(u'AlertsTab', u's'))
156
        self.TimeoutSpinBox.setSuffix(translate(u'AlertsTab', u's'))
357
152
        self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview'))
157
        self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview'))
359
153
        self.FontPreview.setText(translate(u'AlertsTab', u'openlp.org 2.0 rocks!'))
158
        self.FontPreview.setText(
360
159
            translate(u'AlertsTab', u'openlp.org 2.0 rocks!'))
361
154
160
362
155
    def onBackgroundColorButtonClicked(self):
161
    def onBackgroundColorButtonClicked(self):
363
156
        self.bg_color = QtGui.QColorDialog.getColor(
162
        self.bg_color = QtGui.QColorDialog.getColor(
364
@@ -174,12 +180,17 @@
365
174
180
366
175
    def load(self):
181
    def load(self):
367
176
        self.timeout = int(self.config.get_config(u'timeout', 5))
182
        self.timeout = int(self.config.get_config(u'timeout', 5))
371
177
        self.font_color = unicode(self.config.get_config(u'font color', u'#ffffff'))
183
        self.font_color = unicode(
372
178
        self.bg_color = unicode(self.config.get_config(u'background color', u'#660000'))
184
            self.config.get_config(u'font color', u'#ffffff'))
373
179
        self.font_face = unicode(self.config.get_config(u'font face', QtGui.QFont().family()))
185
        self.bg_color = unicode(
374
186
            self.config.get_config(u'background color', u'#660000'))
375
187
        self.font_face = unicode(
376
188
            self.config.get_config(u'font face', QtGui.QFont().family()))
377
180
        self.TimeoutSpinBox.setValue(self.timeout)
189
        self.TimeoutSpinBox.setValue(self.timeout)
380
181
        self.FontColorButton.setStyleSheet(u'background-color: %s' % self.font_color)
190
        self.FontColorButton.setStyleSheet(
381
182
        self.BackgroundColorButton.setStyleSheet(u'background-color: %s' % self.bg_color)
191
            u'background-color: %s' % self.font_color)
382
192
        self.BackgroundColorButton.setStyleSheet(
383
193
            u'background-color: %s' % self.bg_color)
384
183
        font = QtGui.QFont()
194
        font = QtGui.QFont()
385
184
        font.setFamily(self.font_face)
195
        font.setFamily(self.font_face)
386
185
        self.FontComboBox.setCurrentFont(font)
196
        self.FontComboBox.setCurrentFont(font)
387
@@ -198,5 +209,5 @@
388
198
        font.setBold(True)
209
        font.setBold(True)
389
199
        font.setPointSize(16)
210
        font.setPointSize(16)
390
200
        self.FontPreview.setFont(font)
211
        self.FontPreview.setFont(font)
393
201
        self.FontPreview.setStyleSheet(
212
        self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \
394
202
            u'background-color: %s; color: %s' % (self.bg_color, self.font_color))
213
            (self.bg_color, self.font_color))
395
203
214
396
=== modified file 'openlp/core/ui/amendthemeform.py'
397
--- openlp/core/ui/amendthemeform.py	2009-09-13 18:42:45 +0000
398
+++ openlp/core/ui/amendthemeform.py	2009-09-21 17:56:36 +0000
399
@@ -33,7 +33,7 @@
400
33
33
401
34
log = logging.getLogger(u'AmendThemeForm')
34
log = logging.getLogger(u'AmendThemeForm')
402
35
35
404
36
class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
36
class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
405
37
37
406
38
    def __init__(self, thememanager, parent=None):
38
    def __init__(self, thememanager, parent=None):
407
39
        QtGui.QDialog.__init__(self, parent)
39
        QtGui.QDialog.__init__(self, parent)
408
40
40
409
=== modified file 'openlp/core/ui/maindisplay.py'
410
--- openlp/core/ui/maindisplay.py	2009-09-08 19:58:05 +0000
411
+++ openlp/core/ui/maindisplay.py	2009-09-21 19:26:10 +0000
412
@@ -26,7 +26,7 @@
413
26
from PyQt4 import QtCore, QtGui
26
from PyQt4 import QtCore, QtGui
414
27
27
415
28
from time import sleep
28
from time import sleep
417
29
from openlp.core.lib import translate,  Receiver
29
from openlp.core.lib import translate, Receiver
418
30
30
419
31
class MainDisplay(QtGui.QWidget):
31
class MainDisplay(QtGui.QWidget):
420
32
    """
32
    """
421
@@ -129,7 +129,7 @@
422
129
            self.displayBlank = False
129
            self.displayBlank = False
423
130
            self.frameView(self.frame)
130
            self.frameView(self.frame)
424
131
131
426
132
    def displayAlert(self,  text=u''):
132
    def displayAlert(self, text=u''):
427
133
        """
133
        """
428
134
        Called from the Alert Tab to display an alert
134
        Called from the Alert Tab to display an alert
429
135
135
430
@@ -141,7 +141,9 @@
431
141
        painter = QtGui.QPainter(alertframe)
141
        painter = QtGui.QPainter(alertframe)
432
142
        top = alertframe.rect().height() * 0.9
142
        top = alertframe.rect().height() * 0.9
433
143
        painter.fillRect(
143
        painter.fillRect(
435
144
            QtCore.QRect(0, top, alertframe.rect().width(), alertframe.rect().height() - top),
144
            QtCore.QRect(
436
145
                0, top, alertframe.rect().width(),
437
146
                alertframe.rect().height() - top),
438
145
            QtGui.QColor(alertTab.bg_color))
147
            QtGui.QColor(alertTab.bg_color))
439
146
        font = QtGui.QFont()
148
        font = QtGui.QFont()
440
147
        font.setFamily(alertTab.font_face)
149
        font.setFamily(alertTab.font_face)
441
148
150
442
=== modified file 'openlp/core/ui/mainwindow.py'
443
--- openlp/core/ui/mainwindow.py	2009-09-19 23:05:30 +0000
444
+++ openlp/core/ui/mainwindow.py	2009-09-21 17:56:36 +0000
445
@@ -28,7 +28,7 @@
446
28
from PyQt4 import QtCore, QtGui
28
from PyQt4 import QtCore, QtGui
447
29
29
448
30
from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
30
from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
450
31
    ServiceManager, ThemeManager, MainDisplay, SlideController,  \
31
    ServiceManager, ThemeManager, MainDisplay, SlideController, \
451
32
    PluginForm
32
    PluginForm
452
33
from openlp.core.lib import translate, Plugin, MediaManagerItem, \
33
from openlp.core.lib import translate, Plugin, MediaManagerItem, \
453
34
    SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
34
    SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
454
@@ -119,7 +119,7 @@
455
119
119
456
120
#        self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored,
120
#        self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored,
457
121
#            QtGui.QSizePolicy.Maximum))
121
#            QtGui.QSizePolicy.Maximum))
459
122
#        geometry =  self.MediaManagerDock.geometry()
122
#        geometry = self.MediaManagerDock.geometry()
460
123
#        geometry.setWidth(self.settingsmanager.mainwindow_left)
123
#        geometry.setWidth(self.settingsmanager.mainwindow_left)
461
124
#        self.MediaManagerDock.setGeometry(geometry)
124
#        self.MediaManagerDock.setGeometry(geometry)
462
125
#        self.MediaManagerDock.setMinimumWidth(10)
125
#        self.MediaManagerDock.setMinimumWidth(10)
463
126
126
464
=== modified file 'openlp/core/ui/plugindialoglistform.py'
465
--- openlp/core/ui/plugindialoglistform.py	2009-09-18 17:37:11 +0000
466
+++ openlp/core/ui/plugindialoglistform.py	2009-09-21 17:56:36 +0000
467
@@ -9,7 +9,7 @@
468
9
9
469
10
import logging
10
import logging
470
11
from PyQt4 import QtCore, QtGui
11
from PyQt4 import QtCore, QtGui
472
12
from openlp.core.lib import translate,  PluginStatus
12
from openlp.core.lib import translate, PluginStatus
473
13
13
474
14
class PluginForm(QtGui.QDialog):
14
class PluginForm(QtGui.QDialog):
475
15
    global log
15
    global log
476
@@ -45,14 +45,18 @@
477
45
        self.ButtonBox.setObjectName(u'ButtonBox')
45
        self.ButtonBox.setObjectName(u'ButtonBox')
478
46
46
479
47
        self.retranslateUi(PluginForm)
47
        self.retranslateUi(PluginForm)
481
48
        QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), PluginForm.close)
48
        QtCore.QObject.connect(self.ButtonBox,
482
49
            QtCore.SIGNAL(u'accepted()'), PluginForm.close)
483
49
        QtCore.QMetaObject.connectSlotsByName(PluginForm)
50
        QtCore.QMetaObject.connectSlotsByName(PluginForm)
484
50
51
485
51
    def retranslateUi(self, PluginForm):
52
    def retranslateUi(self, PluginForm):
486
52
        PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list'))
53
        PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list'))
490
53
        self.PluginViewList.horizontalHeaderItem(0).setText(translate(u'PluginForm', u'Name'))
54
        self.PluginViewList.horizontalHeaderItem(0).setText(
491
54
        self.PluginViewList.horizontalHeaderItem(1).setText(translate(u'PluginForm', u'Version'))
55
            translate(u'PluginForm', u'Name'))
492
55
        self.PluginViewList.horizontalHeaderItem(2).setText(translate(u'PluginForm', u'Status'))
56
        self.PluginViewList.horizontalHeaderItem(1).setText(
493
57
            translate(u'PluginForm', u'Version'))
494
58
        self.PluginViewList.horizontalHeaderItem(2).setText(
495
59
            translate(u'PluginForm', u'Status'))
496
56
60
497
57
    def load(self):
61
    def load(self):
498
58
        """
62
        """
499
@@ -68,14 +72,14 @@
500
68
            item2 = QtGui.QTableWidgetItem(plugin.version)
72
            item2 = QtGui.QTableWidgetItem(plugin.version)
501
69
            item2.setTextAlignment(QtCore.Qt.AlignVCenter)
73
            item2.setTextAlignment(QtCore.Qt.AlignVCenter)
502
70
            if plugin.status == PluginStatus.Active:
74
            if plugin.status == PluginStatus.Active:
504
71
                item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Active'))
75
                item3 = QtGui.QTableWidgetItem(
505
76
                    translate(u'PluginForm', u'Active'))
506
72
            else:
77
            else:
508
73
                item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Inactive'))
78
                item3 = QtGui.QTableWidgetItem(
509
79
                    translate(u'PluginForm', u'Inactive'))
510
74
            item3.setTextAlignment(QtCore.Qt.AlignVCenter)
80
            item3.setTextAlignment(QtCore.Qt.AlignVCenter)
511
75
            self.PluginViewList.setItem(row, 0, item1)
81
            self.PluginViewList.setItem(row, 0, item1)
512
76
            self.PluginViewList.setItem(row, 1, item2)
82
            self.PluginViewList.setItem(row, 1, item2)
513
77
            self.PluginViewList.setItem(row, 2, item3)
83
            self.PluginViewList.setItem(row, 2, item3)
514
78
            self.PluginViewList.setRowHeight(row, 15)
84
            self.PluginViewList.setRowHeight(row, 15)
515
79
85
516
80
517
81
518
82
86
519
=== modified file 'openlp/core/ui/servicemanager.py'
520
--- openlp/core/ui/servicemanager.py	2009-09-19 21:45:50 +0000
521
+++ openlp/core/ui/servicemanager.py	2009-09-21 17:56:36 +0000
522
@@ -33,7 +33,7 @@
523
33
from PyQt4 import QtCore, QtGui
33
from PyQt4 import QtCore, QtGui
524
34
from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
34
from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
525
35
    RenderManager, translate, buildIcon, ServiceType, \
35
    RenderManager, translate, buildIcon, ServiceType, \
527
36
    contextMenuAction, contextMenuSeparator,  Receiver
36
    contextMenuAction, contextMenuSeparator, Receiver
528
37
from openlp.core.utils import ConfigHelper
37
from openlp.core.utils import ConfigHelper
529
38
38
530
39
class ServiceManagerList(QtGui.QTreeWidget):
39
class ServiceManagerList(QtGui.QTreeWidget):
531
@@ -285,7 +285,7 @@
532
285
            temp = self.serviceItems[item]
285
            temp = self.serviceItems[item]
533
286
            self.serviceItems.remove(self.serviceItems[item])
286
            self.serviceItems.remove(self.serviceItems[item])
534
287
            self.serviceItems.insert(item - 1, temp)
287
            self.serviceItems.insert(item - 1, temp)
536
288
            self.repaintServiceList(item - 1,  count)
288
            self.repaintServiceList(item - 1, count)
537
289
        self.parent.serviceChanged(False, self.serviceName)
289
        self.parent.serviceChanged(False, self.serviceName)
538
290
290
539
291
    def onServiceDown(self):
291
    def onServiceDown(self):
540
@@ -298,7 +298,7 @@
541
298
            temp = self.serviceItems[item]
298
            temp = self.serviceItems[item]
542
299
            self.serviceItems.remove(self.serviceItems[item])
299
            self.serviceItems.remove(self.serviceItems[item])
543
300
            self.serviceItems.insert(item + 1, temp)
300
            self.serviceItems.insert(item + 1, temp)
545
301
            self.repaintServiceList(item + 1,  count)
301
            self.repaintServiceList(item + 1, count)
546
302
        self.parent.serviceChanged(False, self.serviceName)
302
        self.parent.serviceChanged(False, self.serviceName)
547
303
303
548
304
    def onServiceEnd(self):
304
    def onServiceEnd(self):
549
@@ -539,7 +539,7 @@
550
539
        pos = 0
539
        pos = 0
551
540
        count = 0
540
        count = 0
552
541
        for item in items:
541
        for item in items:
554
542
            parentitem =  item.parent()
542
            parentitem = item.parent()
555
543
            if parentitem is None:
543
            if parentitem is None:
556
544
                pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
544
                pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
557
545
            else:
545
            else:
558
546
546
559
=== modified file 'openlp/core/ui/slidecontroller.py'
560
--- openlp/core/ui/slidecontroller.py	2009-09-20 07:38:23 +0000
561
+++ openlp/core/ui/slidecontroller.py	2009-09-21 17:56:36 +0000
562
@@ -60,8 +60,8 @@
563
60
60
564
61
class SlideController(QtGui.QWidget):
61
class SlideController(QtGui.QWidget):
565
62
    """
62
    """
568
63
    SlideController is the slide controller widget. This widget is what the user
63
    SlideController is the slide controller widget. This widget is what the
569
64
    uses to control the displaying of verses/slides/etc on the screen.
64
    user uses to control the displaying of verses/slides/etc on the screen.
570
65
    """
65
    """
571
66
    global log
66
    global log
572
67
    log = logging.getLogger(u'SlideController')
67
    log = logging.getLogger(u'SlideController')
573
@@ -74,7 +74,8 @@
574
74
        self.settingsmanager = settingsmanager
74
        self.settingsmanager = settingsmanager
575
75
        self.isLive = isLive
75
        self.isLive = isLive
576
76
        self.parent = parent
76
        self.parent = parent
578
77
        self.image_list = [u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox']
77
        self.image_list = [
579
78
            u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox']
580
78
        self.timer_id = 0
79
        self.timer_id = 0
581
79
        self.commandItem = None
80
        self.commandItem = None
582
80
        self.Panel = QtGui.QWidget(parent.ControlSplitter)
81
        self.Panel = QtGui.QWidget(parent.ControlSplitter)
583
@@ -177,7 +178,8 @@
584
177
        sizePolicy.setHeightForWidth(
178
        sizePolicy.setHeightForWidth(
585
178
            self.SlidePreview.sizePolicy().hasHeightForWidth())
179
            self.SlidePreview.sizePolicy().hasHeightForWidth())
586
179
        self.SlidePreview.setSizePolicy(sizePolicy)
180
        self.SlidePreview.setSizePolicy(sizePolicy)
588
180
        self.SlidePreview.setFixedSize(QtCore.QSize(self.settingsmanager.slidecontroller_image, 225))
181
        self.SlidePreview.setFixedSize(
589
182
            QtCore.QSize(self.settingsmanager.slidecontroller_image, 225))
590
181
        self.SlidePreview.setFrameShape(QtGui.QFrame.Box)
183
        self.SlidePreview.setFrameShape(QtGui.QFrame.Box)
591
182
        self.SlidePreview.setFrameShadow(QtGui.QFrame.Plain)
184
        self.SlidePreview.setFrameShadow(QtGui.QFrame.Plain)
592
183
        self.SlidePreview.setLineWidth(1)
185
        self.SlidePreview.setLineWidth(1)
593
@@ -238,7 +240,8 @@
594
238
        """
240
        """
595
239
        log.debug(u'addServiceItem')
241
        log.debug(u'addServiceItem')
596
240
        #If old item was a command tell it to stop
242
        #If old item was a command tell it to stop
598
241
        if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
243
        if self.commandItem is not None and \
599
244
            self.commandItem.service_item_type == ServiceType.Command:
600
242
            Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
245
            Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
601
243
        self.commandItem = item
246
        self.commandItem = item
602
244
        before = time.time()
247
        before = time.time()
603
@@ -246,8 +249,9 @@
604
246
        log.info(u'Rendering took %4s' % (time.time() - before))
249
        log.info(u'Rendering took %4s' % (time.time() - before))
605
247
        self.enableToolBar(item)
250
        self.enableToolBar(item)
606
248
        if item.service_item_type == ServiceType.Command:
251
        if item.service_item_type == ServiceType.Command:
609
249
            Receiver().send_message(u'%s_start'%item.name.lower(), \
252
            Receiver().send_message(u'%s_start' % item.name.lower(), \
610
250
                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
253
                [item.shortname, item.service_item_path,
611
254
                item.service_frames[0][u'title']])
612
251
        else:
255
        else:
613
252
            self.displayServiceManagerItems(item, 0)
256
            self.displayServiceManagerItems(item, 0)
614
253
257
615
@@ -259,13 +263,15 @@
616
259
        """
263
        """
617
260
        log.debug(u'addServiceItem')
264
        log.debug(u'addServiceItem')
618
261
        #If old item was a command tell it to stop
265
        #If old item was a command tell it to stop
620
262
        if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
266
        if self.commandItem is not None and \
621
267
            self.commandItem.service_item_type == ServiceType.Command:
622
263
            Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
268
            Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
623
264
        self.commandItem = item
269
        self.commandItem = item
624
265
        self.enableToolBar(item)
270
        self.enableToolBar(item)
625
266
        if item.service_item_type == ServiceType.Command:
271
        if item.service_item_type == ServiceType.Command:
628
267
            Receiver().send_message(u'%s_start'%item.name.lower(), \
272
            Receiver().send_message(u'%s_start' % item.name.lower(), \
629
268
                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
273
                [item.shortname, item.service_item_path,
630
274
                item.service_frames[0][u'title']])
631
269
        else:
275
        else:
632
270
            self.displayServiceManagerItems(item, slideno)
276
            self.displayServiceManagerItems(item, slideno)
633
271
277
634
@@ -279,9 +285,11 @@
635
279
        self.serviceitem = serviceitem
285
        self.serviceitem = serviceitem
636
280
        self.PreviewListWidget.clear()
286
        self.PreviewListWidget.clear()
637
281
        self.PreviewListWidget.setRowCount(0)
287
        self.PreviewListWidget.setRowCount(0)
639
282
        self.PreviewListWidget.setColumnWidth(0, self.settingsmanager.slidecontroller_image)
288
        self.PreviewListWidget.setColumnWidth(
640
289
            0, self.settingsmanager.slidecontroller_image)
641
283
        for framenumber, frame in enumerate(self.serviceitem.frames):
290
        for framenumber, frame in enumerate(self.serviceitem.frames):
643
284
            self.PreviewListWidget.setRowCount(self.PreviewListWidget.rowCount() + 1)
291
            self.PreviewListWidget.setRowCount(
644
292
                self.PreviewListWidget.rowCount() + 1)
645
285
            item = QtGui.QTableWidgetItem()
293
            item = QtGui.QTableWidgetItem()
646
286
            label = QtGui.QLabel()
294
            label = QtGui.QLabel()
647
287
            label.setMargin(8)
295
            label.setMargin(8)
648
@@ -294,9 +302,11 @@
649
294
                label.setText(frame[u'text'])
302
                label.setText(frame[u'text'])
650
295
            self.PreviewListWidget.setCellWidget(framenumber, 0, label)
303
            self.PreviewListWidget.setCellWidget(framenumber, 0, label)
651
296
            self.PreviewListWidget.setItem(framenumber, 0, item)
304
            self.PreviewListWidget.setItem(framenumber, 0, item)
653
297
            slide_height = self.settingsmanager.slidecontroller_image * self.parent.RenderManager.screen_ratio
305
            slide_height = self.settingsmanager.slidecontroller_image * \
654
306
                self.parent.RenderManager.screen_ratio
655
298
            self.PreviewListWidget.setRowHeight(framenumber, slide_height)
307
            self.PreviewListWidget.setRowHeight(framenumber, slide_height)
657
299
        self.PreviewListWidget.setColumnWidth(0, self.PreviewListWidget.viewport().size().width())
308
        self.PreviewListWidget.setColumnWidth(
658
309
            0, self.PreviewListWidget.viewport().size().width())
659
300
        if slideno > self.PreviewListWidget.rowCount():
310
        if slideno > self.PreviewListWidget.rowCount():
660
301
            self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
311
            self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
661
302
        else:
312
        else:
662
@@ -357,7 +367,8 @@
663
357
        Go to the previous slide.
367
        Go to the previous slide.
664
358
        """
368
        """
665
359
        if self.commandItem.service_item_type == ServiceType.Command:
369
        if self.commandItem.service_item_type == ServiceType.Command:
667
360
            Receiver().send_message(u'%s_previous'% self.commandItem.name.lower())
370
            Receiver().send_message(
668
371
                u'%s_previous'% self.commandItem.name.lower())
669
361
        else:
372
        else:
670
362
            row = self.PreviewListWidget.currentRow() - 1
373
            row = self.PreviewListWidget.currentRow() - 1
671
363
            if row == -1:
374
            if row == -1:
672
@@ -377,7 +388,8 @@
673
377
        Start the timer loop running and store the timer id
388
        Start the timer loop running and store the timer id
674
378
        """
389
        """
675
379
        if self.PreviewListWidget.rowCount() > 1:
390
        if self.PreviewListWidget.rowCount() > 1:
677
380
            self.timer_id = self.startTimer(int(self.DelaySpinBox.value()) * 1000)
391
            self.timer_id = self.startTimer(
678
392
                int(self.DelaySpinBox.value()) * 1000)
679
381
393
680
382
    def onStopLoop(self):
394
    def onStopLoop(self):
681
383
        """
395
        """
682
@@ -398,4 +410,5 @@
683
398
        """
410
        """
684
399
        row = self.PreviewListWidget.currentRow()
411
        row = self.PreviewListWidget.currentRow()
685
400
        if row > -1 and row < self.PreviewListWidget.rowCount():
412
        if row > -1 and row < self.PreviewListWidget.rowCount():
687
401
            self.parent.LiveController.addServiceManagerItem(self.commandItem, row)
413
            self.parent.LiveController.addServiceManagerItem(
688
414
                self.commandItem, row)
689
402
415
690
=== modified file 'openlp/core/ui/splashscreen.py'
691
--- openlp/core/ui/splashscreen.py	2009-09-08 19:58:05 +0000
692
+++ openlp/core/ui/splashscreen.py	2009-09-21 17:56:36 +0000
693
@@ -29,36 +29,42 @@
694
29
    def __init__(self, version):
29
    def __init__(self, version):
695
30
        self.splash_screen = QtGui.QSplashScreen()
30
        self.splash_screen = QtGui.QSplashScreen()
696
31
        self.setupUi()
31
        self.setupUi()
699
32
        starting = translate(u'SplashScreen',u'Starting')
32
        starting = translate(u'SplashScreen', u'Starting')
700
33
        self.message=starting+u'..... '+version
33
        self.message = starting + u'..... ' + version
701
34
34
702
35
    def setupUi(self):
35
    def setupUi(self):
703
36
        self.splash_screen.setObjectName(u'splash_screen')
36
        self.splash_screen.setObjectName(u'splash_screen')
704
37
        self.splash_screen.setWindowModality(QtCore.Qt.NonModal)
37
        self.splash_screen.setWindowModality(QtCore.Qt.NonModal)
705
38
        self.splash_screen.setEnabled(True)
38
        self.splash_screen.setEnabled(True)
706
39
        self.splash_screen.resize(370, 370)
39
        self.splash_screen.resize(370, 370)
708
40
        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
40
        sizePolicy = QtGui.QSizePolicy(
709
41
            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
710
41
        sizePolicy.setHorizontalStretch(0)
42
        sizePolicy.setHorizontalStretch(0)
711
42
        sizePolicy.setVerticalStretch(0)
43
        sizePolicy.setVerticalStretch(0)
713
43
        sizePolicy.setHeightForWidth(self.splash_screen.sizePolicy().hasHeightForWidth())
44
        sizePolicy.setHeightForWidth(
714
45
            self.splash_screen.sizePolicy().hasHeightForWidth())
715
44
        self.splash_screen.setSizePolicy(sizePolicy)
46
        self.splash_screen.setSizePolicy(sizePolicy)
716
45
        self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
47
        self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
717
46
        icon = QtGui.QIcon()
48
        icon = QtGui.QIcon()
719
47
        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
49
        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'),
720
50
            QtGui.QIcon.Normal, QtGui.QIcon.Off)
721
48
        splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
51
        splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
722
49
        self.splash_screen.setWindowIcon(icon)
52
        self.splash_screen.setWindowIcon(icon)
723
50
        self.splash_screen.setPixmap(splash_image)
53
        self.splash_screen.setPixmap(splash_image)
724
51
        self.splash_screen.setMask(splash_image.mask())
54
        self.splash_screen.setMask(splash_image.mask())
726
52
        self.splash_screen.setWindowFlags(QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint)
55
        self.splash_screen.setWindowFlags(
727
56
            QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint)
728
53
        self.retranslateUi()
57
        self.retranslateUi()
729
54
        QtCore.QMetaObject.connectSlotsByName(self.splash_screen)
58
        QtCore.QMetaObject.connectSlotsByName(self.splash_screen)
730
55
59
731
56
    def retranslateUi(self):
60
    def retranslateUi(self):
733
57
        self.splash_screen.setWindowTitle(translate(u'splash_screen', u'Splash Screen'))
61
        self.splash_screen.setWindowTitle(
734
62
            translate(u'splash_screen', u'Splash Screen'))
735
58
63
736
59
    def show(self):
64
    def show(self):
737
60
        self.splash_screen.show()
65
        self.splash_screen.show()
739
61
        self.splash_screen.showMessage(self.message, QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom,  QtCore.Qt.black)
66
        self.splash_screen.showMessage(self.message,
740
67
            QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom, QtCore.Qt.black)
741
62
        self.splash_screen.repaint()
68
        self.splash_screen.repaint()
742
63
69
743
64
    def finish(self, widget):
70
    def finish(self, widget):
744
65
71
745
=== modified file 'openlp/core/ui/thememanager.py'
746
--- openlp/core/ui/thememanager.py	2009-09-14 18:53:56 +0000
747
+++ openlp/core/ui/thememanager.py	2009-09-21 17:56:36 +0000
748
@@ -97,10 +97,10 @@
749
97
97
750
98
    def changeGlobalFromTab(self, themeName):
98
    def changeGlobalFromTab(self, themeName):
751
99
        log.debug(u'changeGlobalFromTab %s', themeName)
99
        log.debug(u'changeGlobalFromTab %s', themeName)
753
100
        for count in range (0,  self.ThemeListWidget.count()):
100
        for count in range (0, self.ThemeListWidget.count()):
754
101
            #reset the old name
101
            #reset the old name
755
102
            item = self.ThemeListWidget.item(count)
102
            item = self.ThemeListWidget.item(count)
757
103
            oldName =  item.text()
103
            oldName = item.text()
758
104
            newName = unicode(item.data(QtCore.Qt.UserRole).toString())
104
            newName = unicode(item.data(QtCore.Qt.UserRole).toString())
759
105
            if oldName != newName:
105
            if oldName != newName:
760
106
                self.ThemeListWidget.item(count).setText(newName)
106
                self.ThemeListWidget.item(count).setText(newName)
761
@@ -112,9 +112,9 @@
762
112
112
763
113
    def changeGlobalFromScreen(self, index):
113
    def changeGlobalFromScreen(self, index):
764
114
        log.debug(u'changeGlobalFromScreen %s', index)
114
        log.debug(u'changeGlobalFromScreen %s', index)
766
115
        for count in range (0,  self.ThemeListWidget.count()):
115
        for count in range (0, self.ThemeListWidget.count()):
767
116
            item = self.ThemeListWidget.item(count)
116
            item = self.ThemeListWidget.item(count)
769
117
            oldName =  item.text()
117
            oldName = item.text()
770
118
            #reset the old name
118
            #reset the old name
771
119
            if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()):
119
            if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()):
772
120
                self.ThemeListWidget.item(count).setText(
120
                self.ThemeListWidget.item(count).setText(
773
@@ -194,12 +194,13 @@
774
194
        path = unicode(path)
194
        path = unicode(path)
775
195
        if path != u'':
195
        if path != u'':
776
196
            self.config.set_last_dir(path, 1)
196
            self.config.set_last_dir(path, 1)
778
197
            themePath =  os.path.join(path, theme + u'.theme')
197
            themePath = os.path.join(path, theme + u'.theme')
779
198
            zip = zipfile.ZipFile(themePath, 'w')
198
            zip = zipfile.ZipFile(themePath, 'w')
780
199
            source = os.path.join(self.path, theme)
199
            source = os.path.join(self.path, theme)
781
200
            for root, dirs, files in os.walk(source):
200
            for root, dirs, files in os.walk(source):
782
201
                for name in files:
201
                for name in files:
784
202
                    zip.write(os.path.join(source, name), os.path.join(theme, name))
202
                    zip.write(
785
203
                        os.path.join(source, name), os.path.join(theme, name))
786
203
            zip.close()
204
            zip.close()
787
204
205
788
205
    def onImportTheme(self):
206
    def onImportTheme(self):
789
@@ -226,7 +227,7 @@
790
226
            for name in files:
227
            for name in files:
791
227
                if name.endswith(u'.png'):
228
                if name.endswith(u'.png'):
792
228
                    #check to see file is in theme root directory
229
                    #check to see file is in theme root directory
794
229
                    theme =  os.path.join(self.path, name)
230
                    theme = os.path.join(self.path, name)
795
230
                    if os.path.exists(theme):
231
                    if os.path.exists(theme):
796
231
                        (path, filename) = os.path.split(unicode(file))
232
                        (path, filename) = os.path.split(unicode(file))
797
232
                        textName = os.path.splitext(name)[0]
233
                        textName = os.path.splitext(name)[0]
798
@@ -244,7 +245,7 @@
799
244
        self.pushThemes()
245
        self.pushThemes()
800
245
246
801
246
    def pushThemes(self):
247
    def pushThemes(self):
803
247
        Receiver().send_message(u'update_themes',  self.getThemes() )
248
        Receiver().send_message(u'update_themes', self.getThemes() )
804
248
249
805
249
    def getThemes(self):
250
    def getThemes(self):
806
250
        return self.themelist
251
        return self.themelist
807
251
252
808
=== modified file 'openlp/core/ui/themestab.py'
809
--- openlp/core/ui/themestab.py	2009-09-08 19:58:05 +0000
810
+++ openlp/core/ui/themestab.py	2009-09-21 17:56:36 +0000
811
@@ -24,7 +24,7 @@
812
24
24
813
25
from PyQt4 import QtCore, QtGui
25
from PyQt4 import QtCore, QtGui
814
26
26
816
27
from openlp.core.lib import SettingsTab,  translate,  Receiver
27
from openlp.core.lib import SettingsTab, translate, Receiver
817
28
28
818
29
class ThemesTab(SettingsTab):
29
class ThemesTab(SettingsTab):
819
30
    """
30
    """
820
@@ -32,7 +32,8 @@
821
32
    """
32
    """
822
33
    def __init__(self, parent):
33
    def __init__(self, parent):
823
34
        self.parent = parent
34
        self.parent = parent
825
35
        SettingsTab.__init__(self, translate(u'ThemesTab', u'Themes'), u'Themes')
35
        SettingsTab.__init__(
826
36
            self, translate(u'ThemesTab', u'Themes'), u'Themes')
827
36
37
828
37
    def setupUi(self):
38
    def setupUi(self):
829
38
        self.setObjectName(u'ThemesTab')
39
        self.setObjectName(u'ThemesTab')
830
@@ -106,15 +107,19 @@
831
106
    def retranslateUi(self):
107
    def retranslateUi(self):
832
107
        self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme'))
108
        self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme'))
833
108
        self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level'))
109
        self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level'))
835
109
        self.SongLevelRadioButton.setText(translate(u'ThemesTab', u'Song level'))
110
        self.SongLevelRadioButton.setText(
836
111
            translate(u'ThemesTab', u'Song level'))
837
110
        self.SongLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from each song in the database. If a song doesn\'t have a theme associated with it, then use the service\'s theme. If the service doesn\'t have a theme, then use the global theme.'))
112
        self.SongLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from each song in the database. If a song doesn\'t have a theme associated with it, then use the service\'s theme. If the service doesn\'t have a theme, then use the global theme.'))
839
111
        self.ServiceLevelRadioButton.setText(translate(u'ThemesTab', u'Service level'))
113
        self.ServiceLevelRadioButton.setText(
840
114
            translate(u'ThemesTab', u'Service level'))
841
112
        self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from the service, overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.'))
115
        self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from the service, overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.'))
843
113
        self.GlobalLevelRadioButton.setText(translate(u'ThemesTab', u'Global level'))
116
        self.GlobalLevelRadioButton.setText(
844
117
            translate(u'ThemesTab', u'Global level'))
845
114
        self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated with either the service or the songs.'))
118
        self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated with either the service or the songs.'))
846
115
119
847
116
    def load(self):
120
    def load(self):
849
117
        self.global_style = self.config.get_config(u'theme global style', u'Global')
121
        self.global_style = self.config.get_config(
850
122
            u'theme global style', u'Global')
851
118
        self.global_theme = self.config.get_config(u'theme global theme', u'')
123
        self.global_theme = self.config.get_config(u'theme global theme', u'')
852
119
        if self.global_style == u'Global':
124
        if self.global_style == u'Global':
853
120
            self.GlobalLevelRadioButton.setChecked(True)
125
            self.GlobalLevelRadioButton.setChecked(True)
854
@@ -126,29 +131,35 @@
855
126
    def save(self):
131
    def save(self):
856
127
        self.config.set_config(u'theme global style', self.global_style )
132
        self.config.set_config(u'theme global style', self.global_style )
857
128
        self.config.set_config(u'theme global theme',self.global_theme)
133
        self.config.set_config(u'theme global theme',self.global_theme)
859
129
        Receiver().send_message(u'update_global_theme',  self.global_theme )
134
        Receiver().send_message(u'update_global_theme', self.global_theme )
860
130
135
861
131
    def postSetUp(self):
136
    def postSetUp(self):
863
132
        Receiver().send_message(u'update_global_theme',  self.global_theme )
137
        Receiver().send_message(u'update_global_theme', self.global_theme )
864
133
138
865
134
    def onSongLevelButtonPressed(self):
139
    def onSongLevelButtonPressed(self):
866
135
        self.global_style= u'Song'
140
        self.global_style= u'Song'
868
136
        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
141
        self.parent.RenderManager.set_global_theme(
869
142
            self.global_theme, self.global_style)
870
137
143
871
138
    def onServiceLevelButtonPressed(self):
144
    def onServiceLevelButtonPressed(self):
872
139
        self.global_style= u'Service'
145
        self.global_style= u'Service'
874
140
        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
146
        self.parent.RenderManager.set_global_theme(
875
147
            self.global_theme, self.global_style)
876
141
148
877
142
    def onGlobalLevelButtonPressed(self):
149
    def onGlobalLevelButtonPressed(self):
878
143
        self.global_style= u'Global'
150
        self.global_style= u'Global'
880
144
        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
151
        self.parent.RenderManager.set_global_theme(
881
152
            self.global_theme, self.global_style)
882
145
153
883
146
    def onDefaultComboBoxChanged(self, value):
154
    def onDefaultComboBoxChanged(self, value):
884
147
        self.global_theme = unicode(self.DefaultComboBox.currentText())
155
        self.global_theme = unicode(self.DefaultComboBox.currentText())
887
148
        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
156
        self.parent.RenderManager.set_global_theme(
888
149
        image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
157
            self.global_theme, self.global_style)
889
158
        image = self.parent.ThemeManagerContents.getPreviewImage(
890
159
            self.global_theme)
891
150
        preview = QtGui.QPixmap(unicode(image))
160
        preview = QtGui.QPixmap(unicode(image))
893
151
        display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
161
        display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
894
162
            QtCore.Qt.SmoothTransformation)
895
152
        self.DefaultListView.setPixmap(display)
163
        self.DefaultListView.setPixmap(display)
896
153
164
897
154
    def updateThemeList(self, theme_list):
165
    def updateThemeList(self, theme_list):
898
@@ -160,14 +171,18 @@
899
160
        self.DefaultComboBox.clear()
171
        self.DefaultComboBox.clear()
900
161
        for theme in theme_list:
172
        for theme in theme_list:
901
162
            self.DefaultComboBox.addItem(theme)
173
            self.DefaultComboBox.addItem(theme)
903
163
        id = self.DefaultComboBox.findText(self.global_theme, QtCore.Qt.MatchExactly)
174
        id = self.DefaultComboBox.findText(
904
175
            self.global_theme, QtCore.Qt.MatchExactly)
905
164
        if id == -1:
176
        if id == -1:
906
165
            id = 0 # Not Found
177
            id = 0 # Not Found
907
166
            self.global_theme = u''
178
            self.global_theme = u''
908
167
        self.DefaultComboBox.setCurrentIndex(id)
179
        self.DefaultComboBox.setCurrentIndex(id)
910
168
        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
180
        self.parent.RenderManager.set_global_theme(
911
181
            self.global_theme, self.global_style)
912
169
        if self.global_theme is not u'':
182
        if self.global_theme is not u'':
914
170
            image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
183
            image = self.parent.ThemeManagerContents.getPreviewImage(
915
184
                self.global_theme)
916
171
            preview = QtGui.QPixmap(unicode(image))
185
            preview = QtGui.QPixmap(unicode(image))
918
172
            display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
186
            display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
919
187
                QtCore.Qt.SmoothTransformation)
920
173
            self.DefaultListView.setPixmap(display)
188
            self.DefaultListView.setPixmap(display)
921
174
189
922
=== modified file 'openlp/migration/migratesongs.py'
923
--- openlp/migration/migratesongs.py	2009-09-08 19:58:05 +0000
924
+++ openlp/migration/migratesongs.py	2009-09-21 17:56:36 +0000
925
@@ -31,17 +31,18 @@
926
31
from sqlalchemy import  *
31
from sqlalchemy import  *
927
32
from sqlalchemy.sql import select
32
from sqlalchemy.sql import select
928
33
from sqlalchemy import create_engine
33
from sqlalchemy import create_engine
930
34
from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, clear_mappers
34
from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \
931
35
    clear_mappers
932
35
from openlp.plugins.songs.lib.models import metadata, session, \
36
from openlp.plugins.songs.lib.models import metadata, session, \
934
36
    engine, songs_table, Song, Author, Topic,  Book
37
    engine, songs_table, Song, Author, Topic, Book
935
37
from openlp.plugins.songs.lib.tables import *
38
from openlp.plugins.songs.lib.tables import *
936
38
from openlp.plugins.songs.lib.classes import *
39
from openlp.plugins.songs.lib.classes import *
937
39
40
938
40
def init_models(url):
41
def init_models(url):
939
41
    engine = create_engine(url)
42
    engine = create_engine(url)
940
42
    metadata.bind = engine
43
    metadata.bind = engine
943
43
    session = scoped_session(sessionmaker(autoflush=True, autocommit=False,
44
    session = scoped_session(
944
44
                                          bind=engine))
45
        sessionmaker(autoflush=True, autocommit=False, bind=engine))
945
45
    mapper(Author, authors_table)
46
    mapper(Author, authors_table)
946
46
    mapper(TAuthor, temp_authors_table)
47
    mapper(TAuthor, temp_authors_table)
947
47
    mapper(Book, song_books_table)
48
    mapper(Book, song_books_table)
948
@@ -57,7 +58,7 @@
949
57
    return session
58
    return session
950
58
59
951
59
temp_authors_table = Table(u'authors_temp', metadata,
60
temp_authors_table = Table(u'authors_temp', metadata,
953
60
    Column(u'authorid', types.Integer,  primary_key=True),
61
    Column(u'authorid', types.Integer, primary_key=True),
954
61
    Column(u'authorname', String(40))
62
    Column(u'authorname', String(40))
955
62
)
63
)
956
63
64
957
@@ -154,14 +155,18 @@
958
154
            song.search_title = u''
155
            song.search_title = u''
959
155
            song.search_lyrics = u''
156
            song.search_lyrics = u''
960
156
            print songs_temp.songtitle
157
            print songs_temp.songtitle
962
157
            aa  = self.session.execute(u'select * from songauthors_temp where songid =' + unicode(songs_temp.songid) )
158
            aa  = self.session.execute(
963
159
                u'select * from songauthors_temp where songid =' + \
964
160
                unicode(songs_temp.songid) )
965
158
            for row in aa:
161
            for row in aa:
966
159
                a = row['authorid']
162
                a = row['authorid']
967
160
                authors_temp = self.session.query(TAuthor).get(a)
163
                authors_temp = self.session.query(TAuthor).get(a)
969
161
                bb  = self.session.execute(u'select * from authors where display_name = \"%s\"' % unicode(authors_temp.authorname) ).fetchone()
164
                bb  = self.session.execute(
970
165
                    u'select * from authors where display_name = \"%s\"' % \
971
166
                    unicode(authors_temp.authorname) ).fetchone()
972
162
                if bb is None:
167
                if bb is None:
973
163
                    author = Author()
168
                    author = Author()
975
164
                    author.display_name =  authors_temp.authorname
169
                    author.display_name = authors_temp.authorname
976
165
                    author.first_name = u''
170
                    author.first_name = u''
977
166
                    author.last_name = u''
171
                    author.last_name = u''
978
167
                else:
172
                else:
979
@@ -180,11 +185,11 @@
980
180
        conn = sqlite3.connect(self.data_path + os.sep + database)
185
        conn = sqlite3.connect(self.data_path + os.sep + database)
981
181
        conn.execute("""update songs set search_title =
186
        conn.execute("""update songs set search_title =
982
182
            replace(replace(replace(replace(replace(replace(replace(replace(
187
            replace(replace(replace(replace(replace(replace(replace(replace(
984
183
            replace(title,  '&', 'and'), ',', ''), ';', ''), ':', ''),
188
            replace(title, '&', 'and'), ',', ''), ';', ''), ':', ''),
985
184
            '(u', ''), ')', ''), '{', ''), '}',''),'?','');""")
189
            '(u', ''), ')', ''), '{', ''), '}',''),'?','');""")
986
185
        conn.execute("""update songs set search_lyrics =
190
        conn.execute("""update songs set search_lyrics =
987
186
            replace(replace(replace(replace(replace(replace(replace(replace(
191
            replace(replace(replace(replace(replace(replace(replace(replace(
989
187
            replace(lyrics,  '&', 'and'), ',', ''), ';', ''), ':', ''),
192
            replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''),
990
188
            '(u', ''), ')', ''), '{', ''), '}',''),'?','')
193
            '(u', ''), ')', ''), '{', ''), '}',''),'?','')
991
189
            ;""")
194
            ;""")
992
190
        conn.commit()
195
        conn.commit()
993
191
196
994
=== modified file 'openlp/plugins/audit/auditplugin.py'
995
--- openlp/plugins/audit/auditplugin.py	2009-09-19 19:45:15 +0000
996
+++ openlp/plugins/audit/auditplugin.py	2009-09-21 17:56:36 +0000
997
@@ -27,7 +27,7 @@
998
27
from PyQt4 import QtCore, QtGui
27
from PyQt4 import QtCore, QtGui
999
28
from datetime import date
28
from datetime import date
1000
29
29
1002
30
from openlp.core.lib import Plugin,  Receiver,  translate,  str_to_bool
30
from openlp.core.lib import Plugin, Receiver, translate, str_to_bool
1003
31
from openlp.plugins.audit.lib import AuditTab
31
from openlp.plugins.audit.lib import AuditTab
1004
32
32
1005
33
class AuditPlugin(Plugin):
33
class AuditPlugin(Plugin):
1006
@@ -98,7 +98,8 @@
1007
98
        QtCore.QObject.connect(Receiver.get_receiver(),
98
        QtCore.QObject.connect(Receiver.get_receiver(),
1008
99
            QtCore.SIGNAL(u'audit_changed'), self.onUpdateAudit)
99
            QtCore.SIGNAL(u'audit_changed'), self.onUpdateAudit)
1009
100
        self.auditFileName = self.config.get_config(u'audit file', u'')
100
        self.auditFileName = self.config.get_config(u'audit file', u'')
1011
101
        self.auditActive = str_to_bool(self.config.get_config(u'audit active', False))
101
        self.auditActive = str_to_bool(
1012
102
            self.config.get_config(u'audit active', False))
1013
102
        if self.auditFileName == u'':
103
        if self.auditFileName == u'':
1014
103
            self.auditActive = False
104
            self.auditActive = False
1015
104
            self.ToolsAuditItem.setEnabled(False)
105
            self.ToolsAuditItem.setEnabled(False)
1016
@@ -117,7 +118,8 @@
1017
117
        """
118
        """
1018
118
        if self.auditActive:
119
        if self.auditActive:
1019
119
            for author in auditData[1]:
120
            for author in auditData[1]:
1021
120
                self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % (date.today(), auditData[0], author,  auditData[2]))
121
                self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % \
1022
122
                    (date.today(), auditData[0], author, auditData[2]))
1023
121
            self.auditFile.flush()
123
            self.auditFile.flush()
1024
122
124
1025
123
    def onUpdateAudit(self):
125
    def onUpdateAudit(self):
1026
@@ -126,7 +128,8 @@
1027
126
        Sort out the file and the auditing state
128
        Sort out the file and the auditing state
1028
127
        """
129
        """
1029
128
        self.auditFileNameNew = self.config.get_config(u'audit file', u'')
130
        self.auditFileNameNew = self.config.get_config(u'audit file', u'')
1031
129
        self.auditActive = str_to_bool(self.config.get_config(u'audit active', False))
131
        self.auditActive = str_to_bool(
1032
132
            self.config.get_config(u'audit active', False))
1033
130
        if self.auditFileNameNew == u'':
133
        if self.auditFileNameNew == u'':
1034
131
            self.auditActive = False
134
            self.auditActive = False
1035
132
            self.ToolsAuditItem.setChecked(self.auditActive)
135
            self.ToolsAuditItem.setChecked(self.auditActive)
1036
133
136
1037
=== modified file 'openlp/plugins/audit/lib/audittab.py'
1038
--- openlp/plugins/audit/lib/audittab.py	2009-09-19 19:31:18 +0000
1039
+++ openlp/plugins/audit/lib/audittab.py	2009-09-21 17:56:36 +0000
1040
@@ -24,7 +24,7 @@
1041
24
24
1042
25
from PyQt4 import QtCore, QtGui
25
from PyQt4 import QtCore, QtGui
1043
26
26
1045
27
from openlp.core.lib import SettingsTab,  str_to_bool,  translate,  Receiver
27
from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
1046
28
28
1047
29
class AuditTab(SettingsTab):
29
class AuditTab(SettingsTab):
1048
30
    """
30
    """
1049
@@ -45,7 +45,8 @@
1050
45
        self.AuditFileName.setObjectName("AuditFileName")
45
        self.AuditFileName.setObjectName("AuditFileName")
1051
46
        self.horizontalLayout.addWidget(self.AuditFileName)
46
        self.horizontalLayout.addWidget(self.AuditFileName)
1052
47
        icon1 = QtGui.QIcon()
47
        icon1 = QtGui.QIcon()
1054
48
        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
48
        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'),
1055
49
            QtGui.QIcon.Normal, QtGui.QIcon.Off)
1056
49
        self.AuditFileButton = QtGui.QPushButton(self)
50
        self.AuditFileButton = QtGui.QPushButton(self)
1057
50
        self.AuditFileButton.setObjectName("AuditFileButton")
51
        self.AuditFileButton.setObjectName("AuditFileButton")
1058
51
        self.AuditFileButton.setIcon(icon1)
52
        self.AuditFileButton.setIcon(icon1)
1059
@@ -63,19 +64,23 @@
1060
63
    def retranslateUi(self):
64
    def retranslateUi(self):
1061
64
        self.AuditModeGroupBox.setTitle(translate(u'AuditTab', u'Audit File'))
65
        self.AuditModeGroupBox.setTitle(translate(u'AuditTab', u'Audit File'))
1062
65
        self.AuditActive.setText(translate(u'AuditTab', 'Audit available:'))
66
        self.AuditActive.setText(translate(u'AuditTab', 'Audit available:'))
1064
66
        self.WarningLabel.setText(translate(u'AuditTab', u'A restart is needed for this change to become effective'))
67
        self.WarningLabel.setText(translate(u'AuditTab',
1065
68
            u'A restart is needed for this change to become effective'))
1066
67
69
1067
68
    def load(self):
70
    def load(self):
1068
69
        self.AuditFileName.setText(self.config.get_config(u'Audit file', u''))
71
        self.AuditFileName.setText(self.config.get_config(u'Audit file', u''))
1069
70
        self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0)))
72
        self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0)))
1070
71
73
1071
72
    def onAuditFileButtonClicked(self):
74
    def onAuditFileButtonClicked(self):
1073
73
        filename = QtGui.QFileDialog.getOpenFileName(self, u'Audit File',self.AuditFileName.text())
75
        filename = QtGui.QFileDialog.getOpenFileName(
1074
76
            self, u'Audit File',self.AuditFileName.text())
1075
74
        if filename != u'':
77
        if filename != u'':
1076
75
            filename = unicode(filename)
78
            filename = unicode(filename)
1077
76
            self.AuditFileName.setText(filename)
79
            self.AuditFileName.setText(filename)
1078
77
80
1079
78
    def save(self):
81
    def save(self):
1082
79
        self.config.set_config(u'Audit file', unicode(self.AuditFileName.text()))
82
        self.config.set_config(
1083
80
        self.config.set_config(u'startup', unicode(self.AuditActive.checkState()))
83
            u'Audit file', unicode(self.AuditFileName.text()))
1084
84
        self.config.set_config(
1085
85
            u'startup', unicode(self.AuditActive.checkState()))
1086
81
        Receiver().send_message(u'audit_changed')
86
        Receiver().send_message(u'audit_changed')
1087
82
87
1088
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
1089
--- openlp/plugins/bibles/bibleplugin.py	2009-09-08 19:58:05 +0000
1090
+++ openlp/plugins/bibles/bibleplugin.py	2009-09-21 17:56:36 +0000
1091
@@ -25,7 +25,6 @@
1092
25
import logging
25
import logging
1093
26
26
1094
27
from PyQt4 import QtCore, QtGui
27
from PyQt4 import QtCore, QtGui
1095
28
from PyQt4.QtCore import *
1096
29
28
1097
30
from openlp.core.lib import Plugin, translate
29
from openlp.core.lib import Plugin, translate
1098
31
30
1099
@@ -62,7 +61,8 @@
1100
62
        import_menu.addAction(self.ImportBibleItem)
61
        import_menu.addAction(self.ImportBibleItem)
1101
63
        self.ImportBibleItem.setText(translate(u'BiblePlugin', u'&Bible'))
62
        self.ImportBibleItem.setText(translate(u'BiblePlugin', u'&Bible'))
1102
64
        # Signals and slots
63
        # Signals and slots
1104
65
        QtCore.QObject.connect(self.ImportBibleItem, QtCore.SIGNAL(u'triggered()'),  self.onBibleNewClick)
64
        QtCore.QObject.connect(self.ImportBibleItem,
1105
65
            QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick)
1106
66
66
1107
67
    def add_export_menu_item(self, export_menu):
67
    def add_export_menu_item(self, export_menu):
1108
68
        self.ExportBibleItem = QtGui.QAction(export_menu)
68
        self.ExportBibleItem = QtGui.QAction(export_menu)
1109
69
69
1110
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
1111
--- openlp/plugins/bibles/forms/bibleimportform.py	2009-09-08 19:58:05 +0000
1112
+++ openlp/plugins/bibles/forms/bibleimportform.py	2009-09-21 17:56:36 +0000
1113
@@ -31,7 +31,7 @@
1114
31
from PyQt4 import QtCore, QtGui
31
from PyQt4 import QtCore, QtGui
1115
32
32
1116
33
from bibleimportdialog import Ui_BibleImportDialog
33
from bibleimportdialog import Ui_BibleImportDialog
1118
34
from openlp.core.lib import Receiver,  translate
34
from openlp.core.lib import Receiver, translate
1119
35
35
1120
36
36
1121
37
class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
37
class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
1122
@@ -41,7 +41,7 @@
1123
41
    """
41
    """
1124
42
    Class documentation goes here.
42
    Class documentation goes here.
1125
43
    """
43
    """
1127
44
    def __init__(self, config, biblemanager , bibleplugin, parent = None):
44
    def __init__(self, config, biblemanager, bibleplugin, parent=None):
1128
45
        '''
45
        '''
1129
46
        Constructor
46
        Constructor
1130
47
        '''
47
        '''
1131
@@ -196,23 +196,28 @@
1132
196
        log.debug(u'Import Bible')
196
        log.debug(u'Import Bible')
1133
197
        message = None
197
        message = None
1134
198
        if self.bible_type == u'OSIS':
198
        if self.bible_type == u'OSIS':
1136
199
            loaded = self.biblemanager.register_osis_file_bible(unicode(self.BibleNameEdit.displayText()),
199
            loaded = self.biblemanager.register_osis_file_bible(
1137
200
                unicode(self.BibleNameEdit.displayText()),
1138
200
                self.OSISLocationEdit.displayText())
201
                self.OSISLocationEdit.displayText())
1139
201
        elif self.bible_type == u'CSV':
202
        elif self.bible_type == u'CSV':
1142
202
            loaded = self.biblemanager.register_csv_file_bible(unicode(self.BibleNameEdit.displayText()),
203
            loaded = self.biblemanager.register_csv_file_bible(
1143
203
                self.BooksLocationEdit.displayText(), self.VerseLocationEdit.displayText())
204
                unicode(self.BibleNameEdit.displayText()),
1144
205
                self.BooksLocationEdit.displayText(),
1145
206
                self.VerseLocationEdit.displayText())
1146
204
        else:
207
        else:
1147
205
            # set a value as it will not be needed
208
            # set a value as it will not be needed
1148
206
            self.setMax(1)
209
            self.setMax(1)
1156
207
            bible = self.bible_versions[unicode(self.BibleComboBox.currentText())]
210
            bible = self.bible_versions[
1157
208
            loaded = self.biblemanager.register_http_bible(unicode(self.BibleComboBox.currentText()), \
211
                unicode(self.BibleComboBox.currentText())]
1158
209
                                                                                     unicode(self.LocationComboBox.currentText()),  \
212
            loaded = self.biblemanager.register_http_bible(
1159
210
                                                                                     unicode(bible), \
213
                unicode(self.BibleComboBox.currentText()),
1160
211
                                                                                     unicode(self.AddressEdit.displayText()),  \
214
                unicode(self.LocationComboBox.currentText()),
1161
212
                                                                                     unicode(self.UsernameEdit .displayText()),  \
215
                unicode(bible), unicode(self.AddressEdit.displayText()),
1162
213
                                                                                     unicode(self.PasswordEdit.displayText()))
216
                unicode(self.UsernameEdit .displayText()),
1163
217
                unicode(self.PasswordEdit.displayText()))
1164
214
        if loaded:
218
        if loaded:
1166
215
            self.biblemanager.save_meta_data(unicode(self.BibleNameEdit.displayText()),
219
            self.biblemanager.save_meta_data(
1167
220
                unicode(self.BibleNameEdit.displayText()),
1168
216
                unicode(self.VersionNameEdit.displayText()),
221
                unicode(self.VersionNameEdit.displayText()),
1169
217
                unicode(self.CopyrightEdit.displayText()),
222
                unicode(self.CopyrightEdit.displayText()),
1170
218
                unicode(self.PermisionEdit.displayText()))
223
                unicode(self.PermisionEdit.displayText()))
1171
@@ -226,7 +231,8 @@
1172
226
        return loaded, message
231
        return loaded, message
1173
227
232
1174
228
    def checkOsis(self):
233
    def checkOsis(self):
1176
229
        if len(self.BooksLocationEdit.displayText()) > 0 or len(self.VerseLocationEdit.displayText()) > 0:
234
        if len(self.BooksLocationEdit.displayText()) > 0 or \
1177
235
            len(self.VerseLocationEdit.displayText()) > 0:
1178
230
            self.setCsv()
236
            self.setCsv()
1179
231
        else:
237
        else:
1180
232
            # Was CSV and is not any more stops lostFocus running mad
238
            # Was CSV and is not any more stops lostFocus running mad
1181
@@ -235,7 +241,8 @@
1182
235
                self.resetScreenFieldStates()
241
                self.resetScreenFieldStates()
1183
236
242
1184
237
    def checkHttp(self):
243
    def checkHttp(self):
1186
238
        if self.BibleComboBox.currentIndex() != 0 :  # First slot is blank so no bible
244
        if self.BibleComboBox.currentIndex() != 0 :
1187
245
            # First slot is blank so no bible
1188
239
            self.setHttp()
246
            self.setHttp()
1189
240
        else:
247
        else:
1190
241
            # Was HTTP and is not any more stops lostFocus running mad
248
            # Was HTTP and is not any more stops lostFocus running mad
1191
242
249
1192
=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
1193
--- openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-08 19:58:05 +0000
1194
+++ openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-21 17:56:36 +0000
1195
@@ -42,7 +42,8 @@
1196
42
        """
42
        """
1197
43
        self.bibledb = bibledb
43
        self.bibledb = bibledb
1198
44
        self.loadbible = True
44
        self.loadbible = True
1200
45
        QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL(u'openlpstopimport'),self.stop_import)
45
        QtCore.QObject.connect(Receiver().get_receiver(),
1201
46
            QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
1202
46
47
1203
47
    def stop_import(self):
48
    def stop_import(self):
1204
48
        self.loadbible= False
49
        self.loadbible= False
1205
@@ -80,7 +81,7 @@
1206
80
            # split into 3 units and leave the rest as a single field
81
            # split into 3 units and leave the rest as a single field
1207
81
            p = line.split(u',', 3)
82
            p = line.split(u',', 3)
1208
82
            p0 = p[0].replace(u'"', u'')
83
            p0 = p[0].replace(u'"', u'')
1210
83
            p3 =  p[3].replace(u'"',u'')
84
            p3 = p[3].replace(u'"',u'')
1211
84
            if book_ptr is not p0:
85
            if book_ptr is not p0:
1212
85
                book = self.bibledb.get_bible_book(p0)
86
                book = self.bibledb.get_bible_book(p0)
1213
86
                book_ptr = book.name
87
                book_ptr = book.name
1214
87
88
1215
=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
1216
--- openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-12 17:24:16 +0000
1217
+++ openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-21 17:56:36 +0000
1218
@@ -59,7 +59,7 @@
1219
59
        self._load_testament(u'New Testament')
59
        self._load_testament(u'New Testament')
1220
60
        self._load_testament(u'Apocrypha')
60
        self._load_testament(u'Apocrypha')
1221
61
61
1223
62
    def add_verse(self, bookid, chap,  vse, text):
62
    def add_verse(self, bookid, chap, vse, text):
1224
63
        #log.debug(u'add_verse %s,%s,%s", bookid, chap, vse)
63
        #log.debug(u'add_verse %s,%s,%s", bookid, chap, vse)
1225
64
        verse = Verse()
64
        verse = Verse()
1226
65
        verse.book_id = bookid
65
        verse.book_id = bookid
1227
@@ -113,7 +113,7 @@
1228
113
            return False
113
            return False
1229
114
114
1230
115
    def _load_testament(self, testament):
115
    def _load_testament(self, testament):
1232
116
        log.debug(u'load_testaments %s',  testament)
116
        log.debug(u'load_testaments %s', testament)
1233
117
        test = ONTestament()
117
        test = ONTestament()
1234
118
        test.name = testament
118
        test.name = testament
1235
119
        self.session.add(test)
119
        self.session.add(test)
1236
120
120
1237
=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
1238
--- openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-08 19:58:05 +0000
1239
+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-21 19:26:10 +0000
1240
@@ -39,21 +39,32 @@
1241
39
        log.debug(u'init %s', proxyurl)
39
        log.debug(u'init %s', proxyurl)
1242
40
        self.proxyurl = proxyurl
40
        self.proxyurl = proxyurl
1243
41
41
1245
42
    def get_bible_chapter(self, version, bookid, bookname,  chapter) :
42
    def get_bible_chapter(self, version, bookid, bookname, chapter) :
1246
43
        """
43
        """
1247
44
        Access and decode bibles via the BibleGateway website
44
        Access and decode bibles via the BibleGateway website
1252
45
            Version - the version of the bible like 31 for New International version
45
1253
46
            bookid - Book id for the book of the bible - eg 1 for Genesis
46
        ``Version``
1254
47
            bookname - not used
47
            The version of the bible like 31 for New International version
1255
48
            chapter - chapter number
48
1256
49
        ``bookid``
1257
50
            Book id for the book of the bible - eg 1 for Genesis
1258
51
1259
52
        ``bookname``
1260
53
            Not used
1261
54
1262
55
        ``chapter``
1263
56
            Chapter number
1264
49
        """
57
        """
1267
50
        log.debug( u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
58
        log.debug(u'get_bible_chapter %s,%s,%s,%s',
1268
51
        urlstring = u'http://www.biblegateway.com/passage/?book_id='+unicode(bookid)+u'&chapter'+unicode(chapter)+u'&version='+unicode(version)
59
            version, bookid, bookname, chapter)
1269
60
        urlstring = u'http://www.biblegateway.com/passage/?book_id=' + \
1270
61
            unicode(bookid) + u'&chapter' + unicode(chapter) + u'&version=' + \
1271
62
            unicode(version)
1272
52
        xml_string = self._get_web_text(urlstring, self.proxyurl)
63
        xml_string = self._get_web_text(urlstring, self.proxyurl)
1273
53
        #print xml_string
64
        #print xml_string
1275
54
        VerseSearch = u'class='+u'"'+u'sup'+u'"'+u'>'
65
        VerseSearch = u'class=' + u'"' + u'sup' + u'"' + u'>'
1276
55
        verse = 1
66
        verse = 1
1278
56
        i= xml_string.find(u'result-text-style-normal')
67
        i = xml_string.find(u'result-text-style-normal')
1279
57
        xml_string = xml_string[i:len(xml_string)]
68
        xml_string = xml_string[i:len(xml_string)]
1280
58
        versePos = xml_string.find(VerseSearch)
69
        versePos = xml_string.find(VerseSearch)
1281
59
        #print versePos
70
        #print versePos
1282
@@ -62,11 +73,11 @@
1283
62
            verseText = '' # clear out string
73
            verseText = '' # clear out string
1284
63
            versePos = xml_string.find(u'</span', versePos)
74
            versePos = xml_string.find(u'</span', versePos)
1285
64
            i = xml_string.find(VerseSearch, versePos+1)
75
            i = xml_string.find(VerseSearch, versePos+1)
1287
65
            #print i ,  versePos
76
            #print i , versePos
1288
66
            if i == -1:
77
            if i == -1:
1289
67
                i = xml_string.find(u'</div', versePos+1)
78
                i = xml_string.find(u'</div', versePos+1)
1290
68
                j = xml_string.find(u'<strong', versePos+1)
79
                j = xml_string.find(u'<strong', versePos+1)
1292
69
                #print i ,  j
80
                #print i , j
1293
70
                if j > 0 and j < i:
81
                if j > 0 and j < i:
1294
71
                    i = j
82
                    i = j
1295
72
                verseText = xml_string[versePos + 7 : i ]
83
                verseText = xml_string[versePos + 7 : i ]
1296
@@ -75,9 +86,10 @@
1297
75
                bible[verse] = self._clean_text(verseText) # store the verse
86
                bible[verse] = self._clean_text(verseText) # store the verse
1298
76
                versePos = -1
87
                versePos = -1
1299
77
            else:
88
            else:
1303
78
                i = xml_string[:i].rfind(u'<span')+1
89
                i = xml_string[:i].rfind(u'<span') + 1
1304
79
                verseText = xml_string[versePos + 7 : i - 1 ] # Loose the </span>
90
                verseText = xml_string[versePos + 7 : i - 1] # Loose </span>
1305
80
                xml_string = xml_string[i - 1 :len(xml_string)] # chop off verse 1
91
                # Chop off verse 1
1306
92
                xml_string = xml_string[i - 1 :len(xml_string)]
1307
81
                versePos = xml_string.find(VerseSearch) #look for the next verse
93
                versePos = xml_string.find(VerseSearch) #look for the next verse
1308
82
                bible[verse] = self._clean_text(verseText) # store the verse
94
                bible[verse] = self._clean_text(verseText) # store the verse
1309
83
                verse += 1
95
                verse += 1
1310
@@ -92,16 +104,26 @@
1311
92
        log.debug(u'init %s', proxyurl)
104
        log.debug(u'init %s', proxyurl)
1312
93
        self.proxyurl = proxyurl
105
        self.proxyurl = proxyurl
1313
94
106
1316
95
    def get_bible_chapter(self, version, bookid, bookname,  chapter) :
107
    def get_bible_chapter(self, version, bookid, bookname, chapter) :
1317
96
        log.debug( u'getBibleChapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
108
        log.debug(u'getBibleChapter %s,%s,%s,%s',
1318
109
            version, bookid, bookname, chapter)
1319
97
        """
110
        """
1320
98
        Access and decode bibles via the Crosswalk website
111
        Access and decode bibles via the Crosswalk website
1325
99
            Version - the version of the bible like niv for New International version
112
1326
100
            bookid - not used
113
        ``version``
1327
101
            bookname - text name of in english eg 'gen' for Genesis
114
            The version of the bible like niv for New International Version
1328
102
            chapter - chapter number
115
1329
116
        ``bookid``
1330
117
            Not used
1331
118
1332
119
        ``bookname``
1333
120
            Text name of in english e.g. 'gen' for Genesis
1334
121
1335
122
        ``chapter``
1336
123
            Chapter number
1337
103
        """
124
        """
1339
104
        log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
125
        log.debug(u'get_bible_chapter %s,%s,%s,%s',
1340
126
            version, bookid, bookname, chapter)
1341
105
        bookname = bookname.replace(u' ', u'')
127
        bookname = bookname.replace(u' ', u'')
1342
106
        urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s' % (bookname, chapter, version)
128
        urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s' % (bookname, chapter, version)
1343
107
        xml_string = self._get_web_text(urlstring, self.proxyurl)
129
        xml_string = self._get_web_text(urlstring, self.proxyurl)
1344
@@ -135,7 +157,7 @@
1345
135
        #remove the <B> at the front
157
        #remove the <B> at the front
1346
136
        xml_string = xml_string[i + 3 :len(xml_string)]
158
        xml_string = xml_string[i + 3 :len(xml_string)]
1347
137
        versePos = xml_string.find(u'<BLOCKQUOTE>')
159
        versePos = xml_string.find(u'<BLOCKQUOTE>')
1349
138
        #log.debug(u'verse pos %d',  versePos)
160
        #log.debug(u'verse pos %d', versePos)
1350
139
        bible = {}
161
        bible = {}
1351
140
        while versePos > 0:
162
        while versePos > 0:
1352
141
            verseText = u''
163
            verseText = u''
1353
@@ -153,7 +175,7 @@
1354
153
                verseText = xml_string[versePos: i]
175
                verseText = xml_string[versePos: i]
1355
154
                versePos = 0
176
                versePos = 0
1356
155
            else:
177
            else:
1358
156
                #log.debug( i,  versePos)
178
                #log.debug( i, versePos)
1359
157
                verseText = xml_string[versePos: i]
179
                verseText = xml_string[versePos: i]
1360
158
                versePos = i
180
                versePos = i
1361
159
            #print verseText
181
            #print verseText
1362
@@ -170,7 +192,9 @@
1363
170
    def __init__(self):
192
    def __init__(self):
1364
171
        """
193
        """
1365
172
        Finds all the bibles defined for the system
194
        Finds all the bibles defined for the system
1367
173
        Creates an Interface Object for each bible containing connection information
195
        Creates an Interface Object for each bible containing connection
1368
196
        information
1369
197
1370
174
        Throws Exception if no Bibles are found.
198
        Throws Exception if no Bibles are found.
1371
175
199
1372
176
        Init confirms the bible exists and stores the database path.
200
        Init confirms the bible exists and stores the database path.
1373
@@ -202,18 +226,19 @@
1374
202
        log.debug(u'set_bible_source %s', biblesource)
226
        log.debug(u'set_bible_source %s', biblesource)
1375
203
        self.biblesource = biblesource
227
        self.biblesource = biblesource
1376
204
228
1378
205
    def get_bible_chapter(self, version, bookid, bookname,  chapter):
229
    def get_bible_chapter(self, version, bookid, bookname, chapter):
1379
206
        """
230
        """
1380
207
        Receive the request and call the relevant handler methods
231
        Receive the request and call the relevant handler methods
1381
208
        """
232
        """
1383
209
        log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
233
        log.debug(u'get_bible_chapter %s,%s,%s,%s',
1384
234
            version, bookid, bookname, chapter)
1385
210
        log.debug(u'biblesource = %s', self.biblesource)
235
        log.debug(u'biblesource = %s', self.biblesource)
1386
211
        try:
236
        try:
1387
212
            if self.biblesource.lower() == u'crosswalk':
237
            if self.biblesource.lower() == u'crosswalk':
1388
213
                ev = CWExtract(self.proxyurl)
238
                ev = CWExtract(self.proxyurl)
1389
214
            else:
239
            else:
1390
215
                ev = BGExtract(self.proxyurl)
240
                ev = BGExtract(self.proxyurl)
1392
216
            return ev.get_bible_chapter(self.bibleid, bookid, bookname,  chapter)
241
            return ev.get_bible_chapter(self.bibleid, bookid, bookname, chapter)
1393
217
        except Exception, e:
242
        except Exception, e:
1394
218
            log.error(u'Error thrown = %s', e.args[0])
243
            log.error(u'Error thrown = %s', e.args[0])
1395
219
            print e
244
            print e
1396
220
245
1397
=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
1398
--- openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-08 19:58:05 +0000
1399
+++ openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-21 17:56:36 +0000
1400
@@ -86,7 +86,7 @@
1401
86
            The Import dialog, so that we can increase the counter on
86
            The Import dialog, so that we can increase the counter on
1402
87
            the progress bar.
87
            the progress bar.
1403
88
        """
88
        """
1405
89
        detect_file = open(osisfile_record,  u'r')
89
        detect_file = open(osisfile_record, u'r')
1406
90
        details = chardet.detect(detect_file.read(2048))
90
        details = chardet.detect(detect_file.read(2048))
1407
91
        detect_file.close()
91
        detect_file.close()
1408
92
        osis = codecs.open(osisfile_record, u'r', details['encoding'])
92
        osis = codecs.open(osisfile_record, u'r', details['encoding'])
1409
@@ -102,7 +102,7 @@
1410
102
            pos = file_record.find(verseText)
102
            pos = file_record.find(verseText)
1411
103
            if pos > -1: # we have a verse
103
            if pos > -1: # we have a verse
1412
104
                epos= file_record.find(u'>', pos)
104
                epos= file_record.find(u'>', pos)
1414
105
                ref =  file_record[pos+15:epos-1]  # Book Reference
105
                ref = file_record[pos+15:epos-1]  # Book Reference
1415
106
                #lets find the bible text only
106
                #lets find the bible text only
1416
107
                # find start of text
107
                # find start of text
1417
108
                pos = epos + 1
108
                pos = epos + 1
1418
@@ -113,10 +113,10 @@
1419
113
                text = self.remove_block(u'<title', u'</title>', text)
113
                text = self.remove_block(u'<title', u'</title>', text)
1420
114
                text = self.remove_block(u'<note', u'</note>', text)
114
                text = self.remove_block(u'<note', u'</note>', text)
1421
115
                text = self.remove_block(u'<divineName', u'</divineName>', text)
115
                text = self.remove_block(u'<divineName', u'</divineName>', text)
1426
116
                text = self.remove_tag(u'<lb',  text)
116
                text = self.remove_tag(u'<lb', text)
1427
117
                text = self.remove_tag(u'<q',  text)
117
                text = self.remove_tag(u'<q', text)
1428
118
                text = self.remove_tag(u'<l',  text)
118
                text = self.remove_tag(u'<l', text)
1429
119
                text = self.remove_tag(u'<lg',  text)
119
                text = self.remove_tag(u'<lg', text)
1430
120
                # Strange tags where the end is not the same as the start
120
                # Strange tags where the end is not the same as the start
1431
121
                # The must be in this order as at least one bible has them
121
                # The must be in this order as at least one bible has them
1432
122
                # crossing and the removal does not work.
122
                # crossing and the removal does not work.
1433
@@ -127,12 +127,12 @@
1434
127
                        #print "Y", search_text, e
127
                        #print "Y", search_text, e
1435
128
                        pos = -1
128
                        pos = -1
1436
129
                    else:
129
                    else:
1438
130
                        text =  text[:pos] + text[epos + 4: ]
130
                        text = text[:pos] + text[epos + 4: ]
1439
131
                        pos = text.find(u'<FI>')
131
                        pos = text.find(u'<FI>')
1440
132
                pos = text.find(u'<RF>')
132
                pos = text.find(u'<RF>')
1441
133
                while pos > -1:
133
                while pos > -1:
1442
134
                    epos = text.find(u'<Rf>', pos)
134
                    epos = text.find(u'<Rf>', pos)
1444
135
                    text =  text[:pos] + text[epos + 4: ]
135
                    text = text[:pos] + text[epos + 4: ]
1445
136
                    #print "X", pos, epos, text
136
                    #print "X", pos, epos, text
1446
137
                    pos = text.find(u'<RF>')
137
                    pos = text.find(u'<RF>')
1447
138
                # split up the reference
138
                # split up the reference
1448
@@ -184,7 +184,7 @@
1449
184
            if epos == -1:
184
            if epos == -1:
1450
185
                pos = -1
185
                pos = -1
1451
186
            else:
186
            else:
1453
187
                text =  text[:pos] + text[epos + len(end_tag): ]
187
                text = text[:pos] + text[epos + len(end_tag): ]
1454
188
                pos = text.find(start_tag)
188
                pos = text.find(start_tag)
1455
189
        return text
189
        return text
1456
190
190
1457
@@ -203,6 +203,6 @@
1458
203
        pos = text.find(start_tag)
203
        pos = text.find(start_tag)
1459
204
        while pos > -1:
204
        while pos > -1:
1460
205
            epos = text.find(u'/>', pos)
205
            epos = text.find(u'/>', pos)
1462
206
            text =  text[:pos] + text[epos + 2: ]
206
            text = text[:pos] + text[epos + 2: ]
1463
207
            pos = text.find(start_tag)
207
            pos = text.find(start_tag)
1464
208
        return text
208
        return text
1465
209
209
1466
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
1467
--- openlp/plugins/bibles/lib/biblestab.py	2009-09-13 07:39:48 +0000
1468
+++ openlp/plugins/bibles/lib/biblestab.py	2009-09-21 17:56:36 +0000
1469
@@ -26,7 +26,7 @@
1470
26
26
1471
27
from PyQt4 import Qt, QtCore, QtGui
27
from PyQt4 import Qt, QtCore, QtGui
1472
28
28
1474
29
from openlp.core.lib import translate, str_to_bool,  Receiver
29
from openlp.core.lib import translate, str_to_bool, Receiver
1475
30
from openlp.core.lib import SettingsTab
30
from openlp.core.lib import SettingsTab
1476
31
31
1477
32
class BiblesTab(SettingsTab):
32
class BiblesTab(SettingsTab):
1478
@@ -42,7 +42,8 @@
1479
42
        self.show_new_chapters = False
42
        self.show_new_chapters = False
1480
43
        self.display_style = 0
43
        self.display_style = 0
1481
44
        self.bible_search = True
44
        self.bible_search = True
1483
45
        SettingsTab.__init__(self, translate(u'BiblesTab', u'Bibles'), u'Bibles')
45
        SettingsTab.__init__(
1484
46
            self, translate(u'BiblesTab', u'Bibles'), u'Bibles')
1485
46
47
1486
47
    def setupUi(self):
48
    def setupUi(self):
1487
48
        self.setObjectName(u'BiblesTab')
49
        self.setObjectName(u'BiblesTab')
1488
@@ -142,34 +143,53 @@
1489
142
        self.BibleLayout.addWidget(self.BibleRightWidget)
143
        self.BibleLayout.addWidget(self.BibleRightWidget)
1490
143
        # Signals and slots
144
        # Signals and slots
1491
144
        QtCore.QObject.connect(self.NewChaptersCheckBox,
145
        QtCore.QObject.connect(self.NewChaptersCheckBox,
1493
145
            QtCore.SIGNAL(u'stateChanged(int)'), self.onNewChaptersCheckBoxChanged)
146
            QtCore.SIGNAL(u'stateChanged(int)'),
1494
147
            self.onNewChaptersCheckBoxChanged)
1495
146
        QtCore.QObject.connect(self.BibleSearchCheckBox,
148
        QtCore.QObject.connect(self.BibleSearchCheckBox,
1497
147
            QtCore.SIGNAL(u'stateChanged(int)'), self.onBibleSearchCheckBoxChanged)
149
            QtCore.SIGNAL(u'stateChanged(int)'),
1498
150
            self.onBibleSearchCheckBoxChanged)
1499
148
        QtCore.QObject.connect(self.DisplayStyleComboBox,
151
        QtCore.QObject.connect(self.DisplayStyleComboBox,
1501
149
            QtCore.SIGNAL(u'activated(int)'), self.onDisplayStyleComboBoxChanged)
152
            QtCore.SIGNAL(u'activated(int)'),
1502
153
            self.onDisplayStyleComboBoxChanged)
1503
150
        QtCore.QObject.connect(self.BibleThemeComboBox,
154
        QtCore.QObject.connect(self.BibleThemeComboBox,
1504
151
            QtCore.SIGNAL(u'activated(int)'), self.onBibleThemeComboBoxChanged)
155
            QtCore.SIGNAL(u'activated(int)'), self.onBibleThemeComboBoxChanged)
1505
152
        QtCore.QObject.connect(self.LayoutStyleComboBox,
156
        QtCore.QObject.connect(self.LayoutStyleComboBox,
1507
153
            QtCore.SIGNAL(u'activated(int)'), self.onLayoutStyleComboBoxChanged)
157
            QtCore.SIGNAL(u'activated(int)'),
1508
158
            self.onLayoutStyleComboBoxChanged)
1509
154
        QtCore.QObject.connect(Receiver.get_receiver(),
159
        QtCore.QObject.connect(Receiver.get_receiver(),
1510
155
            QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
160
            QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
1511
156
161
1512
157
    def retranslateUi(self):
162
    def retranslateUi(self):
1528
158
        self.VerseDisplayGroupBox.setTitle(translate(u'SettingsForm', u'Verse Display'))
163
        self.VerseDisplayGroupBox.setTitle(
1529
159
        self.NewChaptersCheckBox.setText(translate(u'SettingsForm', u'Only show new chapter numbers'))
164
            translate(u'SettingsForm', u'Verse Display'))
1530
160
        self.LayoutStyleLabel.setText(translate(u'SettingsForm', u'Layout Style:'))
165
        self.NewChaptersCheckBox.setText(
1531
161
        self.DisplayStyleLabel.setText(translate(u'SettingsForm', u'Display Style:'))
166
            translate(u'SettingsForm', u'Only show new chapter numbers'))
1532
162
        self.BibleThemeLabel.setText(translate(u'SettingsForm', u'Bible Theme:'))
167
        self.LayoutStyleLabel.setText(
1533
163
        self.LayoutStyleComboBox.setItemText(0, translate(u'SettingsForm', u'verse per slide'))
168
            translate(u'SettingsForm', u'Layout Style:'))
1534
164
        self.LayoutStyleComboBox.setItemText(1, translate(u'SettingsForm', u'verse per line'))
169
        self.DisplayStyleLabel.setText(
1535
165
        self.LayoutStyleComboBox.setItemText(2, translate(u'SettingsForm', u'continuous'))
170
            translate(u'SettingsForm', u'Display Style:'))
1536
166
        self.DisplayStyleComboBox.setItemText(0, translate(u'SettingsForm', u'No brackets'))
171
        self.BibleThemeLabel.setText(
1537
167
        self.DisplayStyleComboBox.setItemText(1, translate(u'SettingsForm', u'( and )'))
172
            translate(u'SettingsForm', u'Bible Theme:'))
1538
168
        self.DisplayStyleComboBox.setItemText(2, translate(u'SettingsForm', u'{ and }'))
173
        self.LayoutStyleComboBox.setItemText(
1539
169
        self.DisplayStyleComboBox.setItemText(3, translate(u'SettingsForm', u'[ and ]'))
174
            0, translate(u'SettingsForm', u'verse per slide'))
1540
170
        self.ChangeNoteLabel.setText(translate(u'SettingsForm', u'Note:\nChanges don\'t affect verses already in the service'))
175
        self.LayoutStyleComboBox.setItemText(
1541
171
        self.BibleSearchGroupBox.setTitle(translate(u'SettingsForm', u'Search'))
176
            1, translate(u'SettingsForm', u'verse per line'))
1542
172
        self.BibleSearchCheckBox.setText(translate(u'SettingsForm', u'Search-as-you-type'))
177
        self.LayoutStyleComboBox.setItemText(
1543
178
            2, translate(u'SettingsForm', u'continuous'))
1544
179
        self.DisplayStyleComboBox.setItemText(
1545
180
            0, translate(u'SettingsForm', u'No brackets'))
1546
181
        self.DisplayStyleComboBox.setItemText(
1547
182
            1, translate(u'SettingsForm', u'( and )'))
1548
183
        self.DisplayStyleComboBox.setItemText(
1549
184
            2, translate(u'SettingsForm', u'{ and }'))
1550
185
        self.DisplayStyleComboBox.setItemText(
1551
186
            3, translate(u'SettingsForm', u'[ and ]'))
1552
187
        self.ChangeNoteLabel.setText(translate(u'SettingsForm',
1553
188
            u'Note:\nChanges don\'t affect verses already in the service'))
1554
189
        self.BibleSearchGroupBox.setTitle(
1555
190
            translate(u'SettingsForm', u'Search'))
1556
191
        self.BibleSearchCheckBox.setText(
1557
192
            translate(u'SettingsForm', u'Search-as-you-type'))
1558
173
193
1559
174
    def onBibleThemeComboBoxChanged(self):
194
    def onBibleThemeComboBoxChanged(self):
1560
175
        self.bible_theme = self.BibleThemeComboBox.currentText()
195
        self.bible_theme = self.BibleThemeComboBox.currentText()
1561
@@ -195,20 +215,27 @@
1562
195
            self.bible_search = True
215
            self.bible_search = True
1563
196
216
1564
197
    def load(self):
217
    def load(self):
1568
198
        self.show_new_chapters = str_to_bool(self.config.get_config(u'display new chapter', u'False'))
218
        self.show_new_chapters = str_to_bool(
1569
199
        self.display_style = int(self.config.get_config(u'display brackets', u'0'))
219
            self.config.get_config(u'display new chapter', u'False'))
1570
200
        self.layout_style = int(self.config.get_config(u'verse layout style', u'0'))
220
        self.display_style = int(
1571
221
            self.config.get_config(u'display brackets', u'0'))
1572
222
        self.layout_style = int(
1573
223
            self.config.get_config(u'verse layout style', u'0'))
1574
201
        self.bible_theme = self.config.get_config(u'bible theme', u'0')
224
        self.bible_theme = self.config.get_config(u'bible theme', u'0')
1576
202
        self.bible_search = str_to_bool(self.config.get_config(u'search as type', u'True'))
225
        self.bible_search = str_to_bool(
1577
226
            self.config.get_config(u'search as type', u'True'))
1578
203
        self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
227
        self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
1579
204
        self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
228
        self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
1580
205
        self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
229
        self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
1581
206
        self.BibleSearchCheckBox.setChecked(self.bible_search)
230
        self.BibleSearchCheckBox.setChecked(self.bible_search)
1582
207
231
1583
208
    def save(self):
232
    def save(self):
1587
209
        self.config.set_config(u'display new chapter', unicode(self.show_new_chapters))
233
        self.config.set_config(
1588
210
        self.config.set_config(u'display brackets', unicode(self.display_style))
234
            u'display new chapter', unicode(self.show_new_chapters))
1589
211
        self.config.set_config(u'verse layout style', unicode(self.layout_style))
235
        self.config.set_config(
1590
236
            u'display brackets', unicode(self.display_style))
1591
237
        self.config.set_config(
1592
238
            u'verse layout style', unicode(self.layout_style))
1593
212
        self.config.set_config(u'search as type', unicode(self.bible_search))
239
        self.config.set_config(u'search as type', unicode(self.bible_search))
1594
213
        self.config.set_config(u'bible theme', unicode(self.bible_theme))
240
        self.config.set_config(u'bible theme', unicode(self.bible_theme))
1595
214
241
1596
@@ -220,7 +247,8 @@
1597
220
        self.BibleThemeComboBox.addItem(u'')
247
        self.BibleThemeComboBox.addItem(u'')
1598
221
        for theme in theme_list:
248
        for theme in theme_list:
1599
222
            self.BibleThemeComboBox.addItem(theme)
249
            self.BibleThemeComboBox.addItem(theme)
1601
223
        id = self.BibleThemeComboBox.findText(unicode(self.bible_theme), QtCore.Qt.MatchExactly)
250
        id = self.BibleThemeComboBox.findText(
1602
251
            unicode(self.bible_theme), QtCore.Qt.MatchExactly)
1603
224
        if id == -1:
252
        if id == -1:
1604
225
            # Not Found
253
            # Not Found
1605
226
            id = 0
254
            id = 0
1606
227
255
1607
=== modified file 'openlp/plugins/bibles/lib/manager.py'
1608
--- openlp/plugins/bibles/lib/manager.py	2009-09-17 23:10:25 +0000
1609
+++ openlp/plugins/bibles/lib/manager.py	2009-09-21 17:56:36 +0000
1610
@@ -81,7 +81,7 @@
1611
81
    def reload_bibles(self):
81
    def reload_bibles(self):
1612
82
        log.debug(u'Reload bibles')
82
        log.debug(u'Reload bibles')
1613
83
        files = self.config.get_files(self.bibleSuffix)
83
        files = self.config.get_files(self.bibleSuffix)
1615
84
        log.debug(u'Bible Files %s',  files )
84
        log.debug(u'Bible Files %s', files )
1616
85
        self.bible_db_cache = {}
85
        self.bible_db_cache = {}
1617
86
        self.bible_http_cache  = {}
86
        self.bible_http_cache  = {}
1618
87
        # books of the bible with testaments
87
        # books of the bible with testaments
1619
@@ -166,7 +166,7 @@
1620
166
            Defaults to *None*. The password to accompany the username.
166
            Defaults to *None*. The password to accompany the username.
1621
167
        """
167
        """
1622
168
        log.debug(u'register_HTTP_bible %s, %s, %s, %s, %s, %s',
168
        log.debug(u'register_HTTP_bible %s, %s, %s, %s, %s, %s',
1624
169
            biblename, biblesource, bibleid, proxyurl,  proxyid, proxypass)
169
            biblename, biblesource, bibleid, proxyurl, proxyid, proxypass)
1625
170
        if self._is_new_bible(biblename):
170
        if self._is_new_bible(biblename):
1626
171
            # Create new Bible
171
            # Create new Bible
1627
172
            nbible = BibleDBImpl(self.biblePath, biblename, self.config)
172
            nbible = BibleDBImpl(self.biblePath, biblename, self.config)
1628
@@ -271,7 +271,7 @@
1629
271
        log.debug(u'get_bible_books %s', bible)
271
        log.debug(u'get_bible_books %s', bible)
1630
272
        return self.bible_db_cache[bible].get_bible_books()
272
        return self.bible_db_cache[bible].get_bible_books()
1631
273
273
1633
274
    def get_book_chapter_count(self, bible,  book):
274
    def get_book_chapter_count(self, bible, book):
1634
275
        """
275
        """
1635
276
        Returns the number of Chapters for a given book
276
        Returns the number of Chapters for a given book
1636
277
        """
277
        """
1637
@@ -283,7 +283,7 @@
1638
283
        Returns all the number of verses for a given
283
        Returns all the number of verses for a given
1639
284
        book and chapterMaxBibleBookVerses
284
        book and chapterMaxBibleBookVerses
1640
285
        """
285
        """
1642
286
        log.debug(u'get_book_verse_count %s,%s,%s', bible, book,  chapter)
286
        log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter)
1643
287
        return self.bible_db_cache[bible].get_max_bible_book_verses(
287
        return self.bible_db_cache[bible].get_max_bible_book_verses(
1644
288
            book, chapter)
288
            book, chapter)
1645
289
289
1646
@@ -300,7 +300,7 @@
1647
300
        Saves the bibles meta data
300
        Saves the bibles meta data
1648
301
        """
301
        """
1649
302
        log.debug(u'save_meta data %s,%s, %s,%s',
302
        log.debug(u'save_meta data %s,%s, %s,%s',
1651
303
            bible,  version, copyright, permissions)
303
            bible, version, copyright, permissions)
1652
304
        self.bible_db_cache[bible].save_meta(u'Version', version)
304
        self.bible_db_cache[bible].save_meta(u'Version', version)
1653
305
        self.bible_db_cache[bible].save_meta(u'Copyright', copyright)
305
        self.bible_db_cache[bible].save_meta(u'Copyright', copyright)
1654
306
        self.bible_db_cache[bible].save_meta(u'Permissions', permissions)
306
        self.bible_db_cache[bible].save_meta(u'Permissions', permissions)
1655
@@ -309,7 +309,7 @@
1656
309
        """
309
        """
1657
310
        Returns the meta data for a given key
310
        Returns the meta data for a given key
1658
311
        """
311
        """
1660
312
        log.debug(u'get_meta %s,%s', bible,  key)
312
        log.debug(u'get_meta %s,%s', bible, key)
1661
313
        return self.bible_db_cache[bible].get_meta(key)
313
        return self.bible_db_cache[bible].get_meta(key)
1662
314
314
1663
315
    def get_verse_text(self, bible, bookname, schapter, echapter, sverse,
315
    def get_verse_text(self, bible, bookname, schapter, echapter, sverse,
1664
@@ -414,7 +414,7 @@
1665
414
        """
414
        """
1666
415
        Check cache to see if new bible
415
        Check cache to see if new bible
1667
416
        """
416
        """
1669
417
        for b ,  o in self.bible_db_cache.iteritems():
417
        for b , o in self.bible_db_cache.iteritems():
1670
418
            log.debug(u'Bible from cache in is_new_bible %s', b )
418
            log.debug(u'Bible from cache in is_new_bible %s', b )
1671
419
            if b == name :
419
            if b == name :
1672
420
                return False
420
                return False
1673
421
421
1674
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
1675
--- openlp/plugins/bibles/lib/mediaitem.py	2009-09-16 10:50:13 +0000
1676
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-09-21 17:56:36 +0000
1677
@@ -28,7 +28,7 @@
1678
28
from PyQt4 import QtCore, QtGui
28
from PyQt4 import QtCore, QtGui
1679
29
29
1680
30
from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
30
from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
1682
31
    Receiver, contextMenuAction, contextMenuSeparator,  BaseListWithDnD
31
    Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD
1683
32
from openlp.plugins.bibles.forms import BibleImportForm
32
from openlp.plugins.bibles.forms import BibleImportForm
1684
33
from openlp.plugins.bibles.lib.manager import BibleMode
33
from openlp.plugins.bibles.lib.manager import BibleMode
1685
34
34
1686
@@ -329,10 +329,10 @@
1687
329
        log.debug(u'Advanced Search Button pressed')
329
        log.debug(u'Advanced Search Button pressed')
1688
330
        bible = unicode(self.AdvancedVersionComboBox.currentText())
330
        bible = unicode(self.AdvancedVersionComboBox.currentText())
1689
331
        book = unicode(self.AdvancedBookComboBox.currentText())
331
        book = unicode(self.AdvancedBookComboBox.currentText())
1694
332
        chapter_from =  int(self.AdvancedFromChapter.currentText())
332
        chapter_from = int(self.AdvancedFromChapter.currentText())
1695
333
        chapter_to =  int(self.AdvancedToChapter.currentText())
333
        chapter_to = int(self.AdvancedToChapter.currentText())
1696
334
        verse_from =  int(self.AdvancedFromVerse.currentText())
334
        verse_from = int(self.AdvancedFromVerse.currentText())
1697
335
        verse_to =  int(self.AdvancedToVerse.currentText())
335
        verse_to = int(self.AdvancedToVerse.currentText())
1698
336
        self.search_results = self.parent.biblemanager.get_verse_text(
336
        self.search_results = self.parent.biblemanager.get_verse_text(
1699
337
            bible, book, chapter_from, chapter_to, verse_from, verse_to)
337
            bible, book, chapter_from, chapter_to, verse_from, verse_to)
1700
338
        if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
338
        if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
1701
@@ -374,7 +374,7 @@
1702
374
        raw_footer = []
374
        raw_footer = []
1703
375
        bible_text = u''
375
        bible_text = u''
1704
376
        for item in items:
376
        for item in items:
1706
377
            bitem =  self.ListView.item(item.row())
377
            bitem = self.ListView.item(item.row())
1707
378
            text = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
378
            text = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
1708
379
            verse = text[:text.find(u'(')]
379
            verse = text[:text.find(u'(')]
1709
380
            bible = text[text.find(u'(') + 1:-1]
380
            bible = text[text.find(u'(') + 1:-1]
1710
@@ -457,13 +457,13 @@
1711
457
        self.adjustComboBox(1, self.verses, self.AdvancedToVerse)
457
        self.adjustComboBox(1, self.verses, self.AdvancedToVerse)
1712
458
458
1713
459
    def adjustComboBox(self, frm, to , combo):
459
    def adjustComboBox(self, frm, to , combo):
1715
460
        log.debug(u'adjustComboBox %s , %s , %s', combo, frm,  to)
460
        log.debug(u'adjustComboBox %s , %s , %s', combo, frm, to)
1716
461
        combo.clear()
461
        combo.clear()
1717
462
        for i in range(int(frm), int(to) + 1):
462
        for i in range(int(frm), int(to) + 1):
1718
463
            combo.addItem(unicode(i))
463
            combo.addItem(unicode(i))
1719
464
464
1720
465
    def displayResults(self, bible):
465
    def displayResults(self, bible):
1722
466
        for count,  verse  in enumerate(self.search_results):
466
        for count, verse  in enumerate(self.search_results):
1723
467
            bible_text = u' %s %d:%d (%s)' % (verse.book.name,
467
            bible_text = u' %s %d:%d (%s)' % (verse.book.name,
1724
468
                verse.chapter, verse.verse, bible)
468
                verse.chapter, verse.verse, bible)
1725
469
            bible_verse = QtGui.QListWidgetItem(bible_text)
469
            bible_verse = QtGui.QListWidgetItem(bible_text)
1726
@@ -474,7 +474,7 @@
1727
474
            if cr is not None:
474
            if cr is not None:
1728
475
                cr.setSelected(True)
475
                cr.setSelected(True)
1729
476
476
1731
477
    def searchByReference(self, bible,  search):
477
    def searchByReference(self, bible, search):
1732
478
        log.debug(u'searchByReference %s ,%s', bible, search)
478
        log.debug(u'searchByReference %s ,%s', bible, search)
1733
479
        book = u''
479
        book = u''
1734
480
        start_chapter = u''
480
        start_chapter = u''
1735
@@ -529,7 +529,7 @@
1736
529
                sp1 = sp[1].split(u':')
529
                sp1 = sp[1].split(u':')
1737
530
                if len(sp1) == 1:
530
                if len(sp1) == 1:
1738
531
                    end_chapter = start_chapter
531
                    end_chapter = start_chapter
1740
532
                    end_verse =  sp1[0]
532
                    end_verse = sp1[0]
1741
533
                else:
533
                else:
1742
534
                    end_chapter = sp1[0]
534
                    end_chapter = sp1[0]
1743
535
                    end_verse = sp1[1]
535
                    end_verse = sp1[1]
1744
536
536
1745
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
1746
--- openlp/plugins/custom/forms/editcustomform.py	2009-09-12 18:27:17 +0000
1747
+++ openlp/plugins/custom/forms/editcustomform.py	2009-09-21 19:26:10 +0000
1748
@@ -115,7 +115,7 @@
1749
115
            self.ThemeComboBox.setCurrentIndex(0)
115
            self.ThemeComboBox.setCurrentIndex(0)
1750
116
116
1751
117
    def accept(self):
117
    def accept(self):
1753
118
        valid ,  message = self._validate()
118
        valid , message = self._validate()
1754
119
        if not valid:
119
        if not valid:
1755
120
            QtGui.QMessageBox.critical(self,
120
            QtGui.QMessageBox.critical(self,
1756
121
            translate(u'customEditDialog', u'Error'), message,
121
            translate(u'customEditDialog', u'Error'), message,
1757
@@ -126,7 +126,9 @@
1758
126
        sxml.add_lyrics_to_song()
126
        sxml.add_lyrics_to_song()
1759
127
        count = 1
127
        count = 1
1760
128
        for i in range (0, self.VerseListView.count()):
128
        for i in range (0, self.VerseListView.count()):
1762
129
            sxml.add_verse_to_lyrics(u'custom', unicode(count),  unicode(self.VerseListView.item(i).text()))
129
            sxml.add_verse_to_lyrics(
1763
130
                u'custom', unicode(count),
1764
131
                unicode(self.VerseListView.item(i).text()))
1765
130
            count += 1
132
            count += 1
1766
131
        self.customSlide.title = unicode(self.TitleEdit.displayText())
133
        self.customSlide.title = unicode(self.TitleEdit.displayText())
1767
132
        self.customSlide.text = unicode(sxml.extract_xml())
134
        self.customSlide.text = unicode(sxml.extract_xml())
1768
@@ -201,10 +203,12 @@
1769
201
            for row in unicode(self.VerseTextEdit.toPlainText()).split(u'---'):
203
            for row in unicode(self.VerseTextEdit.toPlainText()).split(u'---'):
1770
202
                self.VerseListView.addItem(row)
204
                self.VerseListView.addItem(row)
1771
203
        else:
205
        else:
1773
204
            self.VerseListView.currentItem().setText(self.VerseTextEdit.toPlainText())
206
            self.VerseListView.currentItem().setText(
1774
207
                self.VerseTextEdit.toPlainText())
1775
205
            #number of lines has change
208
            #number of lines has change
1778
206
            if len(self.beforeText.split(u'\n')) != len(self.VerseTextEdit.toPlainText().split(u'\n')):
209
            if len(self.beforeText.split(u'\n')) != \
1779
207
                tempList = {}
210
                len(self.VerseTextEdit.toPlainText().split(u'\n')):
1780
211
                    tempList = {}
1781
208
                for row in range(0, self.VerseListView.count()):
212
                for row in range(0, self.VerseListView.count()):
1782
209
                    tempList[row] = self.VerseListView.item(row).text()
213
                    tempList[row] = self.VerseListView.item(row).text()
1783
210
                self.VerseListView.clear()
214
                self.VerseListView.clear()
1784
@@ -227,9 +231,11 @@
1785
227
        message = u''
231
        message = u''
1786
228
        if len(self.TitleEdit.displayText()) == 0:
232
        if len(self.TitleEdit.displayText()) == 0:
1787
229
            valid = False
233
            valid = False
1789
230
            message = translate(u'customEditDialog', u'You need to enter a title \n')
234
            message = translate(
1790
235
                u'customEditDialog', u'You need to enter a title \n')
1791
231
        # must have 1 slide
236
        # must have 1 slide
1792
232
        if self.VerseListView.count() == 0:
237
        if self.VerseListView.count() == 0:
1793
233
            valid = False
238
            valid = False
1796
234
            message += translate(u'customEditDialog', u'You need to enter a slide \n')
239
            message += translate(
1797
235
        return valid,  message
240
                u'customEditDialog', u'You need to enter a slide \n')
1798
241
        return valid, message
1799
236
242
1800
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
1801
--- openlp/plugins/custom/lib/mediaitem.py	2009-09-12 18:27:17 +0000
1802
+++ openlp/plugins/custom/lib/mediaitem.py	2009-09-21 17:56:36 +0000
1803
@@ -26,7 +26,7 @@
1804
26
26
1805
27
from PyQt4 import QtCore, QtGui
27
from PyQt4 import QtCore, QtGui
1806
28
28
1808
29
from openlp.core.lib import MediaManagerItem,  SongXMLParser,  ServiceItem, \
29
from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \
1809
30
    translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
30
    translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
1810
31
31
1811
32
class CustomListView(BaseListWithDnD):
32
class CustomListView(BaseListWithDnD):
1812
@@ -65,7 +65,8 @@
1813
65
        self.ListView.clear()
65
        self.ListView.clear()
1814
66
        for CustomSlide in list:
66
        for CustomSlide in list:
1815
67
            custom_name = QtGui.QListWidgetItem(CustomSlide.title)
67
            custom_name = QtGui.QListWidgetItem(CustomSlide.title)
1817
68
            custom_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id))
68
            custom_name.setData(
1818
69
                QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id))
1819
69
            self.ListView.addItem(custom_name)
70
            self.ListView.addItem(custom_name)
1820
70
71
1821
71
    def onNewClick(self):
72
    def onNewClick(self):
1822
72
73
1823
=== modified file 'openlp/plugins/images/imageplugin.py'
1824
--- openlp/plugins/images/imageplugin.py	2009-09-08 19:58:05 +0000
1825
+++ openlp/plugins/images/imageplugin.py	2009-09-21 17:56:36 +0000
1826
@@ -27,7 +27,7 @@
1827
27
from PyQt4 import QtCore, QtGui
27
from PyQt4 import QtCore, QtGui
1828
28
28
1829
29
from openlp.core.lib import Plugin
29
from openlp.core.lib import Plugin
1831
30
from openlp.plugins.images.lib import ImageMediaItem,  ImageTab
30
from openlp.plugins.images.lib import ImageMediaItem, ImageTab
1832
31
31
1833
32
class ImagePlugin(Plugin):
32
class ImagePlugin(Plugin):
1834
33
    global log
33
    global log
1835
34
34
1836
=== modified file 'openlp/plugins/images/lib/imagetab.py'
1837
--- openlp/plugins/images/lib/imagetab.py	2009-09-08 19:58:05 +0000
1838
+++ openlp/plugins/images/lib/imagetab.py	2009-09-21 17:56:36 +0000
1839
@@ -24,7 +24,7 @@
1840
24
24
1841
25
from PyQt4 import QtCore, QtGui
25
from PyQt4 import QtCore, QtGui
1842
26
26
1844
27
from openlp.core.lib import SettingsTab,  str_to_bool,  translate,  Receiver
27
from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
1845
28
28
1846
29
class ImageTab(SettingsTab):
29
class ImageTab(SettingsTab):
1847
30
    """
30
    """
1848
@@ -53,7 +53,8 @@
1849
53
        self.TimeoutSpacer = QtGui.QSpacerItem(147, 20,
53
        self.TimeoutSpacer = QtGui.QSpacerItem(147, 20,
1850
54
            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
54
            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1851
55
        self.TimeoutLayout.addItem(self.TimeoutSpacer)
55
        self.TimeoutLayout.addItem(self.TimeoutSpacer)
1853
56
        self.ImageLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox)
56
        self.ImageLayout.setWidget(
1854
57
            0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox)
1855
57
        # Signals and slots
58
        # Signals and slots
1856
58
        QtCore.QObject.connect(self.TimeoutSpinBox,
59
        QtCore.QObject.connect(self.TimeoutSpinBox,
1857
59
            QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
60
            QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
1858
@@ -71,7 +72,7 @@
1859
71
72
1860
72
    def save(self):
73
    def save(self):
1861
73
        self.config.set_config(u'loop delay', self.loop_delay)
74
        self.config.set_config(u'loop delay', self.loop_delay)
1863
74
        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
75
        Receiver().send_message(u'update_spin_delay', self.loop_delay )
1864
75
76
1865
76
    def postSetUp(self):
77
    def postSetUp(self):
1867
77
        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
78
        Receiver().send_message(u'update_spin_delay', self.loop_delay )
1868
78
79
1869
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
1870
--- openlp/plugins/images/lib/mediaitem.py	2009-09-12 18:27:17 +0000
1871
+++ openlp/plugins/images/lib/mediaitem.py	2009-09-21 17:56:36 +0000
1872
@@ -26,7 +26,8 @@
1873
26
import os
26
import os
1874
27
27
1875
28
from PyQt4 import QtCore, QtGui
28
from PyQt4 import QtCore, QtGui
1877
29
from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD,  buildIcon
29
from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1878
30
    BaseListWithDnD, buildIcon
1879
30
31
1880
31
# We have to explicitly create separate classes for each plugin
32
# We have to explicitly create separate classes for each plugin
1881
32
# in order for DnD to the Service manager to work correctly.
33
# in order for DnD to the Service manager to work correctly.
1882
@@ -61,9 +62,11 @@
1883
61
        MediaManagerItem.__init__(self, parent, icon, title)
62
        MediaManagerItem.__init__(self, parent, icon, title)
1884
62
63
1885
63
    def initialise(self):
64
    def initialise(self):
1887
64
        self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
65
        self.ListView.setSelectionMode(
1888
66
            QtGui.QAbstractItemView.ExtendedSelection)
1889
65
        self.ListView.setIconSize(QtCore.QSize(88,50))
67
        self.ListView.setIconSize(QtCore.QSize(88,50))
1891
66
        self.servicePath = os.path.join(self.parent.config.get_data_path(), u'.thumbnails')
68
        self.servicePath = os.path.join(
1892
69
            self.parent.config.get_data_path(), u'.thumbnails')
1893
67
        if os.path.exists(self.servicePath) == False:
70
        if os.path.exists(self.servicePath) == False:
1894
68
            os.mkdir(self.servicePath)
71
            os.mkdir(self.servicePath)
1895
69
        self.loadList(self.parent.config.load_list(self.ConfigSection))
72
        self.loadList(self.parent.config.load_list(self.ConfigSection))
1896
@@ -103,9 +106,9 @@
1897
103
            return False
106
            return False
1898
104
        service_item.title = u'Image(s)'
107
        service_item.title = u'Image(s)'
1899
105
        for item in items:
108
        for item in items:
1901
106
            bitem =  self.ListView.item(item.row())
109
            bitem = self.ListView.item(item.row())
1902
107
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
110
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
1903
108
            frame = QtGui.QImage(unicode(filename))
111
            frame = QtGui.QImage(unicode(filename))
1904
109
            (path, name) = os.path.split(filename)
112
            (path, name) = os.path.split(filename)
1906
110
            service_item.add_from_image(path,  name, frame)
113
            service_item.add_from_image(path, name, frame)
1907
111
        return True
114
        return True
1908
112
115
1909
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
1910
--- openlp/plugins/media/lib/mediaitem.py	2009-09-15 21:59:20 +0000
1911
+++ openlp/plugins/media/lib/mediaitem.py	2009-09-21 17:56:36 +0000
1912
@@ -81,7 +81,7 @@
1913
81
            filename = self.ListData.getFilename(index)
81
            filename = self.ListData.getFilename(index)
1914
82
            frame = QtGui.QImage(unicode(filename))
82
            frame = QtGui.QImage(unicode(filename))
1915
83
            (path, name) = os.path.split(filename)
83
            (path, name) = os.path.split(filename)
1917
84
            service_item.add_from_image(path,  name, frame)
84
            service_item.add_from_image(path, name, frame)
1918
85
        return True
85
        return True
1919
86
86
1920
87
    def onPreviewClick(self):
87
    def onPreviewClick(self):
1921
88
88
1922
=== modified file 'openlp/plugins/media/lib/mediatab.py'
1923
--- openlp/plugins/media/lib/mediatab.py	2009-09-08 19:58:05 +0000
1924
+++ openlp/plugins/media/lib/mediatab.py	2009-09-21 17:56:36 +0000
1925
@@ -24,7 +24,7 @@
1926
24
24
1927
25
from PyQt4 import QtCore, QtGui
25
from PyQt4 import QtCore, QtGui
1928
26
26
1930
27
from openlp.core.lib import SettingsTab,  str_to_bool,  translate
27
from openlp.core.lib import SettingsTab, str_to_bool, translate
1931
28
28
1932
29
class MediaTab(SettingsTab):
29
class MediaTab(SettingsTab):
1933
30
    """
30
    """
1934
@@ -50,14 +50,16 @@
1935
50
        self.UseVMRLabel.setObjectName(u'UseVMRLabel')
50
        self.UseVMRLabel.setObjectName(u'UseVMRLabel')
1936
51
        self.MediaModeLayout.addWidget(self.UseVMRLabel)
51
        self.MediaModeLayout.addWidget(self.UseVMRLabel)
1937
52
52
1939
53
        self.MediaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox)
53
        self.MediaLayout.setWidget(
1940
54
            0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox)
1941
54
        # Signals and slots
55
        # Signals and slots
1942
55
        QtCore.QObject.connect(self.UseVMRCheckBox,
56
        QtCore.QObject.connect(self.UseVMRCheckBox,
1943
56
            QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged)
57
            QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged)
1944
57
58
1945
58
    def retranslateUi(self):
59
    def retranslateUi(self):
1946
59
        self.MediaModeGroupBox.setTitle(translate(u'MediaTab', u'Media Mode'))
60
        self.MediaModeGroupBox.setTitle(translate(u'MediaTab', u'Media Mode'))
1948
60
        self.UseVMRCheckBox.setText(translate(u'MediaTab', u'Use Video Mode Rendering'))
61
        self.UseVMRCheckBox.setText(
1949
62
            translate(u'MediaTab', u'Use Video Mode Rendering'))
1950
61
        self.UseVMRLabel.setText(translate(u'MediaTab', u'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">\n'
63
        self.UseVMRLabel.setText(translate(u'MediaTab', u'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">\n'
1951
62
            u'<html><head><meta name="qrichtext" content="1" /><style type="text/css">\n'
64
            u'<html><head><meta name="qrichtext" content="1" /><style type="text/css">\n'
1952
63
            u'p, li { white-space: pre-wrap; }\n'
65
            u'p, li { white-space: pre-wrap; }\n'
1953
@@ -72,7 +74,8 @@
1954
72
            self.use_vmr_mode = True
74
            self.use_vmr_mode = True
1955
73
75
1956
74
    def load(self):
76
    def load(self):
1958
75
        self.use_vmr_mode = str_to_bool(self.config.get_config(u'use mode layout', u'False'))
77
        self.use_vmr_mode = str_to_bool(
1959
78
            self.config.get_config(u'use mode layout', u'False'))
1960
76
        if self.use_vmr_mode :
79
        if self.use_vmr_mode :
1961
77
            self.UseVMRCheckBox.setChecked(True)
80
            self.UseVMRCheckBox.setChecked(True)
1962
78
81
1963
79
82
1964
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
1965
--- openlp/plugins/presentations/lib/impresscontroller.py	2009-09-18 16:06:25 +0000
1966
+++ openlp/plugins/presentations/lib/impresscontroller.py	2009-09-21 17:56:36 +0000
1967
@@ -27,7 +27,7 @@
1968
27
# http://nxsy.org/comparing-documents-with-openoffice-and-python
27
# http://nxsy.org/comparing-documents-with-openoffice-and-python
1969
28
28
1970
29
import logging
29
import logging
1972
30
import os ,  subprocess
30
import os , subprocess
1973
31
import time
31
import time
1974
32
import sys
32
import sys
1975
33
33
1976
34
34
1977
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
1978
--- openlp/plugins/presentations/lib/mediaitem.py	2009-09-12 18:27:17 +0000
1979
+++ openlp/plugins/presentations/lib/mediaitem.py	2009-09-21 17:56:36 +0000
1980
@@ -26,7 +26,8 @@
1981
26
import os
26
import os
1982
27
27
1983
28
from PyQt4 import QtCore, QtGui
28
from PyQt4 import QtCore, QtGui
1985
29
from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD
29
from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1986
30
    BaseListWithDnD
1987
30
from openlp.plugins.presentations.lib import MessageListener
31
from openlp.plugins.presentations.lib import MessageListener
1988
31
32
1989
32
# We have to explicitly create separate classes for each plugin
33
# We have to explicitly create separate classes for each plugin
1990
@@ -64,10 +65,12 @@
1991
64
65
1992
65
    def addEndHeaderBar(self):
66
    def addEndHeaderBar(self):
1993
66
        self.PresentationWidget = QtGui.QWidget(self)
67
        self.PresentationWidget = QtGui.QWidget(self)
1995
67
        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
68
        sizePolicy = QtGui.QSizePolicy(
1996
69
            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
1997
68
        sizePolicy.setHorizontalStretch(0)
70
        sizePolicy.setHorizontalStretch(0)
1998
69
        sizePolicy.setVerticalStretch(0)
71
        sizePolicy.setVerticalStretch(0)
2000
70
        sizePolicy.setHeightForWidth(self.PresentationWidget.sizePolicy().hasHeightForWidth())
72
        sizePolicy.setHeightForWidth(
2001
73
            self.PresentationWidget.sizePolicy().hasHeightForWidth())
2002
71
        self.PresentationWidget.setSizePolicy(sizePolicy)
74
        self.PresentationWidget.setSizePolicy(sizePolicy)
2003
72
        self.PresentationWidget.setObjectName(u'PresentationWidget')
75
        self.PresentationWidget.setObjectName(u'PresentationWidget')
2004
73
        self.DisplayLayout = QtGui.QGridLayout(self.PresentationWidget)
76
        self.DisplayLayout = QtGui.QGridLayout(self.PresentationWidget)
2005
@@ -78,7 +81,8 @@
2006
78
        self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget)
81
        self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget)
2007
79
        self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel')
82
        self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel')
2008
80
        self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1)
83
        self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1)
2010
81
        self.DisplayTypeLabel.setText(translate(u'PresentationMediaItem', u'Present using:'))
84
        self.DisplayTypeLabel.setText(
2011
85
            translate(u'PresentationMediaItem', u'Present using:'))
2012
82
        # Add the Presentation widget to the page layout
86
        # Add the Presentation widget to the page layout
2013
83
        self.PageLayout.addWidget(self.PresentationWidget)
87
        self.PageLayout.addWidget(self.PresentationWidget)
2014
84
88
2015
@@ -102,7 +106,8 @@
2016
102
            item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
106
            item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
2017
103
            row = self.ListView.row(item)
107
            row = self.ListView.row(item)
2018
104
            self.ListView.takeItem(row)
108
            self.ListView.takeItem(row)
2020
105
            self.parent.config.set_list(self.ConfigSection, self.ListData.getFileList())
109
            self.parent.config.set_list(
2021
110
                self.ConfigSection, self.ListData.getFileList())
2022
106
111
2023
107
    def generateSlideData(self, service_item):
112
    def generateSlideData(self, service_item):
2024
108
        items = self.ListView.selectedIndexes()
113
        items = self.ListView.selectedIndexes()
2025
@@ -111,8 +116,8 @@
2026
111
        service_item.title = unicode(self.DisplayTypeComboBox.currentText())
116
        service_item.title = unicode(self.DisplayTypeComboBox.currentText())
2027
112
        service_item.shortname = unicode(self.DisplayTypeComboBox.currentText())
117
        service_item.shortname = unicode(self.DisplayTypeComboBox.currentText())
2028
113
        for item in items:
118
        for item in items:
2030
114
            bitem =  self.ListView.item(item.row())
119
            bitem = self.ListView.item(item.row())
2031
115
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
120
            filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
2032
116
            (path, name) = os.path.split(filename)
121
            (path, name) = os.path.split(filename)
2034
117
            service_item.add_from_command(path,  name)
122
            service_item.add_from_command(path, name)
2035
118
        return True
123
        return True
2036
119
124
2037
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
2038
--- openlp/plugins/presentations/lib/messagelistener.py	2009-09-18 06:07:10 +0000
2039
+++ openlp/plugins/presentations/lib/messagelistener.py	2009-09-21 17:56:36 +0000
2040
@@ -26,8 +26,8 @@
2041
26
26
2042
27
class MessageListener(object):
27
class MessageListener(object):
2043
28
    """
28
    """
2046
29
    This is the Presentation listener who acts on events from the slide controller
29
    This is the Presentation listener who acts on events from the slide
2047
30
    and passes the messages on the the correct presentation handlers
30
    controller and passes the messages on the the correct presentation handlers
2048
31
    """
31
    """
2049
32
    global log
32
    global log
2050
33
    log=logging.getLogger(u'MessageListener')
33
    log=logging.getLogger(u'MessageListener')
2051
@@ -55,7 +55,7 @@
2052
55
        Start of new presentation
55
        Start of new presentation
2053
56
        Save the handler as any new presentations start here
56
        Save the handler as any new presentations start here
2054
57
        """
57
        """
2056
58
        self.handler, file =  self.decodeMessage(message)
58
        self.handler, file = self.decodeMessage(message)
2057
59
        self.controllers[self.handler].loadPresentation(file)
59
        self.controllers[self.handler].loadPresentation(file)
2058
60
60
2059
61
    def next(self, message):
61
    def next(self, message):
2060
62
62
2061
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
2062
--- openlp/plugins/presentations/lib/presentationtab.py	2009-09-12 17:24:16 +0000
2063
+++ openlp/plugins/presentations/lib/presentationtab.py	2009-09-21 19:26:10 +0000
2064
@@ -24,14 +24,15 @@
2065
24
24
2066
25
from PyQt4 import Qt, QtCore, QtGui
25
from PyQt4 import Qt, QtCore, QtGui
2067
26
26
2069
27
from openlp.core.lib import SettingsTab, translate,  str_to_bool
27
from openlp.core.lib import SettingsTab, translate, str_to_bool
2070
28
28
2071
29
class PresentationTab(SettingsTab):
29
class PresentationTab(SettingsTab):
2072
30
    """
30
    """
2073
31
    PresentationsTab is the Presentations settings tab in the settings dialog.
31
    PresentationsTab is the Presentations settings tab in the settings dialog.
2074
32
    """
32
    """
2075
33
    def __init__(self):
33
    def __init__(self):
2077
34
        SettingsTab.__init__(self, translate(u'PresentationTab', u'Presentation'), u'Presentations')
34
        SettingsTab.__init__(self,
2078
35
            translate(u'PresentationTab', u'Presentation'), u'Presentations')
2079
35
36
2080
36
    def setupUi(self):
37
    def setupUi(self):
2081
37
        self.setObjectName(u'PresentationTab')
38
        self.setObjectName(u'PresentationTab')
2082
@@ -41,7 +42,8 @@
2083
41
        self.PresentationLayout.setObjectName(u'PresentationLayout')
42
        self.PresentationLayout.setObjectName(u'PresentationLayout')
2084
42
        self.PresentationLeftWidget = QtGui.QWidget(self)
43
        self.PresentationLeftWidget = QtGui.QWidget(self)
2085
43
        self.PresentationLeftWidget.setObjectName(u'PresentationLeftWidget')
44
        self.PresentationLeftWidget.setObjectName(u'PresentationLeftWidget')
2087
44
        self.PresentationLeftLayout = QtGui.QVBoxLayout(self.PresentationLeftWidget)
45
        self.PresentationLeftLayout = QtGui.QVBoxLayout(
2088
46
            self.PresentationLeftWidget)
2089
45
        self.PresentationLeftLayout.setObjectName(u'PresentationLeftLayout')
47
        self.PresentationLeftLayout.setObjectName(u'PresentationLeftLayout')
2090
46
        self.PresentationLeftLayout.setSpacing(8)
48
        self.PresentationLeftLayout.setSpacing(8)
2091
47
        self.PresentationLeftLayout.setMargin(0)
49
        self.PresentationLeftLayout.setMargin(0)
2092
@@ -60,17 +62,20 @@
2093
60
        self.PowerpointCheckBox.setTristate(False)
62
        self.PowerpointCheckBox.setTristate(False)
2094
61
        self.PowerpointCheckBox.setObjectName(u'PowerpointCheckBox')
63
        self.PowerpointCheckBox.setObjectName(u'PowerpointCheckBox')
2095
62
        self.VerseDisplayLayout.addWidget(self.PowerpointCheckBox, 0, 0, 1, 1)
64
        self.VerseDisplayLayout.addWidget(self.PowerpointCheckBox, 0, 0, 1, 1)
2097
63
        self.PowerpointViewerCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
65
        self.PowerpointViewerCheckBox = QtGui.QCheckBox(
2098
66
            self.VerseDisplayGroupBox)
2099
64
        self.PowerpointViewerCheckBox.setTristate(False)
67
        self.PowerpointViewerCheckBox.setTristate(False)
2100
65
        self.PowerpointViewerCheckBox.setObjectName(u'PowerpointViewerCheckBox')
68
        self.PowerpointViewerCheckBox.setObjectName(u'PowerpointViewerCheckBox')
2102
66
        self.VerseDisplayLayout.addWidget(self.PowerpointViewerCheckBox, 1, 0, 1, 1)
69
        self.VerseDisplayLayout.addWidget(
2103
70
            self.PowerpointViewerCheckBox, 1, 0, 1, 1)
2104
67
        self.ImpressCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
71
        self.ImpressCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
2105
68
        self.ImpressCheckBox.setTristate(False)
72
        self.ImpressCheckBox.setTristate(False)
2106
69
        self.ImpressCheckBox.setObjectName(u'ImpressCheckBox')
73
        self.ImpressCheckBox.setObjectName(u'ImpressCheckBox')
2107
70
        self.VerseDisplayLayout.addWidget(self.ImpressCheckBox, 2, 0, 1, 1)
74
        self.VerseDisplayLayout.addWidget(self.ImpressCheckBox, 2, 0, 1, 1)
2108
71
        self.PresentationThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
75
        self.PresentationThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
2109
72
        self.PresentationThemeWidget.setObjectName(u'PresentationThemeWidget')
76
        self.PresentationThemeWidget.setObjectName(u'PresentationThemeWidget')
2111
73
        self.PresentationThemeLayout = QtGui.QHBoxLayout(self.PresentationThemeWidget)
77
        self.PresentationThemeLayout = QtGui.QHBoxLayout(
2112
78
            self.PresentationThemeWidget)
2113
74
        self.PresentationThemeLayout.setSpacing(8)
79
        self.PresentationThemeLayout.setSpacing(8)
2114
75
        self.PresentationThemeLayout.setMargin(0)
80
        self.PresentationThemeLayout.setMargin(0)
2115
76
        self.PresentationThemeLayout.setObjectName(u'PresentationThemeLayout')
81
        self.PresentationThemeLayout.setObjectName(u'PresentationThemeLayout')
2116
@@ -81,7 +86,8 @@
2117
81
        self.PresentationLayout.addWidget(self.PresentationLeftWidget)
86
        self.PresentationLayout.addWidget(self.PresentationLeftWidget)
2118
82
        self.PresentationRightWidget = QtGui.QWidget(self)
87
        self.PresentationRightWidget = QtGui.QWidget(self)
2119
83
        self.PresentationRightWidget.setObjectName(u'PresentationRightWidget')
88
        self.PresentationRightWidget.setObjectName(u'PresentationRightWidget')
2121
84
        self.PresentationRightLayout = QtGui.QVBoxLayout(self.PresentationRightWidget)
89
        self.PresentationRightLayout = QtGui.QVBoxLayout(
2122
90
            self.PresentationRightWidget)
2123
85
        self.PresentationRightLayout.setObjectName(u'PresentationRightLayout')
91
        self.PresentationRightLayout.setObjectName(u'PresentationRightLayout')
2124
86
        self.PresentationRightLayout.setSpacing(8)
92
        self.PresentationRightLayout.setSpacing(8)
2125
87
        self.PresentationRightLayout.setMargin(0)
93
        self.PresentationRightLayout.setMargin(0)
2126
@@ -91,16 +97,26 @@
2127
91
        self.PresentationLayout.addWidget(self.PresentationRightWidget)
97
        self.PresentationLayout.addWidget(self.PresentationRightWidget)
2128
92
98
2129
93
    def retranslateUi(self):
99
    def retranslateUi(self):
2133
94
        self.PowerpointCheckBox.setText(translate(u'PresentationTab', 'Powerpoint available:'))
100
        self.PowerpointCheckBox.setText(
2134
95
        self.PowerpointViewerCheckBox.setText(translate(u'PresentationTab', 'PowerpointViewer available:'))
101
            translate(u'PresentationTab', 'Powerpoint available:'))
2135
96
        self.ImpressCheckBox.setText(translate(u'PresentationTab', 'Impress available:'))
102
        self.PowerpointViewerCheckBox.setText(
2136
103
            translate(u'PresentationTab', 'PowerpointViewer available:'))
2137
104
        self.ImpressCheckBox.setText(
2138
105
            translate(u'PresentationTab', 'Impress available:'))
2139
97
106
2140
98
    def load(self):
107
    def load(self):
2144
99
        self.PowerpointCheckBox.setChecked(int(self.config.get_config(u'Powerpoint', 0)))
108
        self.PowerpointCheckBox.setChecked(
2145
100
        self.PowerpointViewerCheckBox.setChecked(int(self.config.get_config(u'Powerpoint Viewer', 0)))
109
            int(self.config.get_config(u'Powerpoint', 0)))
2146
101
        self.ImpressCheckBox.setChecked(int(self.config.get_config(u'Impress', 0)))
110
        self.PowerpointViewerCheckBox.setChecked(
2147
111
            int(self.config.get_config(u'Powerpoint Viewer', 0)))
2148
112
        self.ImpressCheckBox.setChecked(
2149
113
            int(self.config.get_config(u'Impress', 0)))
2150
102
114
2151
103
    def save(self):
115
    def save(self):
2155
104
        self.config.set_config(u'Powerpoint', unicode(self.PowerpointCheckBox.checkState()))
116
        self.config.set_config(
2156
105
        self.config.set_config(u'Powerpoint Viewer', unicode(self.PowerpointViewerCheckBox.checkState()))
117
            u'Powerpoint', unicode(self.PowerpointCheckBox.checkState()))
2157
106
        self.config.set_config(u'Impress', unicode(self.ImpressCheckBox.checkState()))
118
        self.config.set_config(
2158
119
            u'Powerpoint Viewer',
2159
120
            unicode(self.PowerpointViewerCheckBox.checkState()))
2160
121
        self.config.set_config(
2161
122
            u'Impress', unicode(self.ImpressCheckBox.checkState()))
2162
107
123
2163
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
2164
--- openlp/plugins/presentations/presentationplugin.py	2009-09-18 16:06:25 +0000
2165
+++ openlp/plugins/presentations/presentationplugin.py	2009-09-21 17:56:36 +0000
2166
@@ -28,7 +28,7 @@
2167
28
28
2168
29
from PyQt4 import QtCore, QtGui
29
from PyQt4 import QtCore, QtGui
2169
30
30
2171
31
from openlp.core.lib import Plugin,  MediaManagerItem
31
from openlp.core.lib import Plugin, MediaManagerItem
2172
32
from openlp.plugins.presentations.lib import PresentationMediaItem, \
32
from openlp.plugins.presentations.lib import PresentationMediaItem, \
2173
33
    PresentationTab, ImpressController
33
    PresentationTab, ImpressController
2174
34
try:
34
try:
2175
35
35
2176
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
2177
--- openlp/plugins/remotes/lib/remotetab.py	2009-09-07 19:00:24 +0000
2178
+++ openlp/plugins/remotes/lib/remotetab.py	2009-09-21 19:26:10 +0000
2179
@@ -20,14 +20,15 @@
2180
20
20
2181
21
from PyQt4 import QtCore, QtGui
21
from PyQt4 import QtCore, QtGui
2182
22
22
2184
23
from openlp.core.lib import SettingsTab,  str_to_bool,  translate
23
from openlp.core.lib import SettingsTab, str_to_bool, translate
2185
24
24
2186
25
class RemoteTab(SettingsTab):
25
class RemoteTab(SettingsTab):
2187
26
    """
26
    """
2188
27
    RemoteTab is the Remotes settings tab in the settings dialog.
27
    RemoteTab is the Remotes settings tab in the settings dialog.
2189
28
    """
28
    """
2190
29
    def __init__(self):
29
    def __init__(self):
2192
30
        SettingsTab.__init__(self, translate(u'RemoteTab', u'Remotes'), u'Remotes')
30
        SettingsTab.__init__(
2193
31
            self, translate(u'RemoteTab', u'Remotes'), u'Remotes')
2194
31
32
2195
32
    def setupUi(self):
33
    def setupUi(self):
2196
33
        self.setObjectName(u'RemoteTab')
34
        self.setObjectName(u'RemoteTab')
2197
@@ -49,18 +50,25 @@
2198
49
        self.WarningLabel = QtGui.QLabel(self.RemoteModeGroupBox)
50
        self.WarningLabel = QtGui.QLabel(self.RemoteModeGroupBox)
2199
50
        self.WarningLabel.setObjectName(u'WarningLabel')
51
        self.WarningLabel.setObjectName(u'WarningLabel')
2200
51
        self.RemoteModeLayout.addWidget(self.WarningLabel)
52
        self.RemoteModeLayout.addWidget(self.WarningLabel)
2202
52
        self.RemoteLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox)
53
        self.RemoteLayout.setWidget(
2203
54
            0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox)
2204
53
55
2205
54
    def retranslateUi(self):
56
    def retranslateUi(self):
2207
55
        self.RemoteModeGroupBox.setTitle(translate(u'RemoteTab', u'Remotes Receiver Port'))
57
        self.RemoteModeGroupBox.setTitle(
2208
58
            translate(u'RemoteTab', u'Remotes Receiver Port'))
2209
56
        self.RemoteActive.setText(translate(u'RemoteTab', 'Remote available:'))
59
        self.RemoteActive.setText(translate(u'RemoteTab', 'Remote available:'))
2211
57
        self.WarningLabel.setText(translate(u'RemoteTab', u'A restart is needed for this change to become effective'))
60
        self.WarningLabel.setText(translate(u'RemoteTab',
2212
61
            u'A restart is needed for this change to become effective'))
2213
58
62
2214
59
    def load(self):
63
    def load(self):
2217
60
        self.RemotePortSpinBox.setValue(int(self.config.get_config(u'remote port', 4316)))
64
        self.RemotePortSpinBox.setValue(
2218
61
        self.RemoteActive.setChecked(int(self.config.get_config(u'startup', 0)))
65
            int(self.config.get_config(u'remote port', 4316)))
2219
66
        self.RemoteActive.setChecked(
2220
67
            int(self.config.get_config(u'startup', 0)))
2221
62
68
2222
63
    def save(self):
69
    def save(self):
2225
64
        self.config.set_config(u'remote port', unicode(self.RemotePortSpinBox.value()))
70
        self.config.set_config(
2226
65
        self.config.set_config(u'startup', unicode(self.RemoteActive.checkState()))
71
            u'remote port', unicode(self.RemotePortSpinBox.value()))
2227
72
        self.config.set_config(
2228
73
            u'startup', unicode(self.RemoteActive.checkState()))
2229
66
74
2230
67
75
2231
=== modified file 'openlp/plugins/remotes/remoteclient-cli.py'
2232
--- openlp/plugins/remotes/remoteclient-cli.py	2009-09-02 01:44:09 +0000
2233
+++ openlp/plugins/remotes/remoteclient-cli.py	2009-09-21 17:56:36 +0000
2234
@@ -33,7 +33,7 @@
2235
33
        print u'Errow thrown ', sys.exc_info()[1]
33
        print u'Errow thrown ', sys.exc_info()[1]
2236
34
34
2237
35
def format_message(options):
35
def format_message(options):
2239
36
    return u'%s:%s' % (options.event,  options.message)
36
    return u'%s:%s' % (options.event, options.message)
2240
37
37
2241
38
def main():
38
def main():
2242
39
    usage = "usage: %prog [options] arg1 arg2"
39
    usage = "usage: %prog [options] arg1 arg2"
2243
40
40
2244
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
2245
--- openlp/plugins/remotes/remoteplugin.py	2009-09-13 07:39:48 +0000
2246
+++ openlp/plugins/remotes/remoteplugin.py	2009-09-21 17:56:36 +0000
2247
@@ -62,12 +62,12 @@
2248
62
    def readData(self):
62
    def readData(self):
2249
63
        log.info(u'Remoted data has arrived')
63
        log.info(u'Remoted data has arrived')
2250
64
        while self.server.hasPendingDatagrams():
64
        while self.server.hasPendingDatagrams():
2252
65
            datagram,  host, port = self.server.readDatagram(
65
            datagram, host, port = self.server.readDatagram(
2253
66
                self.server.pendingDatagramSize())
66
                self.server.pendingDatagramSize())
2254
67
            self.handle_datagram(datagram)
67
            self.handle_datagram(datagram)
2255
68
68
2256
69
    def handle_datagram(self, datagram):
69
    def handle_datagram(self, datagram):
2258
70
        log.info(u'Sending event %s ',  datagram)
70
        log.info(u'Sending event %s ', datagram)
2259
71
        pos = datagram.find(u':')
71
        pos = datagram.find(u':')
2260
72
        event = unicode(datagram[:pos].lower())
72
        event = unicode(datagram[:pos].lower())
2261
73
73
2262
74
74
2263
=== modified file 'openlp/plugins/songs/lib/manager.py'
2264
--- openlp/plugins/songs/lib/manager.py	2009-09-18 11:55:26 +0000
2265
+++ openlp/plugins/songs/lib/manager.py	2009-09-21 17:56:36 +0000
2266
@@ -27,7 +27,7 @@
2267
27
27
2268
28
from sqlalchemy import asc, desc
28
from sqlalchemy import asc, desc
2269
29
from openlp.plugins.songs.lib.models import init_models, metadata, session, \
29
from openlp.plugins.songs.lib.models import init_models, metadata, session, \
2271
30
    engine, songs_table, Song, Author, Topic,  Book
30
    engine, songs_table, Song, Author, Topic, Book
2272
31
31
2273
32
import logging
32
import logging
2274
33
33
2275
34
34
2276
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
2277
--- openlp/plugins/songs/lib/mediaitem.py	2009-09-18 16:06:39 +0000
2278
+++ openlp/plugins/songs/lib/mediaitem.py	2009-09-21 17:56:36 +0000
2279
@@ -27,7 +27,7 @@
2280
27
from PyQt4 import QtCore, QtGui
27
from PyQt4 import QtCore, QtGui
2281
28
28
2282
29
from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
29
from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
2284
30
    SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD,  \
30
    SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \
2285
31
    Receiver
31
    Receiver
2286
32
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
32
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
2287
33
33
2288
@@ -49,7 +49,7 @@
2289
49
        self.PluginTextShort = u'Song'
49
        self.PluginTextShort = u'Song'
2290
50
        self.ConfigSection = u'song'
50
        self.ConfigSection = u'song'
2291
51
        MediaManagerItem.__init__(self, parent, icon, title)
51
        MediaManagerItem.__init__(self, parent, icon, title)
2293
52
        self.edit_song_form = EditSongForm(self.parent.songmanager,  self)
52
        self.edit_song_form = EditSongForm(self.parent.songmanager, self)
2294
53
        self.song_maintenance_form = SongMaintenanceForm(
53
        self.song_maintenance_form = SongMaintenanceForm(
2295
54
            self.parent.songmanager, self)
54
            self.parent.songmanager, self)
2296
55
55
2297
@@ -306,7 +306,7 @@
2298
306
        raw_footer.append(author_list)
306
        raw_footer.append(author_list)
2299
307
        raw_footer.append(song.copyright )
307
        raw_footer.append(song.copyright )
2300
308
        raw_footer.append(unicode(
308
        raw_footer.append(unicode(
2302
309
            translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
309
            translate(u'SongMediaItem', u'CCL Licence: ') + ccl))
2303
310
        service_item.raw_footer = raw_footer
310
        service_item.raw_footer = raw_footer
2304
311
        service_item.audit = [service_item.title, author_audit, ccl]
311
        service_item.audit = [service_item.title, author_audit, ccl]
2305
312
        return True
312
        return True
2306
313
313
2307
=== modified file 'openlp/plugins/songs/lib/songxml.py'
2308
--- openlp/plugins/songs/lib/songxml.py	2009-09-08 19:58:05 +0000
2309
+++ openlp/plugins/songs/lib/songxml.py	2009-09-21 17:56:36 +0000
2310
@@ -71,7 +71,7 @@
2311
71
class _OpenSong(XmlRootClass):
71
class _OpenSong(XmlRootClass):
2312
72
    """Class for import of OpenSogn"""
72
    """Class for import of OpenSogn"""
2313
73
73
2315
74
    def __init__(self,  xmlContent = None):
74
    def __init__(self, xmlContent = None):
2316
75
        """Initialize from given xml content"""
75
        """Initialize from given xml content"""
2317
76
        super(_OpenSong, self).__init__()
76
        super(_OpenSong, self).__init__()
2318
77
        self.from_buffer(xmlContent)
77
        self.from_buffer(xmlContent)
2319
@@ -81,7 +81,7 @@
2320
81
        global _blankOpenSongXml
81
        global _blankOpenSongXml
2321
82
        self._setFromXml(_blankOpenSongXml, 'song')
82
        self._setFromXml(_blankOpenSongXml, 'song')
2322
83
83
2324
84
    def from_buffer(self,  xmlContent):
84
    def from_buffer(self, xmlContent):
2325
85
        """Initialize from buffer(string) with xml content"""
85
        """Initialize from buffer(string) with xml content"""
2326
86
        self._reset()
86
        self._reset()
2327
87
        if xmlContent != None :
87
        if xmlContent != None :
2328
@@ -259,7 +259,7 @@
2329
259
        """Return the songid for the database"""
259
        """Return the songid for the database"""
2330
260
        return self.songid
260
        return self.songid
2331
261
261
2333
262
    def from_opensong_buffer(self,  xmlcontent):
262
    def from_opensong_buffer(self, xmlcontent):
2334
263
        """Initialize from buffer(string) of xml lines in opensong format"""
263
        """Initialize from buffer(string) of xml lines in opensong format"""
2335
264
        self._reset()
264
        self._reset()
2336
265
        opensong = _OpenSong(xmlcontent)
265
        opensong = _OpenSong(xmlcontent)
2337
@@ -275,20 +275,20 @@
2338
275
        self.set_category_array(opensong.get_category_array())
275
        self.set_category_array(opensong.get_category_array())
2339
276
        self.set_lyrics(opensong.get_lyrics())
276
        self.set_lyrics(opensong.get_lyrics())
2340
277
277
2342
278
    def from_opensong_file(self,  xmlfilename):
278
    def from_opensong_file(self, xmlfilename):
2343
279
        """Initialize from file containing xml
279
        """Initialize from file containing xml
2344
280
280
2345
281
        xmlfilename -- path to xml file
281
        xmlfilename -- path to xml file
2346
282
        """
282
        """
2347
283
        lst = []
283
        lst = []
2349
284
        f = open(xmlfilename,  'r')
284
        f = open(xmlfilename, 'r')
2350
285
        for line in f :
285
        for line in f :
2351
286
            lst.append(line)
286
            lst.append(line)
2352
287
        f.close()
287
        f.close()
2353
288
        xml = "".join(lst)
288
        xml = "".join(lst)
2354
289
        self.from_opensong_buffer(xml)
289
        self.from_opensong_buffer(xml)
2355
290
290
2357
291
    def _remove_punctuation(self,  title):
291
    def _remove_punctuation(self, title):
2358
292
        """Remove the puntuation chars from title
292
        """Remove the puntuation chars from title
2359
293
293
2360
294
        chars are: .,:;!?&%#/\@`$'|"^~*-
294
        chars are: .,:;!?&%#/\@`$'|"^~*-
2361
@@ -296,7 +296,7 @@
2362
296
        punctuation = ".,:;!?&%#'\"/\\@`$|^~*-"
296
        punctuation = ".,:;!?&%#'\"/\\@`$|^~*-"
2363
297
        s = title
297
        s = title
2364
298
        for c in punctuation :
298
        for c in punctuation :
2366
299
            s = s.replace(c,  '')
299
            s = s.replace(c, '')
2367
300
        return s
300
        return s
2368
301
301
2369
302
    def set_title(self, title):
302
    def set_title(self, title):
2370
@@ -322,7 +322,8 @@
2371
322
        return self.search_title
322
        return self.search_title
2372
323
323
2373
324
    def from_ccli_text_buffer(self, textList):
324
    def from_ccli_text_buffer(self, textList):
2375
325
        """Create song from a list of texts (strings) - CCLI text format expected
325
        """
2376
326
        Create song from a list of texts (strings) - CCLI text format expected
2377
326
327
2378
327
        textList (list of strings) -- the song
328
        textList (list of strings) -- the song
2379
328
        """
329
        """
2380
@@ -377,13 +378,13 @@
2381
377
        self.set_song_cclino(sCcli)
378
        self.set_song_cclino(sCcli)
2382
378
        self.set_lyrics(lyrics)
379
        self.set_lyrics(lyrics)
2383
379
380
2385
380
    def from_ccli_text_file(self,  textFileName):
381
    def from_ccli_text_file(self, textFileName):
2386
381
        """Create song from a list of texts read from given file
382
        """Create song from a list of texts read from given file
2387
382
383
2388
383
        textFileName -- path to text file
384
        textFileName -- path to text file
2389
384
        """
385
        """
2390
385
        lines = []
386
        lines = []
2392
386
        f = open(textFileName,  'r')
387
        f = open(textFileName, 'r')
2393
387
        for orgline in f:
388
        for orgline in f:
2394
388
            lines.append(orgline.rstrip())
389
            lines.append(orgline.rstrip())
2395
389
        f.close()
390
        f.close()
2396
@@ -424,7 +425,7 @@
2397
424
        """Return copyright info string"""
425
        """Return copyright info string"""
2398
425
        return self._assure_string(self.copyright)
426
        return self._assure_string(self.copyright)
2399
426
427
2401
427
    def set_copyright(self,  copyright):
428
    def set_copyright(self, copyright):
2402
428
        """Set the copyright string"""
429
        """Set the copyright string"""
2403
429
        self.copyright = copyright
430
        self.copyright = copyright
2404
430
431
2405
@@ -432,7 +433,7 @@
2406
432
        """Return the songCclino"""
433
        """Return the songCclino"""
2407
433
        return self._assure_string(self.song_cclino)
434
        return self._assure_string(self.song_cclino)
2408
434
435
2410
435
    def set_song_cclino(self,  song_cclino):
436
    def set_song_cclino(self, song_cclino):
2411
436
        """Set the song_cclino"""
437
        """Set the song_cclino"""
2412
437
        self.song_cclino = song_cclino
438
        self.song_cclino = song_cclino
2413
438
439
2414
@@ -440,7 +441,7 @@
2415
440
        """Return the theme name for the song"""
441
        """Return the theme name for the song"""
2416
441
        return self._assure_string(self.theme)
442
        return self._assure_string(self.theme)
2417
442
443
2419
443
    def set_theme(self,  theme):
444
    def set_theme(self, theme):
2420
444
        """Set the theme name (string)"""
445
        """Set the theme name (string)"""
2421
445
        self.theme = theme
446
        self.theme = theme
2422
446
447
2423
@@ -448,7 +449,7 @@
2424
448
        """Return the song_book (string)"""
449
        """Return the song_book (string)"""
2425
449
        return self._assure_string(self.song_book)
450
        return self._assure_string(self.song_book)
2426
450
451
2428
451
    def set_song_book(self,  song_book):
452
    def set_song_book(self, song_book):
2429
452
        """Set the song_book (string)"""
453
        """Set the song_book (string)"""
2430
453
        self.song_book = song_book
454
        self.song_book = song_book
2431
454
455
2432
@@ -456,7 +457,7 @@
2433
456
        """Return the song_number (string)"""
457
        """Return the song_number (string)"""
2434
457
        return self._assure_string(self.song_number)
458
        return self._assure_string(self.song_number)
2435
458
459
2437
459
    def set_song_number(self,  song_number):
460
    def set_song_number(self, song_number):
2438
460
        """Set the song_number (string)"""
461
        """Set the song_number (string)"""
2439
461
        self.song_number = song_number
462
        self.song_number = song_number
2440
462
463
2441
@@ -464,7 +465,7 @@
2442
464
        """Return the comments (string)"""
465
        """Return the comments (string)"""
2443
465
        return self._assure_string(self.comments)
466
        return self._assure_string(self.comments)
2444
466
467
2446
467
    def set_comments(self,  comments):
468
    def set_comments(self, comments):
2447
468
        """Set the comments (string)"""
469
        """Set the comments (string)"""
2448
469
        self.comments = comments
470
        self.comments = comments
2449
470
471
2450
@@ -472,11 +473,11 @@
2451
472
        """Get the verseOrder (string) - preferably space delimited"""
473
        """Get the verseOrder (string) - preferably space delimited"""
2452
473
        return self._assure_string(self.verse_order)
474
        return self._assure_string(self.verse_order)
2453
474
475
2455
475
    def set_verse_order(self,  verse_order):
476
    def set_verse_order(self, verse_order):
2456
476
        """Set the verse order (string) - space delimited"""
477
        """Set the verse order (string) - space delimited"""
2457
477
        self.verse_order = verse_order
478
        self.verse_order = verse_order
2458
478
479
2460
479
    def get_author_list(self,  asOneString = True):
480
    def get_author_list(self, asOneString = True):
2461
480
        """Return the list of authors as a string
481
        """Return the list of authors as a string
2462
481
482
2463
482
        asOneString
483
        asOneString
2464
@@ -491,7 +492,7 @@
2465
491
            res = self._split_to_list(self.author_list)
492
            res = self._split_to_list(self.author_list)
2466
492
        return res
493
        return res
2467
493
494
2469
494
    def set_author_list(self,  author_list):
495
    def set_author_list(self, author_list):
2470
495
        """Set the author_list
496
        """Set the author_list
2471
496
497
2472
497
        author_list -- a string or list of strings
498
        author_list -- a string or list of strings
2473
@@ -501,7 +502,7 @@
2474
501
        else :
502
        else :
2475
502
            self.author_list = self._list_to_string(author_list)
503
            self.author_list = self._list_to_string(author_list)
2476
503
504
2478
504
    def get_category_array(self,  asOneString = True):
505
    def get_category_array(self, asOneString = True):
2479
505
        """Return the list of categories as a string
506
        """Return the list of categories as a string
2480
506
507
2481
507
        asOneString
508
        asOneString
2482
@@ -516,7 +517,7 @@
2483
516
            res = self._split_to_list(self.category_array)
517
            res = self._split_to_list(self.category_array)
2484
517
        return res
518
        return res
2485
518
519
2487
519
    def set_category_array(self,  category_array):
520
    def set_category_array(self, category_array):
2488
520
        """Set the category_array
521
        """Set the category_array
2489
521
522
2490
522
        category_array -- a string or list of strings
523
        category_array -- a string or list of strings
2491
@@ -530,7 +531,7 @@
2492
530
        """Return the show_title flag (bool)"""
531
        """Return the show_title flag (bool)"""
2493
531
        return self.show_title
532
        return self.show_title
2494
532
533
2496
533
    def set_show_title(self,  show_title):
534
    def set_show_title(self, show_title):
2497
534
        """Set the show_title flag (bool)"""
535
        """Set the show_title flag (bool)"""
2498
535
        self.show_title = show_title
536
        self.show_title = show_title
2499
536
537
2500
@@ -538,7 +539,7 @@
2501
538
        """Return the show_author_list flag"""
539
        """Return the show_author_list flag"""
2502
539
        return self.show_author_list
540
        return self.show_author_list
2503
540
541
2505
541
    def set_show_author_list(self,  show_author_list):
542
    def set_show_author_list(self, show_author_list):
2506
542
        """Set the show_author_list flag (bool)"""
543
        """Set the show_author_list flag (bool)"""
2507
543
        self.show_author_list = show_author_list
544
        self.show_author_list = show_author_list
2508
544
545
2509
@@ -554,7 +555,7 @@
2510
554
        """Return the showSongCclino (string)"""
555
        """Return the showSongCclino (string)"""
2511
555
        return self.show_song_cclino
556
        return self.show_song_cclino
2512
556
557
2514
557
    def set_show_song_cclino(self,  show_song_cclino):
558
    def set_show_song_cclino(self, show_song_cclino):
2515
558
        """Set the show_song_cclino flag (bool)"""
559
        """Set the show_song_cclino flag (bool)"""
2516
559
        self.show_song_cclino = show_song_cclino
560
        self.show_song_cclino = show_song_cclino
2517
560
561
2518
@@ -565,7 +566,7 @@
2519
565
        """
566
        """
2520
566
        return self.lyrics
567
        return self.lyrics
2521
567
568
2523
568
    def set_lyrics(self,  lyrics):
569
    def set_lyrics(self, lyrics):
2524
569
        """Set the lyrics as a list of strings"""
570
        """Set the lyrics as a list of strings"""
2525
570
        self.lyrics = lyrics
571
        self.lyrics = lyrics
2526
571
        self._parse_lyrics()
572
        self._parse_lyrics()
2527
@@ -594,7 +595,7 @@
2528
594
        numOfSlides = len(self.slideList)
595
        numOfSlides = len(self.slideList)
2529
595
        return numOfSlides
596
        return numOfSlides
2530
596
597
2532
597
    def get_preview_slide(self,  slideNumber):
598
    def get_preview_slide(self, slideNumber):
2533
598
        """Return the preview text for specified slide number
599
        """Return the preview text for specified slide number
2534
599
600
2535
600
        slideNumber -- 0: all slides, 1..n : specific slide
601
        slideNumber -- 0: all slides, 1..n : specific slide
2536
@@ -618,7 +619,7 @@
2537
618
        # remove formattingincluding themes
619
        # remove formattingincluding themes
2538
619
        return res
620
        return res
2539
620
621
2541
621
    def get_render_slide(self,  slideNumber):
622
    def get_render_slide(self, slideNumber):
2542
622
        """Return the slide to be rendered including the additional
623
        """Return the slide to be rendered including the additional
2543
623
        properties
624
        properties
2544
624
625
2545
625
626
2546
=== modified file 'openlp/plugins/songs/lib/tables.py'
2547
--- openlp/plugins/songs/lib/tables.py	2009-09-08 19:58:05 +0000
2548
+++ openlp/plugins/songs/lib/tables.py	2009-09-21 17:56:36 +0000
2549
@@ -29,7 +29,7 @@
2550
29
29
2551
30
# Definition of the "authors" table
30
# Definition of the "authors" table
2552
31
authors_table = Table(u'authors', metadata,
31
authors_table = Table(u'authors', metadata,
2554
32
    Column(u'id', types.Integer,  primary_key=True),
32
    Column(u'id', types.Integer, primary_key=True),
2555
33
    Column(u'first_name', types.Unicode(128)),
33
    Column(u'first_name', types.Unicode(128)),
2556
34
    Column(u'last_name', types.Unicode(128)),
34
    Column(u'last_name', types.Unicode(128)),
2557
35
    Column(u'display_name', types.Unicode(255), nullable=False)
35
    Column(u'display_name', types.Unicode(255), nullable=False)
2558
@@ -45,7 +45,8 @@
2559
45
# Definition of the "songs" table
45
# Definition of the "songs" table
2560
46
songs_table = Table(u'songs', metadata,
46
songs_table = Table(u'songs', metadata,
2561
47
    Column(u'id', types.Integer, primary_key=True),
47
    Column(u'id', types.Integer, primary_key=True),
2563
48
    Column(u'song_book_id', types.Integer, ForeignKey(u'song_books.id'), default=0),
48
    Column(u'song_book_id', types.Integer,
2564
49
        ForeignKey(u'song_books.id'), default=0),
2565
49
    Column(u'title', types.Unicode(255), nullable=False),
50
    Column(u'title', types.Unicode(255), nullable=False),
2566
50
    Column(u'lyrics', types.UnicodeText, nullable=False),
51
    Column(u'lyrics', types.UnicodeText, nullable=False),
2567
51
    Column(u'verse_order', types.Unicode(128)),
52
    Column(u'verse_order', types.Unicode(128)),
2568
@@ -60,27 +61,38 @@
2569
60
61
2570
61
# Definition of the "topics" table
62
# Definition of the "topics" table
2571
62
topics_table = Table(u'topics', metadata,
63
topics_table = Table(u'topics', metadata,
2573
63
    Column(u'id', types.Integer,  primary_key=True),
64
    Column(u'id', types.Integer, primary_key=True),
2574
64
    Column(u'name', types.Unicode(128), nullable=False)
65
    Column(u'name', types.Unicode(128), nullable=False)
2575
65
)
66
)
2576
66
67
2577
67
# Definition of the "authors_songs" table
68
# Definition of the "authors_songs" table
2578
68
authors_songs_table = Table(u'authors_songs', metadata,
69
authors_songs_table = Table(u'authors_songs', metadata,
2581
69
    Column(u'author_id', types.Integer, ForeignKey(u'authors.id'), primary_key=True),
70
    Column(u'author_id', types.Integer,
2582
70
    Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True)
71
        ForeignKey(u'authors.id'), primary_key=True),
2583
72
    Column(u'song_id', types.Integer,
2584
73
        ForeignKey(u'songs.id'), primary_key=True)
2585
71
)
74
)
2586
72
75
2587
73
# Definition of the "songs_topics" table
76
# Definition of the "songs_topics" table
2588
74
songs_topics_table = Table(u'songs_topics', metadata,
77
songs_topics_table = Table(u'songs_topics', metadata,
2591
75
    Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True),
78
    Column(u'song_id', types.Integer,
2592
76
    Column(u'topic_id', types.Integer, ForeignKey(u'topics.id'), primary_key=True)
79
        ForeignKey(u'songs.id'), primary_key=True),
2593
80
    Column(u'topic_id', types.Integer,
2594
81
        ForeignKey(u'topics.id'), primary_key=True)
2595
77
)
82
)
2605
78
Index(u'authors_id',authors_table.c.id)
83
2606
79
Index(u'authors_display_name_id',authors_table.c.display_name, authors_table.c.id)
84
# Define table indexes
2607
80
Index(u'song_books_id',song_books_table.c.id)
85
Index(u'authors_id', authors_table.c.id)
2608
81
Index(u'songs_id',songs_table.c.id)
86
Index(u'authors_display_name_id', authors_table.c.display_name,
2609
82
Index(u'topics_id',topics_table.c.id)
87
    authors_table.c.id)
2610
83
Index(u'authors_songs_author',authors_songs_table.c.author_id, authors_songs_table.c.song_id)
88
Index(u'song_books_id', song_books_table.c.id)
2611
84
Index(u'authors_songs_song',authors_songs_table.c.song_id, authors_songs_table.c.author_id)
89
Index(u'songs_id', songs_table.c.id)
2612
85
Index(u'topics_song_topic', songs_topics_table.c.topic_id, songs_topics_table.c.song_id)
90
Index(u'topics_id', topics_table.c.id)
2613
86
Index(u'topics_song_song',songs_topics_table.c.song_id, songs_topics_table.c.topic_id)
91
Index(u'authors_songs_author', authors_songs_table.c.author_id,
2614
92
    authors_songs_table.c.song_id)
2615
93
Index(u'authors_songs_song', authors_songs_table.c.song_id,
2616
94
    authors_songs_table.c.author_id)
2617
95
Index(u'topics_song_topic', songs_topics_table.c.topic_id,
2618
96
    songs_topics_table.c.song_id)
2619
97
Index(u'topics_song_song', songs_topics_table.c.song_id,
2620
98
    songs_topics_table.c.topic_id)
2621
87
99
2622
=== modified file 'openlp/plugins/songs/songsplugin.py'
2623
--- openlp/plugins/songs/songsplugin.py	2009-09-08 19:58:05 +0000
2624
+++ openlp/plugins/songs/songsplugin.py	2009-09-21 17:56:36 +0000
2625
@@ -94,7 +94,8 @@
2626
94
        # Translations...
94
        # Translations...
2627
95
        self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song'))
95
        self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song'))
2628
96
        self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
96
        self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
2630
97
        self.ImportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
97
        self.ImportOpenlp1Item.setText(
2631
98
            translate(u'main_window', u'openlp.org 1.0'))
2632
98
        self.ImportOpenlp1Item.setToolTip(
99
        self.ImportOpenlp1Item.setToolTip(
2633
99
            translate(u'main_window', u'Export songs in openlp.org 1.0 format'))
100
            translate(u'main_window', u'Export songs in openlp.org 1.0 format'))
2634
100
        self.ImportOpenlp1Item.setStatusTip(
101
        self.ImportOpenlp1Item.setStatusTip(
2635
@@ -137,7 +138,8 @@
2636
137
        # Translations...
138
        # Translations...
2637
138
        self.ExportSongMenu.setTitle(translate(u'main_window', u'&Song'))
139
        self.ExportSongMenu.setTitle(translate(u'main_window', u'&Song'))
2638
139
        self.ExportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
140
        self.ExportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
2640
140
        self.ExportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
141
        self.ExportOpenlp1Item.setText(
2641
142
            translate(u'main_window', u'openlp.org 1.0'))
2642
141
        self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0'))
143
        self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0'))
2643
142
        # Signals and slots
144
        # Signals and slots
2644
143
        QtCore.QObject.connect(self.ExportOpenlp1Item,
145
        QtCore.QObject.connect(self.ExportOpenlp1Item,
2645
144
146
2646
=== modified file 'openlp/plugins/songs/test/test_song_basic.py'
2647
--- openlp/plugins/songs/test/test_song_basic.py	2009-09-03 15:19:30 +0000
2648
+++ openlp/plugins/songs/test/test_song_basic.py	2009-09-21 17:56:36 +0000
2649
@@ -50,8 +50,8 @@
2650
50
        s = Song()
50
        s = Song()
2651
51
        t = "A normal title"
51
        t = "A normal title"
2652
52
        s.set_title(t)
52
        s.set_title(t)
2655
53
        assert(s.get_title() ==  t)
53
        assert(s.get_title() == t)
2656
54
        assert(s.get_search_title() ==  t)
54
        assert(s.get_search_title() == t)
2657
55
55
2658
56
    def test_Title3(self):
56
    def test_Title3(self):
2659
57
        """Set a titel with punctuation 1"""
57
        """Set a titel with punctuation 1"""
2660
@@ -59,8 +59,8 @@
2661
59
        t1 = "Hey! Come on, ya programmers*"
59
        t1 = "Hey! Come on, ya programmers*"
2662
60
        t2 = "Hey Come on ya programmers"
60
        t2 = "Hey Come on ya programmers"
2663
61
        s.set_title(t1)
61
        s.set_title(t1)
2666
62
        assert(s.get_title() ==  t1)
62
        assert(s.get_title() == t1)
2667
63
        assert(s.get_search_title() ==  t2)
63
        assert(s.get_search_title() == t2)
2668
64
64
2669
65
    def test_Title4(self):
65
    def test_Title4(self):
2670
66
        """Set a titel with punctuation 2"""
66
        """Set a titel with punctuation 2"""
2671
@@ -68,11 +68,14 @@
2672
68
        t1 = "??#Hey! Come on, ya programmers*"
68
        t1 = "??#Hey! Come on, ya programmers*"
2673
69
        t2 = "Hey Come on ya programmers"
69
        t2 = "Hey Come on ya programmers"
2674
70
        s.set_title(t1)
70
        s.set_title(t1)
2677
71
        assert(s.get_title() ==  t1)
71
        assert(s.get_title() == t1)
2678
72
        assert(s.get_search_title() ==  t2)
72
        assert(s.get_search_title() == t2)
2679
73
73
2680
74
    def test_Title5(self):
74
    def test_Title5(self):
2682
75
        """Set a title, where searchable title becomes empty - raises an exception"""
75
        """
2683
76
        Set a title
2684
77
        Where searchable title becomes empty raises an exception
2685
78
        """
2686
76
        s = Song()
79
        s = Song()
2687
77
        py.test.raises(SongTitleError, s.set_title, ',*')
80
        py.test.raises(SongTitleError, s.set_title, ',*')
2688
78
81
2689
79
82
2690
=== modified file 'openlpcnv.pyw'
2691
--- openlpcnv.pyw	2009-09-08 19:58:05 +0000
2692
+++ openlpcnv.pyw	2009-09-21 17:56:36 +0000
2693
@@ -49,7 +49,7 @@
2694
49
        Initialise the process.
49
        Initialise the process.
2695
50
        """
50
        """
2696
51
        self.display = Display()
51
        self.display = Display()
2698
52
        self.stime =  time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime())
52
        self.stime = time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime())
2699
53
        self.display.output(u'OpenLp v1.9.0 Migration Utility Started')
53
        self.display.output(u'OpenLp v1.9.0 Migration Utility Started')
2700
54
54
2701
55
    def process(self):
55
    def process(self):
Status:	Superseded
Proposed branch:	lp:~meths/openlp/trivialfixes
Merge into:	lp:openlp
Diff against target:	None lines
To merge this branch:	bzr merge lp:~meths/openlp/trivialfixes
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tim Bentley			Approve on 2009-09-21
Raoul Snyman			Approve on 2009-09-21
Review via email: mp+12184@code.launchpad.net