bug-1157938-2.0 : Code : OpenLP

Get this branch:: bzr branch lp:~raoul-snyman/openlp/bug-1157938-2.0

Only Raoul Snyman can upload to this branch. If you are Raoul Snyman please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:openlp/2.0 at revision 2188

Tim Bentley: Approve on 2014-01-19

Phill: Approve on 2014-01-18

mahfiaz: Pending requested 2014-01-18

Diff: 5007 lines (+1145/-719)

233 files modified

.bzrignore (+13/-14)
copyright.txt (+2/-2)
openlp.pyw (+2/-2)
openlp/__init__.py (+2/-2)
openlp/core/__init__.py (+2/-2)
openlp/core/lib/__init__.py (+2/-2)
openlp/core/lib/db.py (+2/-2)
openlp/core/lib/dockwidget.py (+2/-2)
openlp/core/lib/eventreceiver.py (+2/-2)
openlp/core/lib/filedialog.py (+3/-3)
openlp/core/lib/formattingtags.py (+2/-2)
openlp/core/lib/htmlbuilder.py (+3/-3)
openlp/core/lib/imagemanager.py (+2/-2)
openlp/core/lib/listwidgetwithdnd.py (+2/-2)
openlp/core/lib/mediamanageritem.py (+2/-2)
openlp/core/lib/mediaplayer.py (+2/-2)
openlp/core/lib/plugin.py (+2/-2)
openlp/core/lib/pluginmanager.py (+2/-2)
openlp/core/lib/renderer.py (+2/-2)
openlp/core/lib/searchedit.py (+2/-2)
openlp/core/lib/serviceitem.py (+2/-2)
openlp/core/lib/settings.py (+2/-2)
openlp/core/lib/settingsmanager.py (+2/-2)
openlp/core/lib/settingstab.py (+2/-2)
openlp/core/lib/spelltextedit.py (+2/-2)
openlp/core/lib/theme.py (+2/-2)
openlp/core/lib/toolbar.py (+2/-2)
openlp/core/lib/ui.py (+2/-2)
openlp/core/resources.py (+289/-100)
openlp/core/resources.py.orig (+287/-98)
openlp/core/theme/__init__.py (+2/-2)
openlp/core/theme/theme.py (+2/-2)
openlp/core/ui/__init__.py (+2/-2)
openlp/core/ui/aboutdialog.py (+4/-3)
openlp/core/ui/aboutform.py (+2/-2)
openlp/core/ui/advancedtab.py (+2/-2)
openlp/core/ui/exceptiondialog.py (+4/-2)
openlp/core/ui/exceptionform.py (+2/-2)
openlp/core/ui/filerenamedialog.py (+5/-3)
openlp/core/ui/filerenameform.py (+2/-2)
openlp/core/ui/firsttimeform.py (+2/-2)
openlp/core/ui/firsttimelanguagedialog.py (+5/-3)
openlp/core/ui/firsttimelanguageform.py (+2/-2)
openlp/core/ui/firsttimewizard.py (+4/-3)
openlp/core/ui/formattingtagdialog.py (+5/-3)
openlp/core/ui/formattingtagform.py (+2/-2)
openlp/core/ui/generaltab.py (+2/-2)
openlp/core/ui/maindisplay.py (+2/-2)
openlp/core/ui/mainwindow.py (+4/-3)
openlp/core/ui/media/__init__.py (+2/-2)
openlp/core/ui/media/mediacontroller.py (+2/-2)
openlp/core/ui/media/phononplayer.py (+2/-2)
openlp/core/ui/media/vlcplayer.py (+3/-3)
openlp/core/ui/media/webkitplayer.py (+2/-2)
openlp/core/ui/mediadockmanager.py (+2/-2)
openlp/core/ui/plugindialog.py (+5/-3)
openlp/core/ui/pluginform.py (+2/-2)
openlp/core/ui/printservicedialog.py (+4/-2)
openlp/core/ui/printserviceform.py (+2/-2)
openlp/core/ui/screen.py (+2/-2)
openlp/core/ui/serviceitemeditdialog.py (+5/-3)
openlp/core/ui/serviceitemeditform.py (+2/-2)
openlp/core/ui/servicemanager.py (+2/-2)
openlp/core/ui/servicenoteform.py (+2/-2)
openlp/core/ui/settingsdialog.py (+4/-4)
openlp/core/ui/settingsform.py (+2/-2)
openlp/core/ui/shortcutlistdialog.py (+4/-2)
openlp/core/ui/shortcutlistform.py (+2/-2)
openlp/core/ui/slidecontroller.py (+2/-2)
openlp/core/ui/splashscreen.py (+2/-2)
openlp/core/ui/starttimedialog.py (+5/-3)
openlp/core/ui/starttimeform.py (+2/-2)
openlp/core/ui/themeform.py (+2/-2)
openlp/core/ui/themelayoutdialog.py (+4/-4)
openlp/core/ui/themelayoutform.py (+2/-2)
openlp/core/ui/thememanager.py (+2/-2)
openlp/core/ui/themestab.py (+2/-2)
openlp/core/ui/themewizard.py (+4/-2)
openlp/core/ui/wizard.py (+4/-2)
openlp/core/utils/__init__.py (+2/-2)
openlp/core/utils/actions.py (+2/-2)
openlp/core/utils/languagemanager.py (+2/-2)
openlp/plugins/__init__.py (+2/-2)
openlp/plugins/alerts/__init__.py (+2/-2)
openlp/plugins/alerts/alertsplugin.py (+2/-2)
openlp/plugins/alerts/forms/__init__.py (+2/-2)
openlp/plugins/alerts/forms/alertdialog.py (+3/-3)
openlp/plugins/alerts/forms/alertform.py (+2/-2)
openlp/plugins/alerts/lib/__init__.py (+2/-2)
openlp/plugins/alerts/lib/alertsmanager.py (+2/-2)
openlp/plugins/alerts/lib/alertstab.py (+2/-2)
openlp/plugins/alerts/lib/db.py (+2/-2)
openlp/plugins/bibles/__init__.py (+2/-2)
openlp/plugins/bibles/bibleplugin.py (+2/-2)
openlp/plugins/bibles/forms/__init__.py (+2/-2)
openlp/plugins/bibles/forms/bibleimportform.py (+3/-2)
openlp/plugins/bibles/forms/bibleupgradeform.py (+2/-2)
openlp/plugins/bibles/forms/booknamedialog.py (+5/-3)
openlp/plugins/bibles/forms/booknameform.py (+2/-2)
openlp/plugins/bibles/forms/editbibledialog.py (+4/-5)
openlp/plugins/bibles/forms/editbibleform.py (+2/-2)
openlp/plugins/bibles/forms/languagedialog.py (+5/-3)
openlp/plugins/bibles/forms/languageform.py (+2/-2)
openlp/plugins/bibles/lib/__init__.py (+2/-2)
openlp/plugins/bibles/lib/biblestab.py (+2/-2)
openlp/plugins/bibles/lib/csvbible.py (+2/-2)
openlp/plugins/bibles/lib/db.py (+2/-2)
openlp/plugins/bibles/lib/http.py (+2/-2)
openlp/plugins/bibles/lib/manager.py (+4/-4)
openlp/plugins/bibles/lib/mediaitem.py (+2/-2)
openlp/plugins/bibles/lib/openlp1.py (+2/-2)
openlp/plugins/bibles/lib/opensong.py (+3/-3)
openlp/plugins/bibles/lib/osis.py (+3/-3)
openlp/plugins/bibles/lib/upgrade.py (+2/-2)
openlp/plugins/bibles/lib/versereferencelist.py (+2/-2)
openlp/plugins/custom/__init__.py (+2/-2)
openlp/plugins/custom/customplugin.py (+2/-2)
openlp/plugins/custom/forms/__init__.py (+2/-2)
openlp/plugins/custom/forms/editcustomdialog.py (+4/-4)
openlp/plugins/custom/forms/editcustomform.py (+2/-2)
openlp/plugins/custom/forms/editcustomslidedialog.py (+4/-2)
openlp/plugins/custom/forms/editcustomslideform.py (+2/-2)
openlp/plugins/custom/lib/__init__.py (+2/-2)
openlp/plugins/custom/lib/customtab.py (+2/-2)
openlp/plugins/custom/lib/customxmlhandler.py (+2/-2)
openlp/plugins/custom/lib/db.py (+2/-2)
openlp/plugins/custom/lib/mediaitem.py (+2/-2)
openlp/plugins/images/__init__.py (+2/-2)
openlp/plugins/images/imageplugin.py (+2/-2)
openlp/plugins/images/lib/__init__.py (+2/-2)
openlp/plugins/images/lib/imagetab.py (+2/-2)
openlp/plugins/images/lib/mediaitem.py (+2/-2)
openlp/plugins/media/__init__.py (+2/-2)
openlp/plugins/media/lib/__init__.py (+2/-2)
openlp/plugins/media/lib/mediaitem.py (+2/-2)
openlp/plugins/media/lib/mediatab.py (+2/-2)
openlp/plugins/media/mediaplugin.py (+2/-2)
openlp/plugins/presentations/__init__.py (+2/-2)
openlp/plugins/presentations/lib/__init__.py (+2/-2)
openlp/plugins/presentations/lib/impresscontroller.py (+2/-2)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/messagelistener.py (+2/-2)
openlp/plugins/presentations/lib/powerpointcontroller.py (+2/-2)
openlp/plugins/presentations/lib/pptviewcontroller.py (+2/-2)
openlp/plugins/presentations/lib/pptviewlib/ppttest.py (+2/-2)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp (+3/-3)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h (+2/-2)
openlp/plugins/presentations/lib/presentationcontroller.py (+2/-2)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/remotes/__init__.py (+2/-2)
openlp/plugins/remotes/html/index.html (+2/-2)
openlp/plugins/remotes/html/openlp.css (+2/-2)
openlp/plugins/remotes/html/openlp.js (+2/-2)
openlp/plugins/remotes/html/stage.css (+2/-2)
openlp/plugins/remotes/html/stage.html (+2/-2)
openlp/plugins/remotes/html/stage.js (+2/-2)
openlp/plugins/remotes/lib/__init__.py (+2/-2)
openlp/plugins/remotes/lib/httpserver.py (+2/-2)
openlp/plugins/remotes/lib/remotetab.py (+2/-2)
openlp/plugins/remotes/remoteplugin.py (+2/-2)
openlp/plugins/songs/__init__.py (+2/-2)
openlp/plugins/songs/forms/__init__.py (+2/-2)
openlp/plugins/songs/forms/authorsdialog.py (+5/-3)
openlp/plugins/songs/forms/authorsform.py (+2/-2)
openlp/plugins/songs/forms/editsongdialog.py (+4/-4)
openlp/plugins/songs/forms/editsongform.py (+5/-5)
openlp/plugins/songs/forms/editversedialog.py (+4/-2)
openlp/plugins/songs/forms/editverseform.py (+2/-2)
openlp/plugins/songs/forms/mediafilesdialog.py (+4/-4)
openlp/plugins/songs/forms/mediafilesform.py (+2/-2)
openlp/plugins/songs/forms/songbookdialog.py (+5/-3)
openlp/plugins/songs/forms/songbookform.py (+2/-2)
openlp/plugins/songs/forms/songexportform.py (+2/-2)
openlp/plugins/songs/forms/songimportform.py (+2/-2)
openlp/plugins/songs/forms/songmaintenancedialog.py (+5/-2)
openlp/plugins/songs/forms/songmaintenanceform.py (+2/-2)
openlp/plugins/songs/forms/topicsdialog.py (+5/-3)
openlp/plugins/songs/forms/topicsform.py (+2/-2)
openlp/plugins/songs/lib/__init__.py (+4/-4)
openlp/plugins/songs/lib/cclifileimport.py (+2/-2)
openlp/plugins/songs/lib/db.py (+2/-2)
openlp/plugins/songs/lib/dreambeamimport.py (+8/-8)
openlp/plugins/songs/lib/easyslidesimport.py (+2/-2)
openlp/plugins/songs/lib/ewimport.py (+2/-2)
openlp/plugins/songs/lib/foilpresenterimport.py (+2/-2)
openlp/plugins/songs/lib/importer.py (+2/-2)
openlp/plugins/songs/lib/mediaitem.py (+2/-2)
openlp/plugins/songs/lib/mediashoutimport.py (+2/-2)
openlp/plugins/songs/lib/olp1import.py (+2/-2)
openlp/plugins/songs/lib/olpimport.py (+2/-2)
openlp/plugins/songs/lib/oooimport.py (+2/-2)
openlp/plugins/songs/lib/openlyricsexport.py (+2/-2)
openlp/plugins/songs/lib/openlyricsimport.py (+2/-2)
openlp/plugins/songs/lib/opensongimport.py (+2/-2)
openlp/plugins/songs/lib/powersongimport.py (+2/-2)
openlp/plugins/songs/lib/sofimport.py (+2/-2)
openlp/plugins/songs/lib/songbeamerimport.py (+2/-2)
openlp/plugins/songs/lib/songimport.py (+2/-2)
openlp/plugins/songs/lib/songproimport.py (+2/-2)
openlp/plugins/songs/lib/songshowplusimport.py (+3/-3)
openlp/plugins/songs/lib/songstab.py (+2/-2)
openlp/plugins/songs/lib/sundayplusimport.py (+2/-2)
openlp/plugins/songs/lib/test/test_import_file.py (+2/-2)
openlp/plugins/songs/lib/test/test_importing_lots.py (+2/-2)
openlp/plugins/songs/lib/test/test_opensongimport.py (+2/-2)
openlp/plugins/songs/lib/ui.py (+2/-2)
openlp/plugins/songs/lib/upgrade.py (+2/-2)
openlp/plugins/songs/lib/wowimport.py (+2/-2)
openlp/plugins/songs/lib/xml.py (+2/-2)
openlp/plugins/songs/lib/zionworximport.py (+2/-2)
openlp/plugins/songs/songsplugin.py (+2/-2)
openlp/plugins/songusage/__init__.py (+2/-2)
openlp/plugins/songusage/forms/__init__.py (+2/-2)
openlp/plugins/songusage/forms/songusagedeletedialog.py (+6/-3)
openlp/plugins/songusage/forms/songusagedeleteform.py (+2/-2)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+5/-2)
openlp/plugins/songusage/forms/songusagedetailform.py (+2/-2)
openlp/plugins/songusage/lib/__init__.py (+2/-2)
openlp/plugins/songusage/lib/db.py (+2/-2)
openlp/plugins/songusage/lib/upgrade.py (+2/-2)
openlp/plugins/songusage/songusageplugin.py (+2/-2)
resources/__init__.py (+2/-2)
resources/images/openlp-2.qrc (+1/-0)
resources/pyinstaller/hook-openlp.core.ui.media.py (+2/-2)
resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py (+2/-2)
resources/pyinstaller/hook-openlp.py (+2/-2)
scripts/check_dependencies.py (+2/-2)
scripts/generate_resources.sh (+2/-2)
scripts/openlp-remoteclient.py (+2/-2)
scripts/resources.patch (+2/-2)
scripts/translation_utils.py (+2/-2)
setup.py (+2/-2)

