Skip to content

Commit d3bbba5

Browse files
committed
OWWidget: Move 'splitter' to private members
'splitter' is to generic name that can be (and is) used by subclasses that now (since gh-2743) raise an "AttributeError: 'QSplitter' object has no attribute 'setControlAreaVisible'" in `OWWidget.showEvent`
1 parent acb7dd1 commit d3bbba5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Orange/widgets/widget.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def __new__(cls, *args, captionTitle=None, **kwargs):
220220

221221
self.left_side = None
222222
self.controlArea = self.mainArea = self.buttonsArea = None
223-
self.splitter = None
223+
self.__splitter = None
224224
if self.want_basic_layout:
225225
self.set_basic_layout()
226226

@@ -234,13 +234,13 @@ def __new__(cls, *args, captionTitle=None, **kwargs):
234234
# Otherwise, the first control has focus
235235
self.controlArea.setFocus(Qt.ActiveWindowFocusReason)
236236

237-
if self.splitter is not None:
238-
self.splitter.controlAreaVisibilityChanged.connect(
237+
if self.__splitter is not None:
238+
self.__splitter.controlAreaVisibilityChanged.connect(
239239
self.storeControlAreaVisibility)
240240
sc = QShortcut(
241241
QKeySequence(Qt.ControlModifier | Qt.ShiftModifier | Qt.Key_D),
242242
self)
243-
sc.activated.connect(self.splitter.flip)
243+
sc.activated.connect(self.__splitter.flip)
244244
return self
245245

246246
# pylint: disable=super-init-not-called
@@ -316,12 +316,12 @@ def mouseMoveEvent(self, event):
316316
return
317317

318318
def _insert_splitter(self):
319-
self.splitter = self._Splitter(Qt.Horizontal, self)
320-
self.layout().addWidget(self.splitter)
319+
self.__splitter = self._Splitter(Qt.Horizontal, self)
320+
self.layout().addWidget(self.__splitter)
321321

322322
def _insert_control_area(self):
323-
self.left_side = gui.vBox(self.splitter, spacing=0)
324-
self.splitter.setSizes([1]) # Smallest size allowed by policy
323+
self.left_side = gui.vBox(self.__splitter, spacing=0)
324+
self.__splitter.setSizes([1]) # Smallest size allowed by policy
325325
if self.buttons_area_orientation is not None:
326326
self.controlArea = gui.vBox(self.left_side, addSpace=0)
327327
self._insert_buttons_area()
@@ -342,12 +342,12 @@ def _insert_buttons_area(self):
342342

343343
def _insert_main_area(self):
344344
self.mainArea = gui.vBox(
345-
self.splitter, margin=4,
345+
self.__splitter, margin=4,
346346
sizePolicy=QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
347347
)
348-
self.splitter.addWidget(self.mainArea)
349-
self.splitter.setCollapsible(
350-
self.splitter.indexOf(self.mainArea), False)
348+
self.__splitter.addWidget(self.mainArea)
349+
self.__splitter.setCollapsible(
350+
self.__splitter.indexOf(self.mainArea), False)
351351
self.mainArea.layout().setContentsMargins(
352352
0 if self.want_control_area else 4, 4, 4, 4)
353353

@@ -572,7 +572,7 @@ def showEvent(self, event):
572572
QDialog.showEvent(self, event)
573573
if self.save_position and not self.__was_restored:
574574
# Restore saved geometry on (first) show
575-
self.splitter.setControlAreaVisible(self.controlAreaVisible)
575+
self.__splitter.setControlAreaVisible(self.controlAreaVisible)
576576
self.__restoreWidgetGeometry()
577577
self.__was_restored = True
578578
self.__quicktipOnce()

0 commit comments

Comments
 (0)