forked from openlp/openlp
Fixed the displayResults method of SongMediaItem to display 1 song + all authors, rather than an instance of a song for each author of that song.
Fixed up the topics management dialog a bit. Corrected the spacing on the eventreceiver.py file. Corrected the calling of the receiver to use the static methods without creating an instance of the Receiver class each time. bzr-revno: 403
This commit is contained in:
Raoul Snyman
parent
86bde695ea
commit
051b314da8
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
|
||||
<!-- eric4 user project file for project openlp.org 2.0 -->
|
||||
<!-- Saved: 2009-03-07, 23:44:51 -->
|
||||
<!-- Saved: 2009-03-10, 19:41:39 -->
|
||||
<!-- Copyright (C) 2009 Raoul Snyman, raoulsnyman@openlp.org -->
|
||||
<UserProject version="4.0">
|
||||
</UserProject>
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
|
||||
<!-- eric4 tasks file for project openlp.org 2.0 -->
|
||||
<!-- Saved: 2009-03-07, 23:45:01 -->
|
||||
<!-- Saved: 2009-03-10, 19:41:39 -->
|
||||
<Tasks version="4.2">
|
||||
<Task priority="1" completed="False" bugfix="False">
|
||||
<Summary>TODO: what is the tags for bridge, pre-chorus?</Summary>
|
||||
|
||||
@ -1,313 +1,319 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
|
||||
<!-- eric4 project file for project openlp.org 2.0 -->
|
||||
<!-- Saved: 2009-03-08, 15:39:49 -->
|
||||
<!-- Copyright (C) 2009 Raoul Snyman, raoulsnyman@openlp.org -->
|
||||
<Project version="4.6">
|
||||
<Language>en</Language>
|
||||
<ProgLanguage mixed="0">Python</ProgLanguage>
|
||||
<ProjectType>Qt4</ProjectType>
|
||||
<Description></Description>
|
||||
<Version>1.9.0</Version>
|
||||
<Author>Raoul Snyman</Author>
|
||||
<Email>raoulsnyman@openlp.org</Email>
|
||||
<Sources>
|
||||
<Source>openlp.pyw</Source>
|
||||
<Source>openlp/controls/__init__.py</Source>
|
||||
<Source>openlp/core/test/test_render_theme.py</Source>
|
||||
<Source>openlp/core/test/test_render.py</Source>
|
||||
<Source>openlp/core/interpolate.py</Source>
|
||||
<Source>openlp/core/__init__.py</Source>
|
||||
<Source>openlp/core/render.py</Source>
|
||||
<Source>openlp/__init__.py</Source>
|
||||
<Source>demo.py</Source>
|
||||
<Source>openlp/core/settingsmanager.py</Source>
|
||||
<Source>openlp/plugins/__init__.py</Source>
|
||||
<Source>openlp/core/pluginmanager.py</Source>
|
||||
<Source>openlp/core/ui/__init__.py</Source>
|
||||
<Source>openlp/core/ui/mainwindow.py</Source>
|
||||
<Source>openlp/core/ui/splashscreen.py</Source>
|
||||
<Source>openlp/core/ui/alertform.py</Source>
|
||||
<Source>openlp/core/ui/about.py</Source>
|
||||
<Source>openlp/plugins/songs/songsplugin.py</Source>
|
||||
<Source>openlp/plugins/songs/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/openlpimportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editsongform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/opensongexportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/openlpexportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/opensongimportform.py</Source>
|
||||
<Source>openlp/core/utils/__init__.py</Source>
|
||||
<Source>openlp/core/theme/__init__.py</Source>
|
||||
<Source>openlp/core/theme/theme.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_opensong.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_basic.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_verse.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_text.py</Source>
|
||||
<Source>openlp/core/theme/test/test_theme.py</Source>
|
||||
<Source>openlp/core/resources.py</Source>
|
||||
<Source>openlp/core/lib/__init__.py</Source>
|
||||
<Source>openlp/core/lib/xmlrootclass.py</Source>
|
||||
<Source>openlp/core/lib/plugin.py</Source>
|
||||
<Source>openlp/core/lib/mediamanageritem.py</Source>
|
||||
<Source>openlp/core/lib/event.py</Source>
|
||||
<Source>openlp/core/utils/confighelper.py</Source>
|
||||
<Source>openlp/core/utils/winregistry.py</Source>
|
||||
<Source>openlp/core/utils/registry.py</Source>
|
||||
<Source>openlp/core/utils/linregistry.py</Source>
|
||||
<Source>setup.py</Source>
|
||||
<Source>openlp/core/lib/pluginconfig.py</Source>
|
||||
<Source>openlp/core/test/test_plugin_manager.py</Source>
|
||||
<Source>openlp/core/test/test_mediamanageritem.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin1.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin2/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin2/testplugin2.py</Source>
|
||||
<Source>openlp/plugins/bibles/bibleplugin.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/bibleimportdialog.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/bibleimportform.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleDBimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleOSISimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleHTTPimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleCSVimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/songxml.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/models.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerAPI.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManager.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerOSIS.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerCSV.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/pptview.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/impresscom.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/powerpoint.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/pptviewlib/ppttest.py</Source>
|
||||
<Source>openlp/plugins/presentations/__init__.py</Source>
|
||||
<Source>openlp/plugins/presentations/presentationplugin.py</Source>
|
||||
<Source>openlp/plugins/videos/__init__.py</Source>
|
||||
<Source>openlp/plugins/videos/videoplugin.py</Source>
|
||||
<Source>openlp/plugins/images/__init__.py</Source>
|
||||
<Source>openlp/plugins/images/imageplugin.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editsongdialog.py</Source>
|
||||
<Source>openlp/core/lib/pluginutils.py</Source>
|
||||
<Source>openlpcnv.pyw</Source>
|
||||
<Source>openlp/plugins/songs/forms/songbookdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/topicsdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/authorsdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/topicsform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/authorsform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/songbookform.py</Source>
|
||||
<Source>openlp/migration/__init__.py</Source>
|
||||
<Source>openlp/migration/migratefiles.py</Source>
|
||||
<Source>openlp/migration/migratesongs.py</Source>
|
||||
<Source>openlp/migration/display.py</Source>
|
||||
<Source>openlp/migration/migratebibles.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/common.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/meta.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/toodeep/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/toodeep/plugin3toodeep.py</Source>
|
||||
<Source>openlp/core/lib/serviceitem.py</Source>
|
||||
<Source>openlp/core/ui/slidecontroller.py</Source>
|
||||
<Source>openlp/core/lib/eventreceiver.py</Source>
|
||||
<Source>openlp/core/ui/servicemanager.py</Source>
|
||||
<Source>openlp/core/lib/toolbar.py</Source>
|
||||
<Source>openlp/core/ui/settingsform.py</Source>
|
||||
<Source>openlp/core/ui/generaltab.py</Source>
|
||||
<Source>openlp/core/ui/themestab.py</Source>
|
||||
<Source>openlp/core/ui/alertstab.py</Source>
|
||||
<Source>openlp/core/ui/settingsdialog.py</Source>
|
||||
<Source>openlp/core/lib/settingstab.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/biblestab.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/songstab.py</Source>
|
||||
<Source>openlp/plugins/videos/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/videos/lib/videotab.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/biblemediaitem.py</Source>
|
||||
<Source>openlp/core/ui/test/test_service_manager.py</Source>
|
||||
<Source>openlp/plugins/images/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/images/lib/imageserviceitem.py</Source>
|
||||
<Source>openlp/plugins/images/lib/listwithpreviews.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editverseform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editversedialog.py</Source>
|
||||
<Source>openlp/plugins/custom/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/customplugin.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/editcustomform.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/editcustomdialog.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/customtab.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/custommediaitem.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/meta.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/models.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/images/lib/mediaitem.py</Source>
|
||||
</Sources>
|
||||
<Forms>
|
||||
<Form>resources/forms/openlpexportform.ui</Form>
|
||||
<Form>resources/forms/opensongexportform.ui</Form>
|
||||
<Form>resources/forms/about.ui</Form>
|
||||
<Form>resources/forms/settings.ui</Form>
|
||||
<Form>resources/forms/themewizard.ui</Form>
|
||||
<Form>resources/forms/opensongimportform.ui</Form>
|
||||
<Form>resources/forms/alertform.ui</Form>
|
||||
<Form>resources/forms/mainwindow.ui</Form>
|
||||
<Form>resources/forms/songexport.ui</Form>
|
||||
<Form>resources/forms/openlpimportform.ui</Form>
|
||||
<Form>resources/forms/splashscreen.ui</Form>
|
||||
<Form>resources/forms/authorsdialog.ui</Form>
|
||||
<Form>resources/forms/bibleimportdialog.ui</Form>
|
||||
<Form>resources/forms/songbookdialog.ui</Form>
|
||||
<Form>resources/forms/topicsdialog.ui</Form>
|
||||
<Form>resources/forms/editsongdialog.ui</Form>
|
||||
<Form>resources/forms/editversedialog.ui</Form>
|
||||
<Form>resources/forms/editcustomdialog.ui</Form>
|
||||
</Forms>
|
||||
<Translations>
|
||||
</Translations>
|
||||
<Resources>
|
||||
<Resource>resources/images/openlp-2.qrc</Resource>
|
||||
</Resources>
|
||||
<Interfaces>
|
||||
</Interfaces>
|
||||
<Others>
|
||||
<Other>copyright.txt</Other>
|
||||
<Other>documentation/SongFormat.txt</Other>
|
||||
<Other>documentation/pyqt-sql-py2exe.txt</Other>
|
||||
<Other>documentation/PluginDevelopersGuide.txt</Other>
|
||||
</Others>
|
||||
<MainScript>openlp.pyw</MainScript>
|
||||
<Vcs>
|
||||
<VcsType>None</VcsType>
|
||||
<VcsOptions>
|
||||
<dict>
|
||||
<key>
|
||||
<string>add</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>checkout</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>commit</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>diff</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>export</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>global</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>history</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>log</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>remove</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>status</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>tag</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>update</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
</dict>
|
||||
</VcsOptions>
|
||||
<VcsOtherData>
|
||||
<dict>
|
||||
<key>
|
||||
<string>standardLayout</string>
|
||||
</key>
|
||||
<value>
|
||||
<bool>True</bool>
|
||||
</value>
|
||||
</dict>
|
||||
</VcsOtherData>
|
||||
</Vcs>
|
||||
<FiletypeAssociations>
|
||||
<FiletypeAssociation pattern="*.ui" type="FORMS" />
|
||||
<FiletypeAssociation pattern="*.idl" type="INTERFACES" />
|
||||
<FiletypeAssociation pattern="*.qm" type="TRANSLATIONS" />
|
||||
<FiletypeAssociation pattern="*.ptl" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.pyw" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.ui.h" type="FORMS" />
|
||||
<FiletypeAssociation pattern="*.ts" type="TRANSLATIONS" />
|
||||
<FiletypeAssociation pattern="*.py" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.qrc" type="RESOURCES" />
|
||||
</FiletypeAssociations>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
|
||||
<!-- eric4 project file for project openlp.org 2.0 -->
|
||||
<!-- Saved: 2009-03-09, 22:34:51 -->
|
||||
<!-- Copyright (C) 2009 Raoul Snyman, raoulsnyman@openlp.org -->
|
||||
<Project version="4.6">
|
||||
<Language>en</Language>
|
||||
<ProgLanguage mixed="0">Python</ProgLanguage>
|
||||
<ProjectType>Qt4</ProjectType>
|
||||
<Description></Description>
|
||||
<Version>1.9.0</Version>
|
||||
<Author>Raoul Snyman</Author>
|
||||
<Email>raoulsnyman@openlp.org</Email>
|
||||
<Sources>
|
||||
<Source>openlp.pyw</Source>
|
||||
<Source>openlp/controls/__init__.py</Source>
|
||||
<Source>openlp/core/test/test_render_theme.py</Source>
|
||||
<Source>openlp/core/test/test_render.py</Source>
|
||||
<Source>openlp/core/interpolate.py</Source>
|
||||
<Source>openlp/core/__init__.py</Source>
|
||||
<Source>openlp/core/render.py</Source>
|
||||
<Source>openlp/__init__.py</Source>
|
||||
<Source>demo.py</Source>
|
||||
<Source>openlp/core/settingsmanager.py</Source>
|
||||
<Source>openlp/plugins/__init__.py</Source>
|
||||
<Source>openlp/core/pluginmanager.py</Source>
|
||||
<Source>openlp/core/ui/__init__.py</Source>
|
||||
<Source>openlp/core/ui/mainwindow.py</Source>
|
||||
<Source>openlp/core/ui/splashscreen.py</Source>
|
||||
<Source>openlp/core/ui/alertform.py</Source>
|
||||
<Source>openlp/core/ui/about.py</Source>
|
||||
<Source>openlp/plugins/songs/songsplugin.py</Source>
|
||||
<Source>openlp/plugins/songs/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/openlpimportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editsongform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/opensongexportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/openlpexportform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/opensongimportform.py</Source>
|
||||
<Source>openlp/core/utils/__init__.py</Source>
|
||||
<Source>openlp/core/theme/__init__.py</Source>
|
||||
<Source>openlp/core/theme/theme.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_opensong.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_basic.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_verse.py</Source>
|
||||
<Source>openlp/plugins/songs/test/test_song_text.py</Source>
|
||||
<Source>openlp/core/theme/test/test_theme.py</Source>
|
||||
<Source>openlp/core/resources.py</Source>
|
||||
<Source>openlp/core/lib/__init__.py</Source>
|
||||
<Source>openlp/core/lib/xmlrootclass.py</Source>
|
||||
<Source>openlp/core/lib/plugin.py</Source>
|
||||
<Source>openlp/core/lib/mediamanageritem.py</Source>
|
||||
<Source>openlp/core/lib/event.py</Source>
|
||||
<Source>openlp/core/utils/confighelper.py</Source>
|
||||
<Source>openlp/core/utils/winregistry.py</Source>
|
||||
<Source>openlp/core/utils/registry.py</Source>
|
||||
<Source>openlp/core/utils/linregistry.py</Source>
|
||||
<Source>setup.py</Source>
|
||||
<Source>openlp/core/lib/pluginconfig.py</Source>
|
||||
<Source>openlp/core/test/test_plugin_manager.py</Source>
|
||||
<Source>openlp/core/test/test_mediamanageritem.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin1.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin2/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/testplugin2/testplugin2.py</Source>
|
||||
<Source>openlp/plugins/bibles/bibleplugin.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/bibleimportdialog.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/bibleimportform.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleDBimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleOSISimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleHTTPimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/bibleCSVimpl.py</Source>
|
||||
<Source>openlp/plugins/bibles/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/songxml.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/models.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/__init__.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerAPI.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManager.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerOSIS.py</Source>
|
||||
<Source>openlp/plugins/bibles/test/test_bibleManagerCSV.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/pptview.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/impresscom.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/powerpoint.py</Source>
|
||||
<Source>openlp/plugins/presentations/lib/pptviewlib/ppttest.py</Source>
|
||||
<Source>openlp/plugins/presentations/__init__.py</Source>
|
||||
<Source>openlp/plugins/presentations/presentationplugin.py</Source>
|
||||
<Source>openlp/plugins/videos/__init__.py</Source>
|
||||
<Source>openlp/plugins/videos/videoplugin.py</Source>
|
||||
<Source>openlp/plugins/images/__init__.py</Source>
|
||||
<Source>openlp/plugins/images/imageplugin.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editsongdialog.py</Source>
|
||||
<Source>openlp/core/lib/pluginutils.py</Source>
|
||||
<Source>openlpcnv.pyw</Source>
|
||||
<Source>openlp/plugins/songs/forms/songbookdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/topicsdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/authorsdialog.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/topicsform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/authorsform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/songbookform.py</Source>
|
||||
<Source>openlp/migration/__init__.py</Source>
|
||||
<Source>openlp/migration/migratefiles.py</Source>
|
||||
<Source>openlp/migration/migratesongs.py</Source>
|
||||
<Source>openlp/migration/display.py</Source>
|
||||
<Source>openlp/migration/migratebibles.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/common.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/meta.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/toodeep/__init__.py</Source>
|
||||
<Source>openlp/core/test/testplugins/deeper/toodeep/plugin3toodeep.py</Source>
|
||||
<Source>openlp/core/lib/serviceitem.py</Source>
|
||||
<Source>openlp/core/ui/slidecontroller.py</Source>
|
||||
<Source>openlp/core/lib/eventreceiver.py</Source>
|
||||
<Source>openlp/core/ui/servicemanager.py</Source>
|
||||
<Source>openlp/core/lib/toolbar.py</Source>
|
||||
<Source>openlp/core/ui/settingsform.py</Source>
|
||||
<Source>openlp/core/ui/generaltab.py</Source>
|
||||
<Source>openlp/core/ui/themestab.py</Source>
|
||||
<Source>openlp/core/ui/alertstab.py</Source>
|
||||
<Source>openlp/core/ui/settingsdialog.py</Source>
|
||||
<Source>openlp/core/lib/settingstab.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/biblestab.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/songstab.py</Source>
|
||||
<Source>openlp/plugins/videos/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/videos/lib/videotab.py</Source>
|
||||
<Source>openlp/plugins/bibles/lib/biblemediaitem.py</Source>
|
||||
<Source>openlp/core/ui/test/test_service_manager.py</Source>
|
||||
<Source>openlp/plugins/images/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/images/lib/imageserviceitem.py</Source>
|
||||
<Source>openlp/plugins/images/lib/listwithpreviews.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editverseform.py</Source>
|
||||
<Source>openlp/plugins/songs/forms/editversedialog.py</Source>
|
||||
<Source>openlp/plugins/custom/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/customplugin.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/editcustomform.py</Source>
|
||||
<Source>openlp/plugins/custom/forms/editcustomdialog.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/__init__.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/customtab.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/classes.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/tables.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/custommediaitem.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/meta.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/models.py</Source>
|
||||
<Source>openlp/plugins/custom/lib/manager.py</Source>
|
||||
<Source>openlp/plugins/images/lib/mediaitem.py</Source>
|
||||
<Source>openlp/plugins/songs/lib/mediaitem.py</Source>
|
||||
<Source>resources/forms/Ui_editsongdialog.py</Source>
|
||||
<Source>resources/forms/Ui_editversedialog.py</Source>
|
||||
<Source>resources/forms/Ui_settings.py</Source>
|
||||
<Source>resources/forms/Ui_authorsdialog.py</Source>
|
||||
<Source>resources/forms/Ui_songbookdialog.py</Source>
|
||||
</Sources>
|
||||
<Forms>
|
||||
<Form>resources/forms/openlpexportform.ui</Form>
|
||||
<Form>resources/forms/opensongexportform.ui</Form>
|
||||
<Form>resources/forms/about.ui</Form>
|
||||
<Form>resources/forms/settings.ui</Form>
|
||||
<Form>resources/forms/themewizard.ui</Form>
|
||||
<Form>resources/forms/opensongimportform.ui</Form>
|
||||
<Form>resources/forms/alertform.ui</Form>
|
||||
<Form>resources/forms/mainwindow.ui</Form>
|
||||
<Form>resources/forms/songexport.ui</Form>
|
||||
<Form>resources/forms/openlpimportform.ui</Form>
|
||||
<Form>resources/forms/splashscreen.ui</Form>
|
||||
<Form>resources/forms/authorsdialog.ui</Form>
|
||||
<Form>resources/forms/bibleimportdialog.ui</Form>
|
||||
<Form>resources/forms/songbookdialog.ui</Form>
|
||||
<Form>resources/forms/topicsdialog.ui</Form>
|
||||
<Form>resources/forms/editsongdialog.ui</Form>
|
||||
<Form>resources/forms/editversedialog.ui</Form>
|
||||
<Form>resources/forms/editcustomdialog.ui</Form>
|
||||
</Forms>
|
||||
<Translations>
|
||||
</Translations>
|
||||
<Resources>
|
||||
<Resource>resources/images/openlp-2.qrc</Resource>
|
||||
</Resources>
|
||||
<Interfaces>
|
||||
</Interfaces>
|
||||
<Others>
|
||||
<Other>copyright.txt</Other>
|
||||
<Other>documentation/SongFormat.txt</Other>
|
||||
<Other>documentation/pyqt-sql-py2exe.txt</Other>
|
||||
<Other>documentation/PluginDevelopersGuide.txt</Other>
|
||||
</Others>
|
||||
<MainScript>openlp.pyw</MainScript>
|
||||
<Vcs>
|
||||
<VcsType>Subversion</VcsType>
|
||||
<VcsOptions>
|
||||
<dict>
|
||||
<key>
|
||||
<string>add</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>checkout</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>commit</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>diff</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>export</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>global</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>history</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>log</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>remove</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>status</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>tag</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
<key>
|
||||
<string>update</string>
|
||||
</key>
|
||||
<value>
|
||||
<list>
|
||||
<string></string>
|
||||
</list>
|
||||
</value>
|
||||
</dict>
|
||||
</VcsOptions>
|
||||
<VcsOtherData>
|
||||
<dict>
|
||||
<key>
|
||||
<string>standardLayout</string>
|
||||
</key>
|
||||
<value>
|
||||
<bool>True</bool>
|
||||
</value>
|
||||
</dict>
|
||||
</VcsOtherData>
|
||||
</Vcs>
|
||||
<FiletypeAssociations>
|
||||
<FiletypeAssociation pattern="*.ui" type="FORMS" />
|
||||
<FiletypeAssociation pattern="*.idl" type="INTERFACES" />
|
||||
<FiletypeAssociation pattern="*.qm" type="TRANSLATIONS" />
|
||||
<FiletypeAssociation pattern="*.ptl" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.pyw" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.ui.h" type="FORMS" />
|
||||
<FiletypeAssociation pattern="*.ts" type="TRANSLATIONS" />
|
||||
<FiletypeAssociation pattern="*.py" type="SOURCES" />
|
||||
<FiletypeAssociation pattern="*.qrc" type="RESOURCES" />
|
||||
</FiletypeAssociations>
|
||||
</Project>
|
||||
@ -38,8 +38,8 @@ class OpenLP(QtGui.QApplication):
|
||||
|
||||
def run(self):
|
||||
#provide a listener for widgets to reqest a screen update.
|
||||
QtCore.QObject.connect(Receiver().get_receiver(),
|
||||
QtCore.SIGNAL('openlpprocessevents'),self.processEvents)
|
||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||
QtCore.SIGNAL('openlpprocessevents'), self.processEvents)
|
||||
|
||||
self.setApplicationName('openlp.org')
|
||||
self.setApplicationVersion('1.9.0')
|
||||
|
||||
@ -25,14 +25,15 @@ class EventReceiver(QObject):
|
||||
This is a private class and should not be used directly but via the Receiver class
|
||||
"""
|
||||
def __init__(self):
|
||||
QObject.__init__(self)
|
||||
|
||||
QObject.__init__(self)
|
||||
|
||||
def send_message(self, event, msg=None):
|
||||
self.emit(SIGNAL(event), msg)
|
||||
|
||||
|
||||
def received(self, msg=None):
|
||||
print msg
|
||||
|
||||
|
||||
|
||||
class Receiver():
|
||||
"""
|
||||
Class to allow events to be passed from different parts of the system.
|
||||
@ -40,19 +41,21 @@ class Receiver():
|
||||
As there is only one instance of it in the systems the QT signal/slot architecture
|
||||
can send messages across the system
|
||||
Send message
|
||||
Receiver().send_message("messageid",data)
|
||||
|
||||
Receiver().send_message("messageid",data)
|
||||
|
||||
Receive Message
|
||||
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlprepaint"),<<ACTION>>)
|
||||
"""
|
||||
eventreceiver=EventReceiver()
|
||||
QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL("openlprepaint"),<<ACTION>>)
|
||||
"""
|
||||
eventreceiver = EventReceiver()
|
||||
|
||||
@staticmethod
|
||||
def send_message(event, msg=None):
|
||||
Receiver.eventreceiver.send_message(event, msg)
|
||||
|
||||
@staticmethod
|
||||
def receive():
|
||||
Receiver.eventreceiver.receive()
|
||||
@staticmethod
|
||||
|
||||
@staticmethod
|
||||
def get_receiver():
|
||||
return Receiver.eventreceiver
|
||||
|
||||
|
||||
@ -111,17 +111,17 @@ class SongMediaItem(MediaManagerItem):
|
||||
self.SongListView.horizontalHeader().setVisible(False)
|
||||
self.SongListView.verticalHeader().setVisible(False)
|
||||
self.SongListView.setGeometry(QtCore.QRect(10, 100, 256, 591))
|
||||
self.SongListView.setObjectName('listView')
|
||||
self.SongListView.setObjectName('SongListView')
|
||||
self.PageLayout.addWidget(self.SongListView)
|
||||
# Signals and slots
|
||||
QtCore.QObject.connect(self.SearchTextButton,
|
||||
QtCore.SIGNAL("pressed()"), self.onSearchTextButtonClick)
|
||||
QtCore.SIGNAL('pressed()'), self.onSearchTextButtonClick)
|
||||
QtCore.QObject.connect(self.ClearTextButton,
|
||||
QtCore.SIGNAL("pressed()"), self.onClearTextButtonClick)
|
||||
QtCore.SIGNAL('pressed()'), self.onClearTextButtonClick)
|
||||
QtCore.QObject.connect(self.SearchTextEdit,
|
||||
QtCore.SIGNAL("textChanged(const QString&)"), self.onSearchTextEditChanged)
|
||||
QtCore.SIGNAL('textChanged(const QString&)'), self.onSearchTextEditChanged)
|
||||
QtCore.QObject.connect(self.SongListView,
|
||||
QtCore.SIGNAL("itemPressed(QTableWidgetItem * item)"), self.onSongSelected)
|
||||
QtCore.SIGNAL('itemPressed(QTableWidgetItem * item)'), self.onSongSelected)
|
||||
#define and add the context menu
|
||||
self.SongListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
|
||||
self.SongListView.addAction(self.contextMenuAction(self.SongListView,
|
||||
@ -157,15 +157,19 @@ class SongMediaItem(MediaManagerItem):
|
||||
self.SongListView.setRowCount(0)
|
||||
#log.debug("Records returned from search %s", len(searchresults))
|
||||
for song in searchresults:
|
||||
row_count = self.SongListView.rowCount()
|
||||
self.SongListView.setRowCount(row_count + 1)
|
||||
song_index = QtGui.QTableWidgetItem(str(song.id))
|
||||
self.SongListView.setItem(row_count, 0, song_index)
|
||||
author_list = u''
|
||||
for author in song.authors:
|
||||
c = self.SongListView.rowCount()
|
||||
self.SongListView.setRowCount(c + 1)
|
||||
song_index = QtGui.QTableWidgetItem(str(song.id))
|
||||
self.SongListView.setItem(c , 0, song_index)
|
||||
song_detail = QtGui.QTableWidgetItem(
|
||||
u'%s (%s)' % (str(song.title), str(author.display_name)))
|
||||
self.SongListView.setItem(c , 1, song_detail)
|
||||
self.SongListView.setRowHeight(c, 20)
|
||||
if author_list != u'':
|
||||
author_list = author_list + u', '
|
||||
author_list = author_list + author.display_name
|
||||
song_detail = QtGui.QTableWidgetItem(
|
||||
u'%s (%s)' % (str(song.title), str(author_list)))
|
||||
self.SongListView.setItem(row_count, 1, song_detail)
|
||||
self.SongListView.setRowHeight(row_count, 20)
|
||||
|
||||
def onClearTextButtonClick(self):
|
||||
"""
|
||||
|
||||
@ -38,10 +38,10 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" colspan="5" >
|
||||
<item row="0" column="1" colspan="6" >
|
||||
<widget class="QLineEdit" name="TopicNameEdit" />
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2" >
|
||||
<item row="1" column="0" colspan="3" >
|
||||
<spacer name="ButtonsSpacer" >
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
@ -54,7 +54,7 @@
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="4" >
|
||||
<item row="1" column="5" >
|
||||
<widget class="QPushButton" name="DeleteButton" >
|
||||
<property name="toolTip" >
|
||||
<string>Delete Author</string>
|
||||
@ -68,31 +68,31 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2" >
|
||||
<item row="1" column="4" >
|
||||
<widget class="QPushButton" name="AddUpdateButton" >
|
||||
<property name="toolTip" >
|
||||
<string>Add Update Author</string>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Add/Update</string>
|
||||
<string>Save</string>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="../images/openlp-2.qrc" >
|
||||
<normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
|
||||
<normaloff>:/services/service_save.png</normaloff>:/services/service_save.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="5" >
|
||||
<item row="1" column="3" >
|
||||
<widget class="QPushButton" name="ClearButton" >
|
||||
<property name="toolTip" >
|
||||
<string>Clear Selection</string>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Clear</string>
|
||||
<string>New</string>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="../images/openlp-2.qrc" >
|
||||
<normaloff>:/songs/song_edit.png</normaloff>:/songs/song_edit.png</iconset>
|
||||
<normaloff>:/services/service_new.png</normaloff>:/services/service_new.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user