forked from openlp/openlp
HEAD
This commit is contained in:
commit
8c9728c3b2
@ -336,7 +336,7 @@ class Renderer(object):
|
|||||||
styled_text += styled_line
|
styled_text += styled_line
|
||||||
html = self.page_shell + styled_text + HTML_END
|
html = self.page_shell + styled_text + HTML_END
|
||||||
self.web.setHtml(html)
|
self.web.setHtml(html)
|
||||||
# Text too long so go to next page
|
# Text too long so go to next page.
|
||||||
if self.web_frame.contentsSize().height() > self.page_height:
|
if self.web_frame.contentsSize().height() > self.page_height:
|
||||||
if force_page and line_count > 0:
|
if force_page and line_count > 0:
|
||||||
Receiver.send_message(u'theme_line_count', line_count)
|
Receiver.send_message(u'theme_line_count', line_count)
|
||||||
@ -367,7 +367,7 @@ class Renderer(object):
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
log.debug(u'_paginate_slide_words - Start')
|
log.debug(u'_paginate_slide_words - Start')
|
||||||
line_end = u''
|
line_end = u' '
|
||||||
if line_break:
|
if line_break:
|
||||||
line_end = u'<br>'
|
line_end = u'<br>'
|
||||||
formatted = []
|
formatted = []
|
||||||
@ -375,10 +375,11 @@ class Renderer(object):
|
|||||||
previous_raw = u''
|
previous_raw = u''
|
||||||
lines = text.split(u'\n')
|
lines = text.split(u'\n')
|
||||||
for line in lines:
|
for line in lines:
|
||||||
|
line = line.strip()
|
||||||
styled_line = expand_tags(line)
|
styled_line = expand_tags(line)
|
||||||
html = self.page_shell + previous_html + styled_line + HTML_END
|
html = self.page_shell + previous_html + styled_line + HTML_END
|
||||||
self.web.setHtml(html)
|
self.web.setHtml(html)
|
||||||
# Text too long so go to next page
|
# Text too long so go to next page.
|
||||||
if self.web_frame.contentsSize().height() > self.page_height:
|
if self.web_frame.contentsSize().height() > self.page_height:
|
||||||
# Check if there was a verse before the current one and append
|
# Check if there was a verse before the current one and append
|
||||||
# it, when it fits on the page.
|
# it, when it fits on the page.
|
||||||
@ -402,24 +403,56 @@ class Renderer(object):
|
|||||||
previous_html = styled_line + line_end
|
previous_html = styled_line + line_end
|
||||||
previous_raw = line + line_end
|
previous_raw = line + line_end
|
||||||
continue
|
continue
|
||||||
words = self._words_split(line)
|
# Figure out how many words of the line will fit on screen by
|
||||||
for word in words:
|
# using the algorithm known as "binary chop".
|
||||||
styled_word = expand_tags(word)
|
raw_words = self._words_split(line)
|
||||||
html = self.page_shell + previous_html + styled_word + \
|
html_words = [expand_tags(word) for word in raw_words]
|
||||||
HTML_END
|
smallest_index = 0
|
||||||
|
highest_index = len(html_words) - 1
|
||||||
|
index = int(highest_index / 2)
|
||||||
|
while True:
|
||||||
|
html = self.page_shell + previous_html + \
|
||||||
|
u''.join(html_words[:index + 1]).strip() + HTML_END
|
||||||
self.web.setHtml(html)
|
self.web.setHtml(html)
|
||||||
# Text too long so go to next page
|
|
||||||
if self.web_frame.contentsSize().height() > \
|
if self.web_frame.contentsSize().height() > \
|
||||||
self.page_height:
|
self.page_height:
|
||||||
while previous_raw.endswith(u'<br>'):
|
# We know that it does not fit, so change/calculate the
|
||||||
previous_raw = previous_raw[:-4]
|
# new index and highest_index accordingly.
|
||||||
formatted.append(previous_raw)
|
highest_index = index
|
||||||
|
index = int(index - (index - smallest_index) / 2)
|
||||||
|
else:
|
||||||
|
smallest_index = index
|
||||||
|
index = int(index + (highest_index - index) / 2)
|
||||||
|
# We found the number of words which will fit.
|
||||||
|
if smallest_index == index or highest_index == index:
|
||||||
|
index = smallest_index
|
||||||
|
formatted.append(previous_raw.rstrip(u'<br>') +
|
||||||
|
u''.join(raw_words[:index + 1]))
|
||||||
previous_html = u''
|
previous_html = u''
|
||||||
previous_raw = u''
|
previous_raw = u''
|
||||||
previous_html += styled_word
|
else:
|
||||||
previous_raw += word
|
continue
|
||||||
previous_html += line_end
|
# Check if the rest of the line fits on the slide. If it
|
||||||
previous_raw += line_end
|
# does we do not have to do the much more intensive "word by
|
||||||
|
# word" checking.
|
||||||
|
html = self.page_shell + \
|
||||||
|
u''.join(html_words[index + 1:]).strip() + HTML_END
|
||||||
|
self.web.setHtml(html)
|
||||||
|
if self.web_frame.contentsSize().height() <= \
|
||||||
|
self.page_height:
|
||||||
|
previous_html = \
|
||||||
|
u''.join(html_words[index + 1:]).strip() + line_end
|
||||||
|
previous_raw = \
|
||||||
|
u''.join(raw_words[index + 1:]).strip() + line_end
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
# The other words do not fit, thus reset the indexes,
|
||||||
|
# create a new list and continue with "word by word".
|
||||||
|
raw_words = raw_words[index + 1:]
|
||||||
|
html_words = html_words[index + 1:]
|
||||||
|
smallest_index = 0
|
||||||
|
highest_index = len(html_words) - 1
|
||||||
|
index = int(highest_index / 2)
|
||||||
else:
|
else:
|
||||||
previous_html += styled_line + line_end
|
previous_html += styled_line + line_end
|
||||||
previous_raw += line + line_end
|
previous_raw += line + line_end
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import locale
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
from sqlalchemy.sql import or_, func
|
from sqlalchemy.sql import or_, func
|
||||||
@ -134,15 +135,19 @@ class CustomMediaItem(MediaManagerItem):
|
|||||||
self.onPreviewClick()
|
self.onPreviewClick()
|
||||||
self.onRemoteEditClear()
|
self.onRemoteEditClear()
|
||||||
|
|
||||||
def loadList(self, list):
|
def loadList(self, custom_slides):
|
||||||
self.listView.clear()
|
self.listView.clear()
|
||||||
for customSlide in list:
|
# Sort the customs by its title considering language specific
|
||||||
custom_name = QtGui.QListWidgetItem(customSlide.title)
|
# characters. lower() is needed for windows!
|
||||||
|
custom_slides.sort(
|
||||||
|
cmp=locale.strcoll, key=lambda custom: custom.title.lower())
|
||||||
|
for custom_slide in custom_slides:
|
||||||
|
custom_name = QtGui.QListWidgetItem(custom_slide.title)
|
||||||
custom_name.setData(
|
custom_name.setData(
|
||||||
QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id))
|
QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id))
|
||||||
self.listView.addItem(custom_name)
|
self.listView.addItem(custom_name)
|
||||||
# Auto-select the item if name has been set
|
# Auto-select the item if name has been set
|
||||||
if customSlide.title == self.autoSelectItem :
|
if custom_slide.title == self.autoSelectItem:
|
||||||
self.listView.setCurrentItem(custom_name)
|
self.listView.setCurrentItem(custom_name)
|
||||||
|
|
||||||
def onNewClick(self):
|
def onNewClick(self):
|
||||||
|
@ -150,20 +150,18 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
else:
|
else:
|
||||||
self.presentationWidget.hide()
|
self.presentationWidget.hide()
|
||||||
|
|
||||||
def loadList(self, list, initialLoad=False):
|
def loadList(self, files, initialLoad=False):
|
||||||
"""
|
"""
|
||||||
Add presentations into the media manager
|
Add presentations into the media manager
|
||||||
This is called both on initial load of the plugin to populate with
|
This is called both on initial load of the plugin to populate with
|
||||||
existing files, and when the user adds new files via the media manager
|
existing files, and when the user adds new files via the media manager
|
||||||
"""
|
"""
|
||||||
currlist = self.getFileList()
|
currlist = self.getFileList()
|
||||||
titles = []
|
titles = [os.path.split(file)[1] for file in currlist]
|
||||||
for file in currlist:
|
|
||||||
titles.append(os.path.split(file)[1])
|
|
||||||
Receiver.send_message(u'cursor_busy')
|
Receiver.send_message(u'cursor_busy')
|
||||||
if not initialLoad:
|
if not initialLoad:
|
||||||
self.parent.formparent.displayProgressBar(len(list))
|
self.parent.formparent.displayProgressBar(len(files))
|
||||||
for file in list:
|
for file in files:
|
||||||
if not initialLoad:
|
if not initialLoad:
|
||||||
self.parent.formparent.incrementProgressBar()
|
self.parent.formparent.incrementProgressBar()
|
||||||
if currlist.count(file) > 0:
|
if currlist.count(file) > 0:
|
||||||
|
@ -230,7 +230,10 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
def displayResultsSong(self, searchresults):
|
def displayResultsSong(self, searchresults):
|
||||||
log.debug(u'display results Song')
|
log.debug(u'display results Song')
|
||||||
self.listView.clear()
|
self.listView.clear()
|
||||||
searchresults.sort(cmp=self.collateSongTitles)
|
# Sort the songs by its title considering language specific characters.
|
||||||
|
# lower() is needed for windows!
|
||||||
|
searchresults.sort(
|
||||||
|
cmp=locale.strcoll, key=lambda song: song.title.lower())
|
||||||
for song in searchresults:
|
for song in searchresults:
|
||||||
author_list = [author.display_name for author in song.authors]
|
author_list = [author.display_name for author in song.authors]
|
||||||
song_title = unicode(song.title)
|
song_title = unicode(song.title)
|
||||||
@ -476,13 +479,6 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
Receiver.send_message(u'service_item_update',
|
Receiver.send_message(u'service_item_update',
|
||||||
u'%s:%s' % (editId, item._uuid))
|
u'%s:%s' % (editId, item._uuid))
|
||||||
|
|
||||||
def collateSongTitles(self, song_1, song_2):
|
|
||||||
"""
|
|
||||||
Locale aware collation of song titles
|
|
||||||
"""
|
|
||||||
return locale.strcoll(unicode(song_1.title.lower()),
|
|
||||||
unicode(song_2.title.lower()))
|
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string):
|
||||||
"""
|
"""
|
||||||
Search for some songs
|
Search for some songs
|
||||||
|
@ -65,6 +65,7 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription
|
|||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
|
Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||||
|
Source: psvince.dll; Flags: dontcopy
|
||||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
@ -86,6 +87,9 @@ Root: HKCR; Subkey: "OpenLP\DefaultIcon"; ValueType: string; ValueName: ""; Valu
|
|||||||
Root: HKCR; Subkey: "OpenLP\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\OpenLP.exe"" ""%1"""
|
Root: HKCR; Subkey: "OpenLP\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\OpenLP.exe"" ""%1"""
|
||||||
|
|
||||||
[Code]
|
[Code]
|
||||||
|
function IsModuleLoaded(modulename: String ): Boolean;
|
||||||
|
external 'IsModuleLoaded@files:psvince.dll stdcall';
|
||||||
|
|
||||||
function GetUninstallString(): String;
|
function GetUninstallString(): String;
|
||||||
var
|
var
|
||||||
sUnInstPath: String;
|
sUnInstPath: String;
|
||||||
@ -126,6 +130,19 @@ begin
|
|||||||
Result := 1;
|
Result := 1;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function InitializeSetup(): Boolean;
|
||||||
|
begin
|
||||||
|
Result := true;
|
||||||
|
while IsModuleLoaded( 'OpenLP.exe' ) and Result do
|
||||||
|
begin
|
||||||
|
if MsgBox( 'Openlp is currently running, please close it to continue the install.',
|
||||||
|
mbError, MB_OKCANCEL ) = IDCANCEL then
|
||||||
|
begin
|
||||||
|
Result := false;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
procedure CurStepChanged(CurStep: TSetupStep);
|
procedure CurStepChanged(CurStep: TSetupStep);
|
||||||
begin
|
begin
|
||||||
if (CurStep=ssInstall) then
|
if (CurStep=ssInstall) then
|
||||||
|
BIN
resources/windows/psvince.dll
Normal file
BIN
resources/windows/psvince.dll
Normal file
Binary file not shown.
@ -226,6 +226,8 @@ def copy_windows_files():
|
|||||||
os.path.join(dist_path, u'OpenLP.ico'))
|
os.path.join(dist_path, u'OpenLP.ico'))
|
||||||
copy(os.path.join(winres_path, u'LICENSE.txt'),
|
copy(os.path.join(winres_path, u'LICENSE.txt'),
|
||||||
os.path.join(dist_path, u'LICENSE.txt'))
|
os.path.join(dist_path, u'LICENSE.txt'))
|
||||||
|
copy(os.path.join(winres_path, u'psvince.dll'),
|
||||||
|
os.path.join(dist_path, u'psvince.dll'))
|
||||||
if os.path.isfile(os.path.join(helpfile_path, u'Openlp.chm')):
|
if os.path.isfile(os.path.join(helpfile_path, u'Openlp.chm')):
|
||||||
print u' Windows help file found'
|
print u' Windows help file found'
|
||||||
copy(os.path.join(helpfile_path, u'Openlp.chm'),
|
copy(os.path.join(helpfile_path, u'Openlp.chm'),
|
||||||
|
Loading…
Reference in New Issue
Block a user