OpenLP

Merge lp:~trb143/openlp/servicing into lp:openlp

  1. servicing
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merge reported by: Tim Bentley
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/servicing
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/servicing
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Martin Thompson (community) Approve
Review via email: mp+6619@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Standalone patch to rename Video plugin to Media Plugin based on a discussion a few weeks ago.
No other changes are included for simplicity

Revision history for this message
Martin Thompson (mjthompson) wrote :

Two or three of suggestions:

Line 147
    - Does it need to be MediaMediaItem - looks a bit weird?
    - Also, should be Select Media item(s)' - the (s) in the wrong place :)
Line 149
   - should be something like self.parent.config.get_last_dir(), u'Media Files (*.avi *.mpeg)')... do we need more file extensions (or sets of) in here, for audio, and other video? And a *.* option?
line 271
   - MediaMediaItem as well
and line 297

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

I see the marks of Find & Replace! I'd suggest just going through the code and fixing the odd place where it says (for instance), "Medias".

review: Approve
lp:~trb143/openlp/servicing updated
455. By Tim Bentley

Close display window on exit
Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.

Revision history for this message
Tim Bentley (trb143) :
review: Approve
lp:~trb143/openlp/servicing updated
456. By Tim Bentley

More code cleanups

457. By Tim Bentley

Add Images to the themes
Fix MainDisplay to record change of frame when blanked out.

458. By Tim Bentley

Rendering fixes

459. By Tim Bentley

hook up themes to combo boxes

460. By Tim Bentley

