openlp-core team mailing list archive

[Arjan Schrijver <arjan@xxxxxxxxxx>]

Arjan Schrijver has proposed merging lp:~arjan-i/openlp/images_groups_bugfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~arjan-i/openlp/images_groups_bugfixes/+merge/154306

- Fixed small bug that removed the path from newly added media and presentations
- Fixed keyboard shortcuts in images treeview
-- 
https://code.launchpad.net/~arjan-i/openlp/images_groups_bugfixes/+merge/154306
Your team OpenLP Core is requested to review the proposed merge of lp:~arjan-i/openlp/images_groups_bugfixes into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2013-03-18 14:11:58 +0000
+++ openlp/core/lib/mediamanageritem.py	2013-03-20 09:35:43 +0000
@@ -365,7 +365,7 @@
                 duplicates_found = True
             else:
                 files_added = True
-                full_list.append(filename)
+                full_list.append(file_path)
         if full_list and files_added:
             if target_group is None:
                 self.listView.clear()

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2013-03-18 22:04:09 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2013-03-20 09:35:43 +0000
@@ -116,25 +116,28 @@
             create_widget_action(self.listView, separator=True)
         if self.hasDeleteIcon:
             create_widget_action(self.listView,
+                u'listView%s%sItem' % (self.plugin.name.title(), StringContent.Delete.title()),
                 text=self.plugin.getString(StringContent.Delete)[u'title'],
                 icon=u':/general/general_delete.png',
-                shortcuts=[QtCore.Qt.Key_Delete], triggers=self.onDeleteClick)
+                can_shortcuts=True, triggers=self.onDeleteClick)
             create_widget_action(self.listView, separator=True)
         create_widget_action(self.listView,
+            u'listView%s%sItem' % (self.plugin.name.title(), StringContent.Preview.title()),
             text=self.plugin.getString(StringContent.Preview)[u'title'],
             icon=u':/general/general_preview.png',
-            shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return],
+            can_shortcuts=True,
             triggers=self.onPreviewClick)
         create_widget_action(self.listView,
+            u'listView%s%sItem' % (self.plugin.name.title(), StringContent.Live.title()),
             text=self.plugin.getString(StringContent.Live)[u'title'],
             icon=u':/general/general_live.png',
-            shortcuts=[QtCore.Qt.ShiftModifier | QtCore.Qt.Key_Enter,
-            QtCore.Qt.ShiftModifier | QtCore.Qt.Key_Return],
+            can_shortcuts=True,
             triggers=self.onLiveClick)
         create_widget_action(self.listView,
+            u'listView%s%sItem' % (self.plugin.name.title(), StringContent.Service.title()),
+            can_shortcuts=True,
             text=self.plugin.getString(StringContent.Service)[u'title'],
             icon=u':/general/general_add.png',
-            shortcuts=[QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal],
             triggers=self.onAddClick)
         if self.addToServiceItem:
             create_widget_action(self.listView, separator=True)