eric: comparison Plugins/ViewManagerPlugins/Tabview/Tabview.py

-:68fb0a7677ff
+:c1622c708cd9
 """
 Constructor
 @param parent reference to the parent widget (QWidget)
 """
-E5WheelTabBar.__init__(self, parent)
+super().__init__(parent)
 self.setAcceptDrops(True)
 self.__dragStartPos = QPoint()
 def mousePressEvent(self, event):
 @param event reference to the mouse press event (QMouseEvent)
 """
 if event.button() == Qt.LeftButton:
 self.__dragStartPos = QPoint(event.pos())
-E5WheelTabBar.mousePressEvent(self, event)
+super().mousePressEvent(event)
 def mouseMoveEvent(self, event):
 """
 Protected method to handle mouse move events.
 drag.setMimeData(mimeData)
 if event.modifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier):
 drag.exec_(Qt.DropActions(Qt.CopyAction))
 elif event.modifiers() == Qt.KeyboardModifiers(Qt.NoModifier):
 drag.exec_(Qt.DropActions(Qt.MoveAction))
-E5WheelTabBar.mouseMoveEvent(self, event)
+super().mouseMoveEvent(event)
 def dragEnterEvent(self, event):
 """
 Protected method to handle drag enter events.
 mimeData.data("action") == "tab-reordering" and \
 "tabbar-id" in formats and \
 "source-index" in formats and \
 "tabwidget-id" in formats:
 event.acceptProposedAction()
-E5WheelTabBar.dragEnterEvent(self, event)
+super().dragEnterEvent(event)
 def dropEvent(self, event):
 """
 Protected method to handle drop events.
 self.tabMoveRequested.emit(fromIndex, toIndex)
 event.acceptProposedAction()
 elif event.proposedAction() == Qt.CopyAction:
 self.tabCopyRequested.emit(fromIndex, toIndex)
 event.acceptProposedAction()
-E5WheelTabBar.dropEvent(self, event)
+super().dropEvent(event)
 class TabWidget(E5TabWidget):
 """
 Class implementing a custimized tab widget.
 """
 Constructor
 @param vm view manager widget (Tabview)
 """
-E5TabWidget.__init__(self)
+super().__init__()
 self.setAttribute(Qt.WA_DeleteOnClose, True)
 self.__tabBar = TabBar(self)
 self.setTabBar(self.__tabBar)
 ericPic = QPixmap(os.path.join(getConfig('ericPixDir'), 'eric_small.png'))
 self.emptyLabel = QLabel()
 self.emptyLabel.setPixmap(ericPic)
 self.emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
-E5TabWidget.addTab(self, self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
+super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
 def __initMenu(self):
 """
 Private method to initialize the tab context menu.
 """
 @param coord the position of the mouse pointer (QPoint)
 @param index index of the tab the menu is requested for (integer)
 """
 if self.editors:
-self.contextMenuEditor = self.widget(index)
+self.contextMenuEditor = self.widget(index).getEditor()
 if self.contextMenuEditor:
 self.saveMenuAct.setEnabled(self.contextMenuEditor.isModified())
 fileName = self.contextMenuEditor.getFileName()
 self.copyPathAct.setEnabled(bool(fileName))
 if fileName:
 Overwritten method to add a new tab.
 @param editor the editor object to be added (QScintilla.Editor.Editor)
 @param title title for the new tab (string)
 """
-E5TabWidget.addTab(self, editor, UI.PixmapCache.getIcon("empty.png"), title)
+assembly = editor.parent()
+super().addTab(assembly, UI.PixmapCache.getIcon("empty.png"), title)
 if self.closeButton:
 self.closeButton.setEnabled(True)
 else:
 self.setTabsClosable(True)
 self.navigationButton.setEnabled(True)
 @param index index position for the new tab (integer)
 @param editor the editor object to be added (QScintilla.Editor.Editor)
 @param title title for the new tab (string)
 @return index of the inserted tab (integer)
 """
-newIndex = E5TabWidget.insertTab(self, index, editor,
+assembly = editor.parent()
-UI.PixmapCache.getIcon("empty.png"),
+newIndex = super().insertTab(index, assembly,
-title)
+UI.PixmapCache.getIcon("empty.png"),
+title)
 if self.closeButton:
 self.closeButton.setEnabled(True)
 else:
 self.setTabsClosable(True)
 self.navigationButton.setEnabled(True)
 if len(txt) > maxFileNameChars:
 txt = "...{0}".format(txt[-maxFileNameChars:])
 if editor.isReadOnly():
 txt = self.trUtf8("{0} (ro)").format(txt)