Corrections to Renderer to handle slides not lines
Fixes to Bibleplugin to renderer multiple verses per slide
Pass Bible Theme to RenderManager

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed directory 'openlp/plugins/videos' => 'openlp/plugins/media'
=== modified file 'openlp/plugins/media/lib/__init__.py'
--- openlp/plugins/videos/lib/__init__.py 2009-03-15 19:31:33 +0000
+++ openlp/plugins/media/lib/__init__.py 2009-05-15 05:15:53 +0000
@@ -19,7 +19,7 @@
19"""19"""
2020
21from filelistdata import FileListData21from filelistdata import FileListData
22from videotab import VideoTab22from mediatab import MediaTab
23from mediaitem import VideoMediaItem23from mediaitem import MediaMediaItem
2424
25__all__ = ['VideoTab', 'VideoMediaItem', 'FileListData']25__all__ = ['MediaTab', 'MediaMediaItem', 'FileListData']
2626
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/videos/lib/mediaitem.py 2009-04-25 06:11:15 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2009-05-15 05:15:53 +0000
@@ -25,16 +25,16 @@
25from openlp.core import translate25from openlp.core import translate
26from openlp.core.lib import MediaManagerItem26from openlp.core.lib import MediaManagerItem
2727
28from openlp.plugins.videos.lib import VideoTab28from openlp.plugins.media.lib import MediaTab
29from openlp.plugins.videos.lib import FileListData29from openlp.plugins.media.lib import FileListData
3030
31class VideoMediaItem(MediaManagerItem):31class MediaMediaItem(MediaManagerItem):
32 """32 """
33 This is the custom media manager item for Custom Slides.33 This is the custom media manager item for Custom Slides.
34 """34 """
35 global log35 global log
36 log=logging.getLogger(u'VideoMediaItem')36 log=logging.getLogger(u'MediaMediaItem')
37 log.info(u'Video Media Item loaded')37 log.info(u'Media Media Item loaded')
3838
39 def __init__(self, parent, icon, title):39 def __init__(self, parent, icon, title):
40 MediaManagerItem.__init__(self, parent, icon, title)40 MediaManagerItem.__init__(self, parent, icon, title)
@@ -43,93 +43,93 @@
43 # Add a toolbar43 # Add a toolbar
44 self.addToolbar()44 self.addToolbar()
45 # Create buttons for the toolbar45 # Create buttons for the toolbar
46 ## New Video Button ##46 ## New Media Button ##
47 self.addToolbarButton(47 self.addToolbarButton(
48 translate('VideoMediaItem',u'New Video'),48 translate('MediaMediaItem',u'New Media'),
49 translate('VideoMediaItem',u'Load videos into openlp.org'),49 translate('MediaMediaItem',u'Load Media into openlp.org'),
50 ':/videos/video_load.png', self.onVideoNewClick, 'VideoNewItem')50 ':/videos/video_load.png', self.onMediaNewClick, 'MediaNewItem')
51 ## Delete Video Button ##51 ## Delete Media Button ##
52 self.addToolbarButton(52 self.addToolbarButton(
53 translate('VideoMediaItem',u'Delete Video'),53 translate('MediaMediaItem',u'Delete Media'),
54 translate('VideoMediaItem',u'Delete the selected video'),54 translate('MediaMediaItem',u'Delete the selected Media item'),
55 ':/videos/video_delete.png', self.onVideoDeleteClick, 'VideoDeleteItem')55 ':/videos/video_delete.png', self.onMediaDeleteClick, 'MediaDeleteItem')
56 ## Separator Line ##56 ## Separator Line ##
57 self.addToolbarSeparator()57 self.addToolbarSeparator()
58 ## Preview Video Button ##58 ## Preview Media Button ##
59 self.addToolbarButton(59 self.addToolbarButton(
60 translate('VideoMediaItem',u'Preview Video'),60 translate('MediaMediaItem',u'Preview Media'),
61 translate('VideoMediaItem',u'Preview the selected video'),61 translate('MediaMediaItem',u'Preview the selected Media item'),
62 ':/system/system_preview.png', self.onVideoPreviewClick, 'VideoPreviewItem')62 ':/system/system_preview.png', self.onMediaPreviewClick, 'MediaPreviewItem')
63 ## Live Video Button ##63 ## Live Media Button ##
64 self.addToolbarButton(64 self.addToolbarButton(
65 translate('VideoMediaItem',u'Go Live'),65 translate('MediaMediaItem',u'Go Live'),
66 translate('VideoMediaItem',u'Send the selected video live'),66 translate('MediaMediaItem',u'Send the selected Media item live'),
67 ':/system/system_live.png', self.onVideoLiveClick, 'VideoLiveItem')67 ':/system/system_live.png', self.onMediaLiveClick, 'MediaLiveItem')
68 ## Add Video Button ##68 ## Add Media Button ##
69 self.addToolbarButton(69 self.addToolbarButton(
70 translate('VideoMediaItem',u'Add Video To Service'),70 translate('MediaMediaItem',u'Add Media To Service'),
71 translate('VideoMediaItem',u'Add the selected video(s) to the service'),71 translate('MediaMediaItem',u'Add the selected Media items(s) to the service'),
72 ':/system/system_add.png',self.onVideoAddClick, 'VideoAddItem')72 ':/system/system_add.png',self.onMediaAddClick, 'MediaAddItem')
73 ## Add the videolist widget ##73 ## Add the Medialist widget ##
7474
75 self.VideoListView = QtGui.QListView()75 self.MediaListView = QtGui.QListView()
76 self.VideoListView.setAlternatingRowColors(True)76 self.MediaListView.setAlternatingRowColors(True)
77 self.VideoListData = FileListData()77 self.MediaListData = FileListData()
78 self.VideoListView.setModel(self.VideoListData)78 self.MediaListView.setModel(self.MediaListData)
7979
80 self.PageLayout.addWidget(self.VideoListView)80 self.PageLayout.addWidget(self.MediaListView)
8181
82 #define and add the context menu82 #define and add the context menu
83 self.VideoListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)83 self.MediaListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
8484
85 self.VideoListView.addAction(self.contextMenuAction(85 self.MediaListView.addAction(self.contextMenuAction(
86 self.VideoListView, ':/system/system_preview.png',86 self.MediaListView, ':/system/system_preview.png',
87 translate('VideoMediaItem',u'&Preview Video'), self.onVideoPreviewClick))87 translate('MediaMediaItem',u'&Preview Media'), self.onMediaPreviewClick))
88 self.VideoListView.addAction(self.contextMenuAction(88 self.MediaListView.addAction(self.contextMenuAction(
89 self.VideoListView, ':/system/system_live.png',89 self.MediaListView, ':/system/system_live.png',
90 translate('VideoMediaItem',u'&Show Live'), self.onVideoLiveClick))90 translate('MediaMediaItem',u'&Show Live'), self.onMediaLiveClick))
91 self.VideoListView.addAction(self.contextMenuAction(91 self.MediaListView.addAction(self.contextMenuAction(
92 self.VideoListView, ':/system/system_add.png',92 self.MediaListView, ':/system/system_add.png',
93 translate('VideoMediaItem',u'&Add to Service'), self.onVideoAddClick))93 translate('MediaMediaItem',u'&Add to Service'), self.onMediaAddClick))
9494
95 def initialise(self):95 def initialise(self):
96 list = self.parent.config.load_list(u'videos')96 list = self.parent.config.load_list(u'Medias')
97 self.loadVideoList(list)97 self.loadMediaList(list)
9898
99 def onVideoNewClick(self):99 def onMediaNewClick(self):
100 files = QtGui.QFileDialog.getOpenFileNames(None,100 files = QtGui.QFileDialog.getOpenFileNames(None,
101 translate('VideoMediaItem', u'Select Video(s)'),101 translate('MediaMediaItem', u'Select Media(s) items'),
102 self.parent.config.get_last_dir(), u'Images (*.avi *.mpeg)')102 self.parent.config.get_last_dir(), u'Images (*.avi *.mpeg)')
103 if len(files) > 0:103 if len(files) > 0:
104 self.loadVideoList(files)104 self.loadMediaList(files)
105 dir, filename = os.path.split(str(files[0]))105 dir, filename = os.path.split(str(files[0]))
106 self.parent.config.set_last_dir(dir)106 self.parent.config.set_last_dir(dir)
107 self.parent.config.set_list(u'videos', self.VideoListData.getFileList())107 self.parent.config.set_list(u'media', self.MediaListData.getFileList())
108108
109 def getFileList(self):109 def getFileList(self):
110 filelist = [item[0] for item in self.VideoListView];110 filelist = [item[0] for item in self.MediaListView];
111 return filelist111 return filelist
112112
113 def loadVideoList(self, list):113 def loadMediaList(self, list):
114 for files in list:114 for files in list:
115 self.VideoListData.addRow(files)115 self.MediaListData.addRow(files)
116116
117 def onVideoDeleteClick(self):117 def onMediaDeleteClick(self):
118 indexes = self.VideoListView.selectedIndexes()118 indexes = self.MediaListView.selectedIndexes()
119 for index in indexes:119 for index in indexes:
120 current_row = int(index.row())120 current_row = int(index.row())
121 self.VideoListData.removeRow(current_row)121 self.MediaListData.removeRow(current_row)
122 self.parent.config.set_list(u'videos', self.VideoListData.getFileList())122 self.parent.config.set_list(u'media', self.MediaListData.getFileList())
123123
124 def onVideoPreviewClick(self):124 def onMediaPreviewClick(self):
125 log.debug(u'Video Preview Button pressed')125 log.debug(u'Media Preview Button pressed')
126 items = self.VideoListView.selectedIndexes()126 items = self.MediaListView.selectedIndexes()
127 for item in items:127 for item in items:
128 text = self.VideoListData.getValue(item)128 text = self.MediaListData.getValue(item)
129 print text129 print text
130130
131 def onVideoLiveClick(self):131 def onMediaLiveClick(self):
132 pass132 pass
133133
134 def onVideoAddClick(self):134 def onMediaAddClick(self):
135 pass135 pass
136136
=== renamed file 'openlp/plugins/videos/lib/videotab.py' => 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/videos/lib/videotab.py 2009-04-15 04:58:51 +0000
+++ openlp/plugins/media/lib/mediatab.py 2009-05-15 05:15:53 +0000
@@ -24,39 +24,39 @@
24from openlp import convertStringToBoolean24from openlp import convertStringToBoolean
25from openlp.core.lib import SettingsTab25from openlp.core.lib import SettingsTab
2626
27class VideoTab(SettingsTab):27class MediaTab(SettingsTab):
28 """28 """
29 VideoTab is the video settings tab in the settings dialog.29 mediaTab is the media settings tab in the settings dialog.
30 """30 """
31 def __init__(self):31 def __init__(self):
32 SettingsTab.__init__(self, u'Videos')32 SettingsTab.__init__(self, u'Media')
3333
34 def setupUi(self):34 def setupUi(self):
35 self.setObjectName(u'VideoTab')35 self.setObjectName(u'MediaTab')
3636
37 self.VideoLayout = QtGui.QFormLayout(self)37 self.MediaLayout = QtGui.QFormLayout(self)
38 self.VideoLayout.setObjectName("VideoLayout")38 self.MediaLayout.setObjectName("MediaLayout")
3939
40 self.VideoModeGroupBox = QtGui.QGroupBox(self)40 self.MediaModeGroupBox = QtGui.QGroupBox(self)
41 self.VideoModeGroupBox.setObjectName("VideoModeGroupBox")41 self.MediaModeGroupBox.setObjectName("MediaModeGroupBox")
42 self.VideoModeLayout = QtGui.QVBoxLayout(self.VideoModeGroupBox)42 self.MediaModeLayout = QtGui.QVBoxLayout(self.MediaModeGroupBox)
43 self.VideoModeLayout.setSpacing(8)43 self.MediaModeLayout.setSpacing(8)
44 self.VideoModeLayout.setMargin(8)44 self.MediaModeLayout.setMargin(8)
45 self.VideoModeLayout.setObjectName("VideoModeLayout")45 self.MediaModeLayout.setObjectName("MediaModeLayout")
46 self.UseVMRCheckBox = QtGui.QCheckBox(self.VideoModeGroupBox)46 self.UseVMRCheckBox = QtGui.QCheckBox(self.MediaModeGroupBox)
47 self.UseVMRCheckBox.setObjectName("UseVMRCheckBox")47 self.UseVMRCheckBox.setObjectName("UseVMRCheckBox")
48 self.VideoModeLayout.addWidget(self.UseVMRCheckBox)48 self.MediaModeLayout.addWidget(self.UseVMRCheckBox)
49 self.UseVMRLabel = QtGui.QLabel(self.VideoModeGroupBox)49 self.UseVMRLabel = QtGui.QLabel(self.MediaModeGroupBox)
50 self.UseVMRLabel.setObjectName("UseVMRLabel")50 self.UseVMRLabel.setObjectName("UseVMRLabel")
51 self.VideoModeLayout.addWidget(self.UseVMRLabel)51 self.MediaModeLayout.addWidget(self.UseVMRLabel)
5252
53 self.VideoLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VideoModeGroupBox)53 self.MediaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox)
54 # Signals and slots54 # Signals and slots
55 QtCore.QObject.connect(self.UseVMRCheckBox,55 QtCore.QObject.connect(self.UseVMRCheckBox,
56 QtCore.SIGNAL("stateChanged(int)"), self.onVMRCheckBoxChanged)56 QtCore.SIGNAL("stateChanged(int)"), self.onVMRCheckBoxChanged)
5757
58 def retranslateUi(self):58 def retranslateUi(self):
59 self.VideoModeGroupBox.setTitle(translate("SettingsForm", "Video Mode"))59 self.MediaModeGroupBox.setTitle(translate("SettingsForm", "Media Mode"))
60 self.UseVMRCheckBox.setText(translate("SettingsForm", "Use Video Mode Rendering"))60 self.UseVMRCheckBox.setText(translate("SettingsForm", "Use Video Mode Rendering"))
61 self.UseVMRLabel.setText(translate("SettingsForm", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"61 self.UseVMRLabel.setText(translate("SettingsForm", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
62"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"62"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
6363
=== renamed file 'openlp/plugins/videos/videoplugin.py' => 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/videos/videoplugin.py 2009-03-22 07:13:34 +0000
+++ openlp/plugins/media/mediaplugin.py 2009-05-15 05:15:53 +0000
@@ -22,13 +22,13 @@
2222
23from openlp.core.resources import *23from openlp.core.resources import *
24from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab24from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab
25from openlp.plugins.videos.lib import VideoTab, VideoMediaItem25from openlp.plugins.media.lib import MediaTab,MediaMediaItem
2626
27class VideoPlugin(Plugin):27class MediaPlugin(Plugin):
2828
29 def __init__(self, plugin_helpers):29 def __init__(self, plugin_helpers):
30 # Call the parent constructor30 # Call the parent constructor
31 Plugin.__init__(self, u'Videos', u'1.9.0', plugin_helpers)31 Plugin.__init__(self, u'Media', u'1.9.0', plugin_helpers)
32 self.weight = -632 self.weight = -6
33 # Create the plugin icon33 # Create the plugin icon
34 self.icon = QtGui.QIcon()34 self.icon = QtGui.QIcon()
@@ -36,11 +36,11 @@
36 QtGui.QIcon.Normal, QtGui.QIcon.Off)36 QtGui.QIcon.Normal, QtGui.QIcon.Off)
3737
38 def get_settings_tab(self):38 def get_settings_tab(self):
39 self.VideosTab = VideoTab()39 self.MediaTab = MediaTab()
40 return self.VideosTab40 return self.MediaTab
4141
42 def get_media_manager_item(self):42 def get_media_manager_item(self):
43 # Create the MediaManagerItem object43 # Create the MediaManagerItem object
44 self.media_item = VideoMediaItem(self, self.icon, u'Videos')44 self.media_item = MediaMediaItem(self, self.icon, u'Media')
45 return self.media_item 45 return self.media_item
46 46