fix movemode, do not use listboxcontent private variables

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 76e1c822b08a58471b5bb09e68f6da31001f19cf..efe928dd67ac8b46271d4f20cc3810da7a0d1e8c 100644 (file)
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -52,12 +52,6 @@ class ServiceList(HTMLComponent, GUIComponent):
                self.l.setRoot(root)
                self.l.sort()
 
                self.l.setRoot(root)
                self.l.sort()
 

-       def cursorGet(self):
-               return self.l.cursorGet()
-
-       def cursorSet(self, val):
-               self.l.cursorSet(val)
-

 # stuff for multiple marks (edit mode / later multiepg)
        def clearMarks(self):
                self.l.initMarked()
 # stuff for multiple marks (edit mode / later multiepg)
        def clearMarks(self):
                self.l.initMarked()

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 496131bdcb94c4c17044aabef8140aa76e0d3322..fc412a84dccdb055ea3ce39dcdd8ec3f55ec69e9 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -126,10 +126,8 @@ class ChannelSelection(Screen):
                ref=l.getCurrent()
                if ref.valid() and self.mutableList is not None:
                        self.mutableList.removeService(ref)
                ref=l.getCurrent()
                if ref.valid() and self.mutableList is not None:
                        self.mutableList.removeService(ref)

-                       pos = l.cursorGet()

                        self.mutableList.flushChanges() #FIXME dont flush on each single removed service
                        self.setRoot(l.getRoot())
                        self.mutableList.flushChanges() #FIXME dont flush on each single removed service
                        self.setRoot(l.getRoot())

-#                      l.cursorSet(pos) #whats going wrong here????

 
        def endMarkedEdit(self, abort):
                l = self["list"]
 
        def endMarkedEdit(self, abort):
                l = self["list"]


@@ -208,6 +206,8 @@ class ChannelSelection(Screen):
 
        def toggleMoveMode(self):
                if self.movemode:
 
        def toggleMoveMode(self):
                if self.movemode:

+                       if self.entry_marked:
+                               self.channelSelected() # unmark current entry

                        self.movemode = False
                        self.mutableList.flushChanges() # FIXME add check if changes was made
                else:
                        self.movemode = False
                        self.mutableList.flushChanges() # FIXME add check if changes was made
                else:

diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index e65ffc8d9353023da8f56251a82e43f87f8af1fd..d64805c5ed4eef64586f66a27b8526cb538a628d 100644 (file)
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -48,13 +48,14 @@ public:
        void sort();
 
        int setCurrentMarked(bool);
        void sort();
 
        int setCurrentMarked(bool);

-       int cursorSet(int n);
-       int cursorGet();
+

 protected:
        void cursorHome();
        void cursorEnd();
        int cursorMove(int count=1);
        int cursorValid();
 protected:
        void cursorHome();
        void cursorEnd();
        int cursorMove(int count=1);
        int cursorValid();

+       int cursorSet(int n);
+       int cursorGet();

 
        void cursorSave();
        void cursorRestore();
 
        void cursorSave();
        void cursorRestore();