-index = self.indexOf(editor)
+assembly = editor.parent()
+index = self.indexOf(assembly)
 if index > -1:
 self.setTabText(index, txt)
 self.setTabToolTip(index, fn)
 def removeWidget(self, object):
 """
 Public method to remove a widget.
 @param object object to be removed (QWidget)
 """
-index = self.indexOf(object)
-if index > -1:
-self.removeTab(index)
 if isinstance(object, QScintilla.Editor.Editor):
 object.captionChanged.disconnect(self.__captionChange)
 self.editors.remove(object)
+index = self.indexOf(object.parent())
+else:
+index = self.indexOf(object)
+if index > -1:
+self.removeTab(index)
 if not self.editors:
-E5TabWidget.addTab(self, self.emptyLabel,
+super().addTab(self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "")
-UI.PixmapCache.getIcon("empty.png"), "")
 self.emptyLabel.show()
 if self.closeButton:
 self.closeButton.setEnabled(False)
 else:
 self.setTabsClosable(False)
 # step 1: get data of the tab of the source
 toolTip = tw.tabToolTip(sourceIndex)
 text = tw.tabText(sourceIndex)
 icon = tw.tabIcon(sourceIndex)
 whatsThis = tw.tabWhatsThis(sourceIndex)
-editor = tw.widget(sourceIndex)
+editor = tw.widget(sourceIndex).getEditor()
 # step 2: relocate the tab
 tw.removeWidget(editor)
 self.insertWidget(targetIndex, editor, text)
 @param sourceIndex index of the tab in the old tab widget (integer)
 @param targetIndex index position to place it to (integer)
 """
 tw = self.vm.getTabWidgetById(sourceId)
 if tw is not None:
-editor = tw.widget(sourceIndex)
+editor = tw.widget(sourceIndex).getEditor()
 newEditor = self.vm.cloneEditor(editor, editor.getFileType(),
 editor.getFileName())
 self.vm.insertView(newEditor, self, targetIndex,
 editor.getFileName(), editor.getNoName())
 Public method to copy an editor.
 @param sourceIndex index of the tab (integer)
 @param targetIndex index position to place it to (integer)
 """
-editor = self.widget(sourceIndex)
+editor = self.widget(sourceIndex).getEditor()
 newEditor = self.vm.cloneEditor(editor, editor.getFileType(),
 editor.getFileName())
 self.vm.insertView(newEditor, self, targetIndex,
 editor.getFileName(), editor.getNoName())
 def currentWidget(self):
 """
 Overridden method to return a reference to the current page.
-@return reference to the current page (QWidget)
+@return reference to the current page (Editor)
 """
 if not self.editors:
 return None
 else:
-return E5TabWidget.currentWidget(self)
+try:
+return super().currentWidget().getEditor()
+except AttributeError:
+return super().currentWidget()
+def setCurrentWidget(self, editor):
+"""
+Public method to set the current tab by the given editor.
+@param editor editor to determine current tab from (Editor)
+"""
+super().setCurrentWidget(editor.parent())
+def indexOf(self, object):
+"""
+Public method to get the tab index of the given editor.
+@param object object to get the index for (QLabel or Editor)
+@return tab index of the editor (integer)
+"""
+if isinstance(object, QScintilla.Editor.Editor):
+object = object.parent()
+return super().indexOf(object)
 def hasEditor(self, editor):
 """
 Public method to check for an editor.
 Private method to close the other tabs.
 """
 index = self.contextMenuIndex
 for i in list(range(self.count() - 1, index, -1)) + \
 list(range(index - 1, -1, -1)):
-editor = self.widget(i)
+editor = self.widget(i).getEditor()
 self.vm.closeEditorWindow(editor)
 def __contextMenuCloseAll(self):
 """
 Private method to close all tabs.
 def __closeButtonClicked(self):
 """
 Private method to handle the press of the close button.
 """
-self.vm.closeEditorWindow(self.currentWidget())
+self.vm.closeEditorWindow(self.currentWidget().getEditor())
 def __closeRequested(self, index):
 """
 Private method to handle the press of the individual tab close button.
 @param index index of the tab (integer)
 """
 if index >= 0:
-self.vm.closeEditorWindow(self.widget(index))
+self.vm.closeEditorWindow(self.widget(index).getEditor())
 def mouseDoubleClickEvent(self, event):
 """
 Protected method handling double click events.

Mercurial Repositories > eric / file comparison

comparison: Plugins/ViewManagerPlugins/Tabview/Tabview.py

Plugins/ViewManagerPlugins/Tabview/Tabview.py