From 25180730194bec25f915f32ab846ea583fb1493f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Nov 2020 16:11:52 +0100 Subject: Rename PySide2 to PySide6 Adapt CMake files, build scripts, tests and examples. Task-number: PYSIDE-904 Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88 Reviewed-by: Christian Tismer --- examples/multimedia/audiooutput.py | 8 ++++---- examples/multimedia/camera.py | 20 ++++++++++---------- examples/multimedia/player.py | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'examples/multimedia') diff --git a/examples/multimedia/audiooutput.py b/examples/multimedia/audiooutput.py index c6c7b9f93..44c0f6910 100644 --- a/examples/multimedia/audiooutput.py +++ b/examples/multimedia/audiooutput.py @@ -40,15 +40,15 @@ ## ############################################################################# -"""PySide2 port of the multimedia/audiooutput example from Qt v5.x, originating from PyQt""" +"""PySide6 port of the multimedia/audiooutput example from Qt v5.x, originating from PyQt""" from math import pi, sin from struct import pack -from PySide2.QtCore import QByteArray, QIODevice, Qt, QTimer, qWarning -from PySide2.QtMultimedia import (QAudio, QAudioDeviceInfo, QAudioFormat, +from PySide6.QtCore import QByteArray, QIODevice, Qt, QTimer, qWarning +from PySide6.QtMultimedia import (QAudio, QAudioDeviceInfo, QAudioFormat, QAudioOutput) -from PySide2.QtWidgets import (QApplication, QComboBox, QHBoxLayout, QLabel, +from PySide6.QtWidgets import (QApplication, QComboBox, QHBoxLayout, QLabel, QMainWindow, QPushButton, QSlider, QVBoxLayout, QWidget) diff --git a/examples/multimedia/camera.py b/examples/multimedia/camera.py index 644b5340c..e8e95b7ee 100644 --- a/examples/multimedia/camera.py +++ b/examples/multimedia/camera.py @@ -39,16 +39,16 @@ ## ############################################################################# -"""PySide2 Multimedia Camera Example""" +"""PySide6 Multimedia Camera Example""" import os, sys -from PySide2.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl -from PySide2.QtGui import QAction, QGuiApplication, QDesktopServices, QIcon -from PySide2.QtGui import QImage, QPixmap -from PySide2.QtWidgets import (QApplication, QHBoxLayout, QLabel, +from PySide6.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl +from PySide6.QtGui import QAction, QGuiApplication, QDesktopServices, QIcon +from PySide6.QtGui import QImage, QPixmap +from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget) -from PySide2.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo -from PySide2.QtMultimediaWidgets import QCameraViewfinder +from PySide6.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo +from PySide6.QtMultimediaWidgets import QCameraViewfinder class ImageView(QWidget): def __init__(self, previewImage, fileName): @@ -125,18 +125,18 @@ class MainWindow(QMainWindow): if self.camera.status() != QCamera.UnavailableStatus: name = self.cameraInfo.description() - self.setWindowTitle("PySide2 Camera Example (" + name + ")") + self.setWindowTitle("PySide6 Camera Example (" + name + ")") self.statusBar().showMessage("Starting: '" + name + "'", 5000) self.camera.start() else: - self.setWindowTitle("PySide2 Camera Example") + self.setWindowTitle("PySide6 Camera Example") self.takePictureAction.setEnabled(False) self.statusBar().showMessage("Camera unavailable", 5000) def nextImageFileName(self): picturesLocation = QStandardPaths.writableLocation(QStandardPaths.PicturesLocation) dateString = QDate.currentDate().toString("yyyyMMdd") - pattern = picturesLocation + "/pyside2_camera_" + dateString + "_{:03d}.jpg" + pattern = picturesLocation + "/pyside6_camera_" + dateString + "_{:03d}.jpg" n = 1 while True: result = pattern.format(n) diff --git a/examples/multimedia/player.py b/examples/multimedia/player.py index 762d26b7e..bffcb3906 100644 --- a/examples/multimedia/player.py +++ b/examples/multimedia/player.py @@ -39,15 +39,15 @@ ## ############################################################################# -"""PySide2 Multimedia player example""" +"""PySide6 Multimedia player example""" import sys -from PySide2.QtCore import QStandardPaths, Qt -from PySide2.QtGui import QAction, QIcon, QKeySequence -from PySide2.QtWidgets import (QApplication, QDialog, QFileDialog, +from PySide6.QtCore import QStandardPaths, Qt +from PySide6.QtGui import QAction, QIcon, QKeySequence +from PySide6.QtWidgets import (QApplication, QDialog, QFileDialog, QMainWindow, QSlider, QStyle, QToolBar) -from PySide2.QtMultimedia import QMediaPlayer, QMediaPlaylist -from PySide2.QtMultimediaWidgets import QVideoWidget +from PySide6.QtMultimedia import QMediaPlayer, QMediaPlaylist +from PySide6.QtMultimediaWidgets import QVideoWidget class MainWindow(QMainWindow): -- cgit v1.2.3