diff -r ff666d8230f7 -r 711e7c35a49b E5Gui/E5ToolBarManager.py
--- a/E5Gui/E5ToolBarManager.py Thu Jul 23 20:14:30 2015 +0200
+++ b/E5Gui/E5ToolBarManager.py Sat Jul 25 13:02:39 2015 +0200
@@ -479,18 +479,18 @@
for tbID in self.__defaultToolBars:
tb = self.__allToolBars[tbID]
if tb.objectName():
- stream.writeString(tb.objectName().encode())
+ stream.writeString(tb.objectName().encode("utf-8"))
else:
- stream.writeString(tb.windowTitle().encode())
+ stream.writeString(tb.windowTitle().encode("utf-8"))
stream.writeUInt16(len(self.__toolBars[tbID]))
for action in self.__toolBars[tbID]:
if action is not None:
if action.objectName():
- stream.writeString(action.objectName().encode())
+ stream.writeString(action.objectName().encode("utf-8"))
else:
- stream.writeString(action.text().encode())
+ stream.writeString(action.text().encode("utf-8"))
else:
- stream.writeString("".encode())
+ stream.writeString("".encode("utf-8"))
# save the custom toolbars
stream.writeUInt16(E5ToolBarManager.CustomToolBarMarker)
@@ -498,17 +498,17 @@
for tbID in self.__toolBars:
if tbID not in self.__defaultToolBars:
tb = self.__allToolBars[tbID]
- stream.writeString(tb.objectName().encode())
- stream.writeString(tb.windowTitle().encode())
+ stream.writeString(tb.objectName().encode("utf-8"))
+ stream.writeString(tb.windowTitle().encode("utf-8"))
stream.writeUInt16(len(self.__toolBars[tbID]))
for action in self.__toolBars[tbID]:
if action is not None:
if action.objectName():
- stream.writeString(action.objectName().encode())
+ stream.writeString(action.objectName().encode("utf-8"))
else:
- stream.writeString(action.text().encode())
+ stream.writeString(action.text().encode("utf-8"))
else:
- stream.writeString("".encode())
+ stream.writeString("".encode("utf-8"))
return data
