X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fcycle.py;h=f77f3d8ad40bb44a397b5db1a122c880fc246597;hb=ccc5f020514e9c3e0a2a8e858eacc6d0140675a3;hp=f29bf23ebb1832a7b1e1a59139d6297aaabff7d5;hpb=3c82ae888de284af39fa415f291e5e08028ca5b7;p=chaz%2Fopenbox

diff --git a/scripts/cycle.py b/scripts/cycle.py
index f29bf23e..f77f3d8a 100644
--- a/scripts/cycle.py
+++ b/scripts/cycle.py
@@ -1,4 +1,4 @@
-import ob, otk
+import ob, otk, config
 class _Cycle:
     """
     This is a basic cycling class for anything, from xOr's stackedcycle.py, 
@@ -298,7 +298,8 @@ class _CycleWindows(_Cycle):
 
         if not client.normal(): return 0
         if not (client.canFocus() or client.focusNotify()): return 0
-        if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
+        if config.get('focus', 'avoid_skip_taskbar') and client.skipTaskbar():
+                      return 0
 
         if client.iconic():
             if self.INCLUDE_ICONS:
@@ -327,7 +328,7 @@ class _CycleWindows(_Cycle):
         if self.INCLUDE_ALL_DESKTOPS:
             d = client.desktop()
             if d == 0xffffffff: d = self.screen.desktop()
-            t = self.screen.desktopName(d) + " - " + t
+            t = self.screen.desktopNames()[d] + " - " + t
 
         return t
     
@@ -390,7 +391,8 @@ class _CycleWindowsLinear(_CycleWindows):
 
         if not client.normal(): return 0
         if not (client.canFocus() or client.focusNotify()): return 0
-        if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
+        if config.get('focus', 'avoid_skip_taskbar') and client.skipTaskbar():
+            return 0
 
         if client.iconic(): return 0
         if self.INCLUDE_OMNIPRESENT and desk == 0xffffffff: return 1
@@ -420,7 +422,7 @@ class _CycleWindowsLinear(_CycleWindows):
         if self.INCLUDE_ALL_DESKTOPS:
             d = client.desktop()
             if d == 0xffffffff: d = self.screen.desktop()
-            t = self.screen.desktopName(d) + " - " + t
+            t = self.screen.desktopNames()[d] + " - " + t
 
         return t
     
@@ -447,9 +449,10 @@ class _CycleDesktops(_Cycle):
         _Cycle.__init__(self)
 
     def populateItems(self):
-        for i in range(self.screen.numDesktops()):
-            self.items.append(
-                _CycleDesktops.Desktop(self.screen.desktopName(i), i))
+        names = self.screen.desktopNames()
+        num = self.screen.numDesktops()
+        for n, i in zip(names[:num], range(num)):
+            self.items.append(_CycleDesktops.Desktop(n, i))
 
     def menuLabel(self, desktop):
         return desktop.name