Low

Fix Released

Link a bug report

Related blueprints

Branch information

Owner:: Raoul Snyman

Project:: OpenLP

Status:: Merged

Recent revisions

2190. By Raoul Snyman on 2014-01-18: Remove .directory file and clean up .bzrignore file
2189. By Raoul Snyman on 2014-01-14: Try to fix bug #1157938 by changing all the png icons to svg
2187. By Raoul Snyman on 2014-01-14: Updated resource file and copyright notice.
2186. By Raoul Snyman on 2014-01-05: Fix bug #1265368 by responding to clicks on both the item and the header, rather than the selection changing, which caused a harmless traceback when controlled from the remote.
2185. By Raoul Snyman on 2014-01-02: Fix bug #1216234 by disabling the layout combobox when a second Bible is selected.
2184. By Raoul Snyman on 2013-12-29: Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
2183. By Raoul Snyman on 2013-12-28: Fix bug #1211049: select a user agent from a list, depending on the platform.
2182. By Raoul Snyman on 2013-12-23: Fix bug #1206886: only write to the socket if it exists
2181. By Raoul Snyman on 2013-12-23: When a user clicks on the row headers (yes, in 4 years no one has done that), the row is selected but the slide doesn't change. This fixes that.

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:openlp

OpenLP

lp:~raoul-snyman/openlp/bug-1157938-2.0

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Subscribers

OpenLP

lp:~raoul-snyman/openlp/bug-1157938-2.0

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers