Merge lp:~oliwee/openlp/bug-1247025 into lp:openlp

[Oliver Wieland]

Fixes bug #1247025
Changes the position where a new item will be inserted in the service list via drag'n'drop

Example: service list
A
B
C

item D will be dropped on B's position:
A
B D
C

Before:
A
B
D
C

After:
A
D
B
C

[Oliver Wieland (oliwee)]

This merge proposal works on all positions in the service list, but not on position '0'. This is because in servicemananager.py. line 1300, the position 0 will be handled in a special way.
But I have no idea when this case would be true (without my changes). Could somebody please explain if this case becomes true at all?

review: Needs Information

[Jonathan Corwin (j-corwin)]

This behaviour has been bugging me forever, glad someone has been brave enough to dive in! :)

Have you tried out all the various scenarios such as when adding multiple images as a group, dropping in an image group and either side of it, ensuring things are OK when expanded, etc?

[Oliver Wieland (oliwee)]

> Have you tried out all the various scenarios such as when adding multiple
> images as a group, dropping in an image group and either side of it, ensuring
> things are OK when expanded, etc?
Not yet. First step for me is to make it working with one item. Multiple selections will not work yet. The other things will come later on...

[Oliver Wieland (oliwee)]

By the way, inserting multiple selections via drag'n'drop does not work on trunk either...

[Oliver Wieland (oliwee)]

Inserting of multiple selection works now, even on position 0

[Tim Bentley (trb143)]

Sorry while this fixes it I am not happy with mediamanageritem updating service manager fields directly.
Pass the value as optional in add_to_service please.

review: Needs Fixing

[Oliver Wieland (oliwee)]

By testing this code, I remarked a strange behaviour on multiselecting songs:

In the media manager, there are following songs:
A
B
C
D
E
F
G
H

When selecting the songs A to D and add them to the service list via the context menu , the order in the service list is
A
B
C
D

When selecting the songs E to H and add them to the service list in the same matter, I get the order
H
E
F
G

This behaviour confuses me...

[Raoul Snyman (raoul-snyman)]

Are you going to look into this further?

review: Needs Information

[Oliver Wieland (oliwee)]

> Are you going to look into this further?
This behaviour seems to be independent of my code, so I will create a New bug report E
when I'm at home again.

[Samuel Mehrbrodt (sam92)]

@Oliver: Are you going to continue work on this?
Else I can take it over. Just let me know.

[Tim Bentley (trb143)]

Too old and out of date.
If this is still a problem please fix and resubmit.

Unmerged revisions

2314. By Oliver Wieland on 2013-11-01

Make adding items to service list via context menu work again
Added setter / getter for drop_position to class ServiceManager

2313. By Oliver Wieland on 2013-11-01

fix insertion on position '0'

2312. By Oliver Wieland on 2013-11-01

fix inserting multiple selection into service list via drag'n'drop

2311. By Oliver Wieland on 2013-11-01

correction of setting position

2310. By Oliver Wieland on 2013-11-01

changed insert position for inserting an item to the service list via drag'n'drop

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2013-10-13 20:36:42 +0000
+++ openlp/core/lib/mediamanageritem.py	2013-11-01 12:59:50 +0000
@@ -545,8 +545,13 @@
                 self.add_to_service(replace=self.remote_triggered)
             else:
                 items = self.list_view.selectedIndexes()
+                _drop_position = self.service_manager.get_drop_position()
                 for item in items:
+                    self.service_manager.set_drop_position(_drop_position)
                     self.add_to_service(item)
+                    if _drop_position != -1:
+                        _drop_position += 1
+                    
 
     def add_to_service_remote(self, message):
         """

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-10-13 21:07:28 +0000
+++ openlp/core/ui/servicemanager.py	2013-11-01 12:59:50 +0000
@@ -299,7 +299,7 @@
         Registry().register('service_manager', self)
         self.service_items = []
         self.suffixes = []
-        self.drop_position = 0
+        self.drop_position = -1
         self.service_id = 0
         # is a new service and has not been saved
         self._modified = False
@@ -1274,7 +1274,7 @@
                 self.live_controller.replace_service_manager_item(newItem)
                 self.set_modified()
 
-    def add_service_item(self, item, rebuild=False, expand=None, replace=False, repaint=True, selected=False):
+    def add_service_item(self, item, rebuild=False, expand=None, replace=False, repaint=True, selected=False, position=-1):
         """
         Add a Service item to the list
 
@@ -1297,7 +1297,7 @@
         else:
             item.render()
             # nothing selected for dnd
-            if self.drop_position == 0:
+            if self.drop_position == -1:
                 if isinstance(item, list):
                     for inditem in item:
                         self.service_items.append({'service_item': inditem,
@@ -1317,7 +1317,7 @@
             # if rebuilding list make sure live is fixed.
             if rebuild:
                 self.live_controller.replace_service_manager_item(item)
-        self.drop_position = 0
+        self.drop_position = -1
         self.set_modified()
 
     def make_preview(self):
@@ -1480,7 +1480,7 @@
                             item.setSelected(True)
                             replace = True
                     else:
-                        self.drop_position = self._get_parent_item_data(item)
+                        self.drop_position = self._get_parent_item_data(item) - 1
                 Registry().execute('%s_add_service_item' % plugin, replace)
 
     def update_theme_list(self, theme_list):
@@ -1602,4 +1602,18 @@
                 self._application = Registry().get('application')
             return self._application
 
+    def get_drop_position(self):
+        """
+        Getter for drop_position
+        Used in: MediaManagerItem
+        """
+        return self.drop_position
+        
+    def set_drop_position(self,  drop_position):
+        """
+        Setter for drop_position
+        Used in: MediaManagerItem
+        """
+        self.drop_position = drop_position
+        
     application = property(_get_application)