More qt5 fixes
This commit is contained in:
parent
006d09e77f
commit
ea66f54bfc
|
@ -1134,7 +1134,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
|
||||
self.b_alsa_start.clicked.connect(self.slot_AlsaBridgeStart)
|
||||
self.b_alsa_stop.clicked.connect(self.slot_AlsaBridgeStop)
|
||||
self.cb_alsa_type.currentIndexChanged.connect(self.slot_AlsaBridgeChanged)
|
||||
self.cb_alsa_type.currentIndexChanged[int].connect(self.slot_AlsaBridgeChanged)
|
||||
self.tb_alsa_options.clicked.connect(self.slot_AlsaAudioBridgeOptions)
|
||||
|
||||
self.b_a2j_start.clicked.connect(self.slot_A2JBridgeStart)
|
||||
|
@ -1168,26 +1168,26 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
|
||||
self.ch_app_image.clicked.connect(self.slot_tweaksSettingsChanged_apps)
|
||||
self.cb_app_image.highlighted.connect(self.slot_tweakAppImageHighlighted)
|
||||
self.cb_app_image.currentIndexChanged.connect(self.slot_tweakAppImageChanged)
|
||||
self.cb_app_image.currentIndexChanged[int].connect(self.slot_tweakAppImageChanged)
|
||||
self.ch_app_music.clicked.connect(self.slot_tweaksSettingsChanged_apps)
|
||||
self.cb_app_music.highlighted.connect(self.slot_tweakAppMusicHighlighted)
|
||||
self.cb_app_music.currentIndexChanged.connect(self.slot_tweakAppMusicChanged)
|
||||
self.cb_app_music.currentIndexChanged[int].connect(self.slot_tweakAppMusicChanged)
|
||||
self.ch_app_video.clicked.connect(self.slot_tweaksSettingsChanged_apps)
|
||||
self.cb_app_video.highlighted.connect(self.slot_tweakAppVideoHighlighted)
|
||||
self.cb_app_video.currentIndexChanged.connect(self.slot_tweakAppVideoChanged)
|
||||
self.cb_app_video.currentIndexChanged[int].connect(self.slot_tweakAppVideoChanged)
|
||||
self.ch_app_text.clicked.connect(self.slot_tweaksSettingsChanged_apps)
|
||||
self.cb_app_text.highlighted.connect(self.slot_tweakAppTextHighlighted)
|
||||
self.cb_app_text.currentIndexChanged.connect(self.slot_tweakAppTextChanged)
|
||||
self.cb_app_text.currentIndexChanged[int].connect(self.slot_tweakAppTextChanged)
|
||||
self.ch_app_browser.clicked.connect(self.slot_tweaksSettingsChanged_apps)
|
||||
self.cb_app_browser.highlighted.connect(self.slot_tweakAppBrowserHighlighted)
|
||||
self.cb_app_browser.currentIndexChanged.connect(self.slot_tweakAppBrowserChanged)
|
||||
self.cb_app_browser.currentIndexChanged[int].connect(self.slot_tweakAppBrowserChanged)
|
||||
|
||||
self.sb_wineasio_ins.valueChanged.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.sb_wineasio_outs.valueChanged.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.cb_wineasio_hw.clicked.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.cb_wineasio_autostart.clicked.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.cb_wineasio_fixed_bsize.clicked.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.cb_wineasio_bsizes.currentIndexChanged.connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
self.cb_wineasio_bsizes.currentIndexChanged[int].connect(self.slot_tweaksSettingsChanged_wineasio)
|
||||
|
||||
# org.jackaudio.JackControl
|
||||
self.DBusJackServerStartedCallback.connect(self.slot_DBusJackServerStartedCallback)
|
||||
|
@ -1802,7 +1802,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
|
||||
if self.cb_cpufreq.currentIndex() == -1:
|
||||
# First init
|
||||
self.cb_cpufreq.currentIndexChanged.connect(self.slot_changeGovernorMode)
|
||||
self.cb_cpufreq.currentIndexChanged[str].connect(self.slot_changeGovernorMode)
|
||||
|
||||
self.cb_cpufreq.blockSignals(True)
|
||||
|
||||
|
@ -2090,7 +2090,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
self.setAppDetails(self.cb_app_image.itemText(index))
|
||||
|
||||
@pyqtSlot(int)
|
||||
def slot_tweakAppImageChanged(self):
|
||||
def slot_tweakAppImageChanged(self, ignored):
|
||||
self.setAppDetails(self.cb_app_image.currentText())
|
||||
self.func_settings_changed("apps")
|
||||
|
||||
|
@ -2099,7 +2099,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
self.setAppDetails(self.cb_app_music.itemText(index))
|
||||
|
||||
@pyqtSlot(int)
|
||||
def slot_tweakAppMusicChanged(self):
|
||||
def slot_tweakAppMusicChanged(self, ignored):
|
||||
self.setAppDetails(self.cb_app_music.currentText())
|
||||
self.func_settings_changed("apps")
|
||||
|
||||
|
@ -2108,7 +2108,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
self.setAppDetails(self.cb_app_video.itemText(index))
|
||||
|
||||
@pyqtSlot(int)
|
||||
def slot_tweakAppVideoChanged(self):
|
||||
def slot_tweakAppVideoChanged(self, ignored):
|
||||
self.setAppDetails(self.cb_app_video.currentText())
|
||||
self.func_settings_changed("apps")
|
||||
|
||||
|
@ -2117,7 +2117,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
self.setAppDetails(self.cb_app_text.itemText(index))
|
||||
|
||||
@pyqtSlot(int)
|
||||
def slot_tweakAppTextChanged(self):
|
||||
def slot_tweakAppTextChanged(self, ignored):
|
||||
self.setAppDetails(self.cb_app_text.currentText())
|
||||
self.func_settings_changed("apps")
|
||||
|
||||
|
@ -2126,7 +2126,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
self.setAppDetails(self.cb_app_browser.itemText(index))
|
||||
|
||||
@pyqtSlot(int)
|
||||
def slot_tweakAppBrowserChanged(self):
|
||||
def slot_tweakAppBrowserChanged(self, ignored):
|
||||
self.setAppDetails(self.cb_app_browser.currentText())
|
||||
self.func_settings_changed("apps")
|
||||
|
||||
|
@ -2268,7 +2268,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
|
|||
|
||||
def loadSettings(self, geometry):
|
||||
if geometry:
|
||||
self.restoreGeometry(self.settings.value("Geometry", ""))
|
||||
self.restoreGeometry(self.settings.value("Geometry", b""))
|
||||
|
||||
usingAlsaLoop = bool(GlobalSettings.value("ALSA-Audio/BridgeIndexType", iAlsaFileNone, type=int) == iAlsaFileLoop)
|
||||
|
||||
|
|
|
@ -169,14 +169,14 @@ class CatarinaRenameGroupW(QDialog, ui_catarina_renamegroup.Ui_CatarinaRenameGro
|
|||
self.m_group_list_names.append(group[iGroupName])
|
||||
|
||||
self.accepted.connect(self.slot_setReturn)
|
||||
self.cb_group_to_rename.currentIndexChanged.connect(self.slot_checkItem)
|
||||
self.cb_group_to_rename.currentIndexChanged[int].connect(self.slot_checkItem)
|
||||
self.le_new_group_name.textChanged.connect(self.slot_checkText)
|
||||
|
||||
self.ret_group_id = -1
|
||||
self.ret_new_group_name = ""
|
||||
|
||||
@pyqtSlot()
|
||||
def slot_checkItem(self):
|
||||
@pyqtSlot(int)
|
||||
def slot_checkItem(self, ignored):
|
||||
self.slot_checkText(self.le_new_group_name.text())
|
||||
|
||||
@pyqtSlot(str)
|
||||
|
@ -1272,7 +1272,7 @@ class CatarinaMainW(AbstractCanvasJackClass):
|
|||
settings = QSettings()
|
||||
|
||||
if geometry:
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
|
||||
showToolbar = settings.value("ShowToolbar", True, type=bool)
|
||||
self.ui.act_settings_show_toolbar.setChecked(showToolbar)
|
||||
|
|
|
@ -1333,7 +1333,7 @@ class CatiaMainW(AbstractCanvasJackClass):
|
|||
settings = QSettings()
|
||||
|
||||
if geometry:
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
|
||||
showAlsaMidi = settings.value("ShowAlsaMIDI", False, type=bool)
|
||||
self.ui.act_settings_show_alsa.setChecked(showAlsaMidi)
|
||||
|
|
|
@ -585,7 +585,7 @@ class ClaudiaLauncherW(QDialog):
|
|||
|
||||
def loadSettings(self):
|
||||
if self.settings.contains("Geometry"):
|
||||
self.restoreGeometry(self.settings.value("Geometry", ""))
|
||||
self.restoreGeometry(self.settings.value("Geometry", b""))
|
||||
else:
|
||||
self.resize(850, 500)
|
||||
self.launcher.loadSettings()
|
||||
|
@ -2668,7 +2668,7 @@ class ClaudiaMainW(AbstractCanvasJackClass):
|
|||
settings = QSettings()
|
||||
|
||||
if geometry:
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
|
||||
splitterSizes = settings.value("SplitterSizes", "")
|
||||
if splitterSizes:
|
||||
|
|
|
@ -1184,7 +1184,7 @@ if __name__ == '__main__':
|
|||
self.b_add.clicked.connect(self.slot_addAppToLADISH)
|
||||
self.b_refresh.clicked.connect(self.slot_refreshStudioList)
|
||||
|
||||
self.co_ladi_room.currentIndexChanged.connect(self.slot_checkSelectedRoom)
|
||||
self.co_ladi_room.currentIndexChanged[int].connect(self.slot_checkSelectedRoom)
|
||||
self.groupLADISH.toggled.connect(self.slot_enableLADISH)
|
||||
|
||||
self.le_url.textChanged.connect(self.slot_checkFolderUrl)
|
||||
|
@ -1331,7 +1331,7 @@ if __name__ == '__main__':
|
|||
self.launcher.saveSettings()
|
||||
|
||||
def loadSettings(self):
|
||||
self.restoreGeometry(self.settings.value("Geometry", ""))
|
||||
self.restoreGeometry(self.settings.value("Geometry", b""))
|
||||
self.launcher.loadSettings()
|
||||
|
||||
def closeEvent(self, event):
|
||||
|
|
|
@ -231,8 +231,8 @@ class JackSettingsW(QDialog):
|
|||
self.ui.obj_driver_duplex.clicked.connect(self.slot_checkDuplexSelection)
|
||||
self.ui.obj_server_driver.currentCellChanged.connect(self.slot_checkDriverSelection)
|
||||
|
||||
self.ui.obj_driver_capture.currentIndexChanged.connect(self.slot_checkALSASelection)
|
||||
self.ui.obj_driver_playback.currentIndexChanged.connect(self.slot_checkALSASelection)
|
||||
self.ui.obj_driver_capture.currentIndexChanged[int].connect(self.slot_checkALSASelection)
|
||||
self.ui.obj_driver_playback.currentIndexChanged[int].connect(self.slot_checkALSASelection)
|
||||
|
||||
# -------------------------------------------------------------
|
||||
# Load initial settings
|
||||
|
@ -734,8 +734,8 @@ class JackSettingsW(QDialog):
|
|||
# -----------------------------------------------------------------
|
||||
# Qt SLOT calls
|
||||
|
||||
@pyqtSlot()
|
||||
def slot_checkALSASelection(self):
|
||||
@pyqtSlot(int)
|
||||
def slot_checkALSASelection(self, ignored=0):
|
||||
if self.fDriverName == "alsa":
|
||||
check = bool(self.ui.obj_driver_duplex.isChecked() and (self.ui.obj_driver_capture.currentIndex() > 0 or self.ui.obj_driver_playback.currentIndex() > 0))
|
||||
self.ui.obj_driver_device.setEnabled(not check)
|
||||
|
@ -901,7 +901,7 @@ class JackSettingsW(QDialog):
|
|||
|
||||
def loadSettings(self):
|
||||
settings = QSettings("Cadence", "JackSettings")
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
self.ui.tabWidget.setCurrentIndex(settings.value("CurrentTab", 0, type=int))
|
||||
|
||||
def closeEvent(self, event):
|
||||
|
|
|
@ -417,7 +417,7 @@ class LogsW(QDialog):
|
|||
|
||||
def loadSettings(self):
|
||||
settings = QSettings("Cadence", "Cadence-Logs")
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
|
||||
def saveSettings(self):
|
||||
settings = QSettings("Cadence", "Cadence-Logs")
|
||||
|
|
|
@ -380,7 +380,7 @@ class RenderW(QDialog):
|
|||
def loadSettings(self):
|
||||
settings = QSettings("Cadence", "Cadence-Render")
|
||||
|
||||
self.restoreGeometry(settings.value("Geometry", ""))
|
||||
self.restoreGeometry(settings.value("Geometry", b""))
|
||||
|
||||
outputFolder = settings.value("OutputFolder", HOME)
|
||||
|
||||
|
|
|
@ -548,8 +548,8 @@ class AbstractCanvasJackClass(QMainWindow):
|
|||
self.ui.b_jack_clear_xruns.clicked.connect(self.slot_JackClearXruns)
|
||||
self.ui.b_jack_configure.clicked.connect(self.slot_showJackSettings)
|
||||
self.ui.b_jack_render.clicked.connect(self.slot_showRender)
|
||||
self.ui.cb_buffer_size.currentIndexChanged.connect(self.slot_jackBufferSize_ComboBox)
|
||||
self.ui.cb_sample_rate.currentIndexChanged.connect(self.slot_jackSampleRate_ComboBox)
|
||||
self.ui.cb_buffer_size.currentIndexChanged[str].connect(self.slot_jackBufferSize_ComboBox)
|
||||
self.ui.cb_sample_rate.currentIndexChanged[str].connect(self.slot_jackSampleRate_ComboBox)
|
||||
self.ui.b_xruns.clicked.connect(self.slot_JackClearXruns)
|
||||
|
||||
if "buffer-size" in modes:
|
||||
|
|
Loading…
Reference in New Issue