Mercurial Repositories > eric / changeset
changeset
Changed code to make eric compatible to PyQt 5.5 (QByteArry issue).
Sat, 01 Aug 2015 13:11:39 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 01 Aug 2015 13:11:39 +0200
- branch
- 6_0_x
- changeset 4342
- d8ccfca6d50e
- parent 4340
- b60f7c844265
- child 4346
- c8cb0b0bfe24
Changed code to make eric compatible to PyQt 5.5 (QByteArry issue).
| E5Gui/E5TabWidget.py | file | annotate | diff | comparison | revisions | |
| Plugins/ViewManagerPlugins/Tabview/Tabview.py | file | annotate | diff | comparison | revisions |
--- a/E5Gui/E5TabWidget.py Sun Jul 26 19:02:11 2015 +0200 +++ b/E5Gui/E5TabWidget.py Sat Aug 01 13:11:39 2015 +0200 @@ -93,8 +93,8 @@ mimeData = QMimeData() index = self.tabAt(event.pos()) mimeData.setText(self.tabText(index)) - mimeData.setData("action", "tab-reordering") - mimeData.setData("tabbar-id", str(id(self))) + mimeData.setData("action", b"tab-reordering") + mimeData.setData("tabbar-id", str(id(self)).encode("utf-8")) drag.setMimeData(mimeData) drag.exec_() E5WheelTabBar.mouseMoveEvent(self, event) @@ -108,7 +108,7 @@ mimeData = event.mimeData() formats = mimeData.formats() if "action" in formats and \ - mimeData.data("action") == "tab-reordering" and \ + mimeData.data("action") == b"tab-reordering" and \ "tabbar-id" in formats and \ int(mimeData.data("tabbar-id")) == id(self): event.acceptProposedAction()
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sun Jul 26 19:02:11 2015 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sat Aug 01 13:11:39 2015 +0200 @@ -88,12 +88,14 @@ mimeData = QMimeData() index = self.tabAt(event.pos()) mimeData.setText(self.tabText(index)) - mimeData.setData("action", "tab-reordering") - mimeData.setData("tabbar-id", str(id(self))) + mimeData.setData("action", b"tab-reordering") + mimeData.setData("tabbar-id", str(id(self)).encode("utf-8")) mimeData.setData( "source-index", QByteArray.number(self.tabAt(self.__dragStartPos))) - mimeData.setData("tabwidget-id", str(id(self.parentWidget()))) + mimeData.setData( + "tabwidget-id", + str(id(self.parentWidget())).encode("utf-8")) drag.setMimeData(mimeData) if event.modifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier): drag.exec_(Qt.DropActions(Qt.CopyAction)) @@ -110,7 +112,7 @@ mimeData = event.mimeData() formats = mimeData.formats() if "action" in formats and \ - mimeData.data("action") == "tab-reordering" and \ + mimeData.data("action") == b"tab-reordering" and \ "tabbar-id" in formats and \ "source-index" in formats and \ "tabwidget-id" in formats: @@ -125,7 +127,7 @@ """ mimeData = event.mimeData() oldID = int(mimeData.data("tabbar-id")) - fromIndex = mimeData.data("source-index").toInt()[0] + fromIndex = int(mimeData.data("source-index")) toIndex = self.tabAt(event.pos()) if oldID != id(self): parentID = int(mimeData.data("tabwidget-id"))
