Merge pull request #1315 from ByteOfBrie/fix-outline-crash

Fix crash when clicking outline

Author: TheJackiMonster

manuskript/main.py

@@ -220,7 +220,7 @@ def launch(arguments, app, MW = None):
             kernel.initialize(['python', '--matplotlib=qt'])
 
             # Create the console in a new process and connect
-            console = connect_qtconsole(kernel.abs_connection_file, profile=kernel.profile)
+            console = connect_qtconsole(kernel.abs_connection_file)
 
             # Export MW and app variable to the console's namespace
             kernel.shell.user_ns['MW'] = MW

manuskript/ui/editors/fullScreenEditor.py

@@ -525,7 +525,7 @@ def paintEvent(self, event):
         # painter.restore()
 
         # slider
-        r = style.subControlRect(style.CC_ScrollBar, opt, style.SC_ScrollBarSlider)
+        r = style.subControlRect(style.CC_ScrollBar, opt, style.SC_ScrollBarSlider, None)
         painter.fillRect(r, self._color)
         painter.end()
 

manuskript/ui/views/outlineDelegates.py

@@ -29,8 +29,8 @@ def paint(self, painter, option, index):
         opt = QStyleOptionViewItem(option)
         self.initStyleOption(opt, index)
 
-        iconRect = style.subElementRect(style.SE_ItemViewItemDecoration, opt)
-        textRect = style.subElementRect(style.SE_ItemViewItemText, opt)
+        iconRect = style.subElementRect(style.SE_ItemViewItemDecoration, opt, None)
+        textRect = style.subElementRect(style.SE_ItemViewItemText, opt, None)
 
         # Background
         style.drawPrimitive(style.PE_PanelItemViewItem, opt, painter)
@@ -183,7 +183,7 @@ def paint(self, painter, option, index):
         if itemIndex.isValid() and self.mdlCharacter.data(itemIndex) not in ["", None]:
             opt = QStyleOptionComboBox()
             opt.rect = option.rect
-            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow)
+            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow, None)
             option.rect = r
             qApp.style().drawPrimitive(QStyle.PE_IndicatorArrowDown, option, painter)
 
@@ -295,7 +295,7 @@ def paint(self, painter, option, index):
         if index.isValid() and index.internalPointer().data(Outline.status) not in ["", None, "0", 0]:
             opt = QStyleOptionComboBox()
             opt.rect = option.rect
-            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow)
+            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow, None)
             option.rect = r
             qApp.style().drawPrimitive(QStyle.PE_IndicatorArrowDown, option, painter)
 
@@ -361,6 +361,6 @@ def paint(self, painter, option, index):
         if index.isValid() and index.internalPointer().data(Outline.label) not in ["", None, "0", 0]:
             opt = QStyleOptionComboBox()
             opt.rect = option.rect
-            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow)
+            r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow, None)
             option.rect = r
             qApp.style().drawPrimitive(QStyle.PE_IndicatorArrowDown, option, painter)