Moving pie menus into the utils

[ejpi] / src / plugin_utils.py

diff --git a/src/plugin_utils.py b/src/plugin_utils.py
index 4110e42..087f8db 100644 (file)
--- a/src/plugin_utils.py
+++ b/src/plugin_utils.py
@@ -9,7 +9,7 @@ import os
 import inspect
 import ConfigParser
 
-from libraries import gtkpieboard
+from util import qtpieboard
 from util import io
 import operation
 
@@ -33,18 +33,16 @@ class PieKeyboardPlugin(object):
                self.factory = factory
                self.__handler = None
 
-       def setup(self, calcStack, style, boardHandler):
+       def setup(self, calcStack, boardHandler):
                self.__handler = boardHandler
 
-               with open(self.factory.mapFile, "r") as mapfile:
-                       boardTree = gtkpieboard.parse_keyboard_data("\n".join(mapfile.readlines()))
+               boardTree = self.factory.map
 
-               rows, columns = boardTree["dimensions"]
                keyboardName = boardTree["name"]
                keyTree = boardTree["keys"]
 
-               keyboard = gtkpieboard.PieKeyboard(style, rows, columns)
-               gtkpieboard.load_keyboard(keyboardName, keyTree, keyboard, self.__handler)
+               keyboard = qtpieboard.PieKeyboard()
+               qtpieboard.load_keyboard(keyboardName, keyTree, keyboard, self.__handler, self.factory.iconPaths)
 
                for commandName, operator in self.factory.commands.iteritems():
                        handler = CommandStackHandler(calcStack, commandName, operator)
@@ -64,10 +62,12 @@ class PieKeyboardPlugin(object):
 
 class PieKeyboardPluginFactory(object):
 
-       def __init__(self, pluginName, keyboardMapFile):
+       def __init__(self, pluginName, icon, keyboardMap, iconPaths):
                self.name = pluginName
-               self.mapFile = keyboardMapFile
+               self.map = keyboardMap
                self.commands = {}
+               self.icon = icon
+               self.iconPaths = iconPaths
 
        def register_operation(self, commandName, operator):
                self.commands[commandName] = operator