pyqt5.5.patch

   1 diff -dur -x '*~' Carla-1.9.6.orig/source/carla_control.py Carla-1.9.6/source/carla_control.py
   2 --- Carla-1.9.6.orig/source/carla_control.py    2015-03-12 14:09:14.000000000 +0100
   3 +++ Carla-1.9.6/source/carla_control.py 2016-11-19 14:05:16.290161277 +0100
   4 @@ -935,7 +935,7 @@
   5
   6      def loadSettings(self):
   7          settings = QSettings()
   8 -        self.restoreGeometry(settings.value("Geometry", ""))
   9 +        self.restoreGeometry(settings.value("Geometry", b""))
  10
  11          #showToolbar = settings.value("ShowToolbar", True, type=bool)
  12          #self.ui.act_settings_show_toolbar.setChecked(showToolbar)
  13 diff -dur -x '*~' Carla-1.9.6.orig/source/carla_database.py Carla-1.9.6/source/carla_database.py
  14 --- Carla-1.9.6.orig/source/carla_database.py   2015-03-12 14:09:14.000000000 +0100
  15 +++ Carla-1.9.6/source/carla_database.py        2016-11-19 14:06:07.430621741 +0100
  16 @@ -1250,8 +1250,8 @@
  17
  18      def loadSettings(self):
  19          settings = QSettings("falkTX", "CarlaDatabase2")
  20 -        self.restoreGeometry(settings.value("PluginDatabase/Geometry", ""))
  21 -        self.ui.tableWidget.horizontalHeader().restoreState(settings.value("PluginDatabase/TableGeometry%s" % ("_5" if config_UseQt5 else "_4"), ""))
  22 +        self.restoreGeometry(settings.value("PluginDatabase/Geometry", b""))
  23 +        self.ui.tableWidget.horizontalHeader().restoreState(settings.value("PluginDatabase/TableGeometry%s" % ("_5" if config_UseQt5 else "_4"), b""))
  24          self.ui.ch_effects.setChecked(settings.value("PluginDatabase/ShowEffects", True, type=bool))
  25          self.ui.ch_instruments.setChecked(settings.value("PluginDatabase/ShowInstruments", True, type=bool))
  26          self.ui.ch_midi.setChecked(settings.value("PluginDatabase/ShowMIDI", True, type=bool))
  27 diff -dur -x '*~' Carla-1.9.6.orig/source/carla_host.py Carla-1.9.6/source/carla_host.py
  28 --- Carla-1.9.6.orig/source/carla_host.py       2015-03-12 14:09:14.000000000 +0100
  29 +++ Carla-1.9.6/source/carla_host.py    2016-11-19 14:06:19.117392013 +0100
  30 @@ -1271,10 +1271,10 @@
  31          settings = QSettings()
  32
  33          if firstTime:
  34 -            self.restoreGeometry(settings.value("Geometry", ""))
  35 +            self.restoreGeometry(settings.value("Geometry", b""))
  36
  37              if not self.host.isPlugin:
  38 -                self.ui.panelTime.restoreGeometry(settings.value("TimePanelGeometry", ""))
  39 +                self.ui.panelTime.restoreGeometry(settings.value("TimePanelGeometry", b""))
  40
  41                  showTimePanel = settings.value("ShowTimePanel", True, type=bool)
  42                  self.ui.act_settings_show_time_panel.setChecked(showTimePanel)
  43 @@ -1791,7 +1791,7 @@
  44
  45          # set our gui as parent for all plugins UIs
  46          if not self.host.isPlugin:
  47 -            winIdStr = "%x" % self.winId()
  48 +            winIdStr = "%x" % int(self.winId())
  49              self.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, winIdStr)
  50
  51      def hideEvent(self, event):