Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1209515_2.0 into lp:openlp/2.0
Review: Needs Fixing -- https://code.launchpad.net/~phill-ridout/openlp/1209515_2.0/+merge/179585 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/1209515_2.0 into lp:openlp/2.0
Andreas, How do I make it static? -- https://code.launchpad.net/~phill-ridout/openlp/1209515_2.0/+merge/179585 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1211049] [NEW] Can no long download bible verses
Public bug reported: Error occurs on 3 different computers, 1. Windows 7 Home premium, custom built tower 2. Windows 7 Professional, custom built tower 3. Windows 7 Home premium, HP laptop Operating system is kept update on all 3 by automatic Microsoft updates. OpenLP - version 2.0.1 LibreOffice - version 4.0 Error Message: on Friday August 9, 2013 still occurring on Sunday August 11 Download Error There was a problem downloading your verse selection. Please check your Internet connection and if this error continues to occur please consider reporting a bug. Bible - Good News Translation Verses - Genesis 15:1-6 / Luke 12:32-40 Also tried other books and verse combinations with the same results Using Bible import the only place I was able to find and obtain Good News verses is through web download / Crosswalk / American Bible Society. This has worked for the past 12 to 14 months. Last successful download was on Friday August 2, 2013 I have not tried other Bible versions since our congregations does use them. I am not sure how to obtain debug logs or traceback for Open LP. Attaching the Openlp.log file that I found. ** Affects: openlp Importance: Undecided Status: New ** Attachment added: openlp.log https://bugs.launchpad.net/bugs/1211049/+attachment/3768320/+files/openlp.log -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1211049 Title: Can no long download bible verses Status in OpenLP - Worship Presentation Software: New Bug description: Error occurs on 3 different computers, 1. Windows 7 Home premium, custom built tower 2. Windows 7 Professional, custom built tower 3. Windows 7 Home premium, HP laptop Operating system is kept update on all 3 by automatic Microsoft updates. OpenLP - version 2.0.1 LibreOffice - version 4.0 Error Message: on Friday August 9, 2013 still occurring on Sunday August 11 Download Error There was a problem downloading your verse selection. Please check your Internet connection and if this error continues to occur please consider reporting a bug. Bible - Good News Translation Verses - Genesis 15:1-6 / Luke 12:32-40 Also tried other books and verse combinations with the same results Using Bible import the only place I was able to find and obtain Good News verses is through web download / Crosswalk / American Bible Society. This has worked for the past 12 to 14 months. Last successful download was on Friday August 2, 2013 I have not tried other Bible versions since our congregations does use them. I am not sure how to obtain debug logs or traceback for Open LP. Attaching the Openlp.log file that I found. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1211049/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1211049] Re: Can no long download bible verses
Hi JerryP40, that's the right log file. Can you run OpenLP in debug mode (there should be a link in your Start menu, if my sources are correct), reproduce the problem, and then upload that file again please? -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1211049 Title: Can no long download bible verses Status in OpenLP - Worship Presentation Software: New Bug description: Error occurs on 3 different computers, 1. Windows 7 Home premium, custom built tower 2. Windows 7 Professional, custom built tower 3. Windows 7 Home premium, HP laptop Operating system is kept update on all 3 by automatic Microsoft updates. OpenLP - version 2.0.1 LibreOffice - version 4.0 Error Message: on Friday August 9, 2013 still occurring on Sunday August 11 Download Error There was a problem downloading your verse selection. Please check your Internet connection and if this error continues to occur please consider reporting a bug. Bible - Good News Translation Verses - Genesis 15:1-6 / Luke 12:32-40 Also tried other books and verse combinations with the same results Using Bible import the only place I was able to find and obtain Good News verses is through web download / Crosswalk / American Bible Society. This has worked for the past 12 to 14 months. Last successful download was on Friday August 2, 2013 I have not tried other Bible versions since our congregations does use them. I am not sure how to obtain debug logs or traceback for Open LP. Attaching the Openlp.log file that I found. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1211049/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~phill-ridout/openlp/1209515_2.0 into lp:openlp/2.0
Phill has proposed merging lp:~phill-ridout/openlp/1209515_2.0 into lp:openlp/2.0. Requested reviews: Phill (phill-ridout) Andreas Preikschat (googol) Related bugs: Bug #1209515 in OpenLP: getFileNames corrupts file names that use special chars https://bugs.launchpad.net/openlp/+bug/1209515 For more details, see: https://code.launchpad.net/~phill-ridout/openlp/1209515_2.0/+merge/179606 Fixes #1209515 by subclassing QFileDialog and attempting to urldecode any files not found -- https://code.launchpad.net/~phill-ridout/openlp/1209515_2.0/+merge/179606 Your team OpenLP Core is subscribed to branch lp:openlp/2.0. === modified file 'openlp/core/lib/__init__.py' --- openlp/core/lib/__init__.py 2013-01-20 18:46:41 + +++ openlp/core/lib/__init__.py 2013-08-11 20:21:07 + @@ -384,6 +384,7 @@ from eventreceiver import Receiver +from filedialog import FileDialog from listwidgetwithdnd import ListWidgetWithDnD from formattingtags import FormattingTags from spelltextedit import SpellTextEdit === added file 'openlp/core/lib/filedialog.py' --- openlp/core/lib/filedialog.py 1970-01-01 00:00:00 + +++ openlp/core/lib/filedialog.py 2013-08-11 20:21:07 + @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +### +# OpenLP - Open Source Lyrics Projection # +# --- # +# Copyright (c) 2008-2013 Raoul Snyman# +# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # +# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # +# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # +# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # +# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # +# Frode Woldsund, Martin Zibricky # +# --- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for# +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +### + + +Provide a work around for a bug in QFileDialog (#1209515) + +import logging +import os +import urllib + +from PyQt4 import QtCore, QtGui + +from openlp.core.lib.ui import UiStrings + +log = logging.getLogger(__name__) + +class FileDialog(QtGui.QFileDialog): +@staticmethod +def getOpenFileNames(parent, title, path, filters): +files = QtGui.QFileDialog.getOpenFileNames(parent, title, path, filters) +file_list = QtCore.QStringList() +for file in files: +if not os.path.exists(file): +file = urllib.unquote(unicode(file)) +if not os.path.exists(file): +QtGui.QMessageBox.information(self, +UiStrings().FNFT, +UiStrings().FNF % file) +continue +file_list.append(QtCore.QString(file)) +return file_list \ No newline at end of file === modified file 'openlp/core/lib/mediamanageritem.py' --- openlp/core/lib/mediamanageritem.py 2013-01-05 11:31:02 + +++ openlp/core/lib/mediamanageritem.py 2013-08-11 20:21:07 + @@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsManager, OpenLPToolbar, ServiceItem, \ +from openlp.core.lib import FileDialog, SettingsManager, OpenLPToolbar, ServiceItem, \ StringContent, build_icon, translate, Receiver, ListWidgetWithDnD from openlp.core.lib.searchedit import SearchEdit from openlp.core.lib.ui import UiStrings, create_widget_action, \ @@ -337,7 +337,7 @@ Add a file to the list widget to make it available for showing -files =
[Openlp-core] [Merge] lp:~oliwee/openlp/HideBibleVerses into lp:openlp
Oliver Wieland has proposed merging lp:~oliwee/openlp/HideBibleVerses into
lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Related bugs:
Bug #1051699 in OpenLP: Bibles add option to not display chapter and verse
numbers
https://bugs.launchpad.net/openlp/+bug/1051699
For more details, see:
https://code.launchpad.net/~oliwee/openlp/HideBibleVerses/+merge/179610
The changes add a Checkbox at the Bibles settings tab to show or hide the verse
numbers. Therefor a new element Display verse numbers in the settings is
implemented. On default, this element is set to True.
If the value is set to False, the values Show new chapters and Display
Style are not relevant and the input fields at the Bibles settings tab will be
greyed out.
--
https://code.launchpad.net/~oliwee/openlp/HideBibleVerses/+merge/179610
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2013-04-18 17:45:14 +
+++ openlp/plugins/bibles/bibleplugin.py 2013-08-11 21:15:27 +
@@ -48,6 +48,7 @@
u'bibles/verse layout style': LayoutStyle.VersePerSlide,
u'bibles/book name language': LanguageSelection.Bible,
u'bibles/display brackets': DisplayStyle.NoBrackets,
+u'bibles/display verse': True,
u'bibles/display new chapter': False,
u'bibles/second bibles': True,
u'bibles/advanced bible': u'',
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2013-03-25 07:27:54 +
+++ openlp/plugins/bibles/lib/biblestab.py 2013-08-11 21:15:27 +
@@ -58,6 +58,9 @@
self.verse_display_group_box.setObjectName(u'verse_display_group_box')
self.verse_display_layout = QtGui.QFormLayout(self.verse_display_group_box)
self.verse_display_layout.setObjectName(u'verse_display_layout')
+self.display_verse_check_box = QtGui.QCheckBox(self.verse_display_group_box)
+self.display_verse_check_box.setObjectName(u'verse_display_check_box')
+self.verse_display_layout.addRow(self.display_verse_check_box)
self.new_chapters_check_box = QtGui.QCheckBox(self.verse_display_group_box)
self.new_chapters_check_box.setObjectName(u'new_chapters_check_box')
self.verse_display_layout.addRow(self.new_chapters_check_box)
@@ -134,6 +137,7 @@
self.left_layout.addStretch()
self.right_layout.addStretch()
# Signals and slots
+self.display_verse_check_box.stateChanged.connect(self.on_display_verse_check_box_changed)
self.new_chapters_check_box.stateChanged.connect(self.on_new_chapters_check_box_changed)
self.display_style_combo_box.activated.connect(self.on_display_style_combo_box_changed)
self.bible_theme_combo_box.activated.connect(self.on_bible_theme_combo_box_changed)
@@ -156,6 +160,7 @@
def retranslateUi(self):
self.verse_display_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Verse Display'))
+self.display_verse_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display verse numbers'))
self.new_chapters_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Only show new chapter numbers'))
self.layout_style_label.setText(UiStrings().LayoutStyle)
self.display_style_label.setText(UiStrings().DisplayStyle)
@@ -208,6 +213,14 @@
def on_language_selection_combo_box_changed(self):
self.language_selection = self.language_selection_combo_box.currentIndex()
+def on_display_verse_check_box_changed(self, check_state):
+self.display_verse = False
+# We have a set value convert to True/False.
+if check_state == QtCore.Qt.Checked:
+self.display_verse = True
+
+self.check_display_verse()
+
def on_new_chapters_check_box_changed(self, check_state):
self.show_new_chapters = False
# We have a set value convert to True/False.
@@ -299,11 +312,14 @@
def load(self):
settings = Settings()
settings.beginGroup(self.settings_section)
+self.display_verse = settings.value(u'display verse')
self.show_new_chapters = settings.value(u'display new chapter')
self.display_style = settings.value(u'display brackets')
self.layout_style = settings.value(u'verse layout style')
self.bible_theme = settings.value(u'bible theme')
self.second_bibles = settings.value(u'second bibles')
+self.display_verse_check_box.setChecked(self.display_verse)
+self.check_display_verse()
self.new_chapters_check_box.setChecked(self.show_new_chapters)
self.display_style_combo_box.setCurrentIndex(self.display_style)
self.layout_style_combo_box.setCurrentIndex(self.layout_style)
@@ -351,6 +367,7 @@
def save(self):
settings = Settings()
settings.beginGroup(self.settings_section)
+settings.setValue(u'display verse',
[Openlp-core] [Bug 1211049] Re: Can no long download bible verses
Let's try this file ** Attachment added: Debug file https://bugs.launchpad.net/openlp/+bug/1211049/+attachment/3768577/+files/openlp.log -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1211049 Title: Can no long download bible verses Status in OpenLP - Worship Presentation Software: New Bug description: Error occurs on 3 different computers, 1. Windows 7 Home premium, custom built tower 2. Windows 7 Professional, custom built tower 3. Windows 7 Home premium, HP laptop Operating system is kept update on all 3 by automatic Microsoft updates. OpenLP - version 2.0.1 LibreOffice - version 4.0 Error Message: on Friday August 9, 2013 still occurring on Sunday August 11 Download Error There was a problem downloading your verse selection. Please check your Internet connection and if this error continues to occur please consider reporting a bug. Bible - Good News Translation Verses - Genesis 15:1-6 / Luke 12:32-40 Also tried other books and verse combinations with the same results Using Bible import the only place I was able to find and obtain Good News verses is through web download / Crosswalk / American Bible Society. This has worked for the past 12 to 14 months. Last successful download was on Friday August 2, 2013 I have not tried other Bible versions since our congregations does use them. I am not sure how to obtain debug logs or traceback for Open LP. Attaching the Openlp.log file that I found. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1211049/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
