diff -r db2ec0feca8a -r 3dfcbe478fd3 E5Gui/E5SingleApplication.py
--- a/E5Gui/E5SingleApplication.py Sun Dec 09 14:14:06 2018 +0100
+++ b/E5Gui/E5SingleApplication.py Sun Dec 09 15:24:39 2018 +0100
@@ -19,16 +19,16 @@
import Utilities
###########################################################################
-# define some module global stuff
+## define some module global stuff
###########################################################################
SAFile = "eric6"
# define the protocol tokens
-SAOpenFile = '>OpenFile<'
-SAOpenProject = '>OpenProject<'
-SAOpenMultiProject = '>OpenMultiProject<'
-SAArguments = '>Arguments<'
+SAOpenFile = 'OpenFile'
+SAOpenProject = 'OpenProject'
+SAOpenMultiProject = 'OpenMultiProject'
+SAArguments = 'Arguments'
class E5SingleApplicationServer(SingleApplicationServer):
@@ -41,27 +41,29 @@
"""
SingleApplicationServer.__init__(self, SAFile)
- def handleCommand(self, cmd, params):
+ def handleCommand(self, command, arguments):
"""
Public slot to handle the command sent by the client.
- @param cmd commandstring (string)
- @param params parameterstring (string)
+ @param command command sent by the client
+ @type str
+ @param arguments list of command arguments
+ @type list of str
"""
- if cmd == SAOpenFile:
- self.__saOpenFile(params)
+ if command == SAOpenFile:
+ self.__saOpenFile(arguments[0])
return
- if cmd == SAOpenProject:
- self.__saOpenProject(params)
+ if command == SAOpenProject:
+ self.__saOpenProject(arguments[0])
return
- if cmd == SAOpenMultiProject:
- self.__saOpenMultiProject(params)
+ if command == SAOpenMultiProject:
+ self.__saOpenMultiProject(arguments[0])
return
- if cmd == SAArguments:
- self.__saArguments(params)
+ if command == SAArguments:
+ self.__saArguments(arguments[0])
return
def __saOpenFile(self, fname):
@@ -161,8 +163,7 @@
@param fname name of file to be opened (string)
"""
- cmd = "{0}{1}\n".format(SAOpenFile, Utilities.normabspath(fname))
- self.sendCommand(cmd)
+ self.sendCommand(SAOpenFile, [Utilities.normabspath(fname)])
def __openProject(self, pfname):
"""
@@ -170,8 +171,7 @@
@param pfname name of the projectfile to be opened (string)
"""
- cmd = "{0}{1}\n".format(SAOpenProject, Utilities.normabspath(pfname))
- self.sendCommand(cmd)
+ self.sendCommand(SAOpenProject, [Utilities.normabspath(pfname)])
def __openMultiProject(self, pfname):
"""
@@ -179,9 +179,7 @@
@param pfname name of the projectfile to be opened (string)
"""
- cmd = "{0}{1}\n".format(SAOpenMultiProject,
- Utilities.normabspath(pfname))
- self.sendCommand(cmd)
+ self.sendCommand(SAOpenMultiProject, [Utilities.normabspath(pfname)])
def __sendArguments(self, argsStr):
"""
@@ -189,5 +187,4 @@
@param argsStr space delimited list of command args (string)
"""
- cmd = "{0}{1}\n".format(SAArguments, argsStr)
- self.sendCommand(cmd)
+ self.sendCommand(SAArguments, [argsStr])
