V3.0.5 GTK2 Theming

Author: kanehekili

README.md

@@ -1,7 +1,7 @@
 # VideoCut
 Version 3.0.4
 
-![Download](https://github.com/kanehekili/VideoCut/releases/download/3.0.4/videocut3.0.4.tar)
+![Download](https://github.com/kanehekili/VideoCut/releases/download/3.0.5/videocut3.0.5.tar)
 
 MP2/MP4 Cutter for Linux on base of mpv and ffmpeg. Cutting is lossless, the target file will not be reencoded. 
 
@@ -25,19 +25,11 @@ The current version is written in python3 and uses the qt6 widget kit.
 * optional:(legacy) OpenCV 2.4 up to OpenCV 4.x (must be build with ffmpeg - with all its dependencies)
 
 #### Set GTK Theme for this QT application
-If you are running a DE with GTK/Gnome (as opposed to LXQT or KDE) you need to tweak your system:
-* Arch users may have to install qt6gtk2 from AUR
-* Ubuntu/Debian users will not get a uniform look GTK theme for QT anymore. (qt5 was the last)
+If you are running a DE with GTK/Gnome (as opposed to LXQT or KDE) there is no way to tweak anymore:
+* GKT2 to QT5/QT6 libraries do not work
+* QT_QPA_PLATFORMTHEME should not be set in non QT systems
+* Videocut will set the "fusion" mode - any new ideas are welcome. 
 
-`sudo nano /etc/environment`
-
-add the follwing line:
-
-`QT_QPA_PLATFORMTHEME=gtk2` or
-
-`QT_QPA_PLATFORMTHEME=qt6c` (if qt6c is installed)
-
-and logout/login (or reboot)
 
 ### Features
 Cuts an mpg file into parts and joins them afterwards. All commands can be reached via the toolbar.
@@ -176,6 +168,9 @@ Copy the .desktop file and change the exec line to "Exec= python3 .../VideoCut.p
 Opencv will not be displaying subtitles nor frametypes.
 
 ### Changes 
+26.07.25
+* Adapt to the new reality that GTK2 will not render QT6 widgets anymore. Upgraded to mpv 1.0.8
+
 13.01.25
 * Display wait time on remote files. Changed slider behavior according to [tex](https://github.com/tex) - Thank you.
 

build/build.properties

@@ -1,5 +1,5 @@
-version=3.0.4
+version=3.0.5
 ubu0=jammy
 ubu1=noble
 ubu2=oracular
-pkgrelease=2
+pkgrelease=1

src/FFMPEGTools.py

@@ -189,6 +189,25 @@ def compressor(self,source, dest):
     def namer(self,name):
         return name+".gz"
 
+    def is_nvidia_gpu_active(self):
+        try:
+            # Try to detect active GPU via `nvidia-smi` (most reliable if installed)
+            subprocess.run(["nvidia-smi"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+            return True
+        except Exception:
+            pass
+    
+        try:
+            # Fallback: parse `lspci` output (less accurate but doesn't need NVIDIA tools)
+            result = subprocess.run(["lspci"], stdout=subprocess.PIPE, text=True)
+            return "NVIDIA" in result.stdout
+        except Exception:
+            return False
+
+    def currentDesktop(self):
+        return os.environ.get("XDG_CURRENT_DESKTOP", "")
+
+
 class ConfigAccessor():
     __SECTION = "default" 
     homeDir = OSTools().getHomeDirectory()

src/MpvPlayer.py

@@ -20,8 +20,6 @@
 
 from lib.mpv import (MPV,MpvGlGetProcAddressFn,MpvRenderContext)
 
-    
-
 Log=FFMPEGTools.Log
 
 def get_proc_addr(_, name):
@@ -32,7 +30,6 @@ def get_proc_addr(_, name):
     addr = int(glctx.getProcAddress(qb))
     return addr
 
-
 class VideoWidget(QtWidgets.QFrame):
     """ Sized frame for mpv """
     trigger = pyqtSignal(float,float,float)
@@ -53,7 +50,7 @@ def updateUI(self,frameNumber,framecount,timeinfo):
 
 class VideoGLWidget(QOpenGLWidget):
     trigger = pyqtSignal(float,float,float)
-
+    onMVPGLUpdate = pyqtSignal()
     def __init__(self, parent,mpv):
         QOpenGLWidget.__init__(self,parent)
         #setSurfaceType(QWindow.OpenGLSurface)
@@ -64,7 +61,8 @@ def __init__(self, parent,mpv):
         self.get_proc_addr_c = MpvGlGetProcAddressFn(get_proc_addr)
         self._defaultHeight = 518 #ratio 16:9
         self._defaultWidth = 921
-
+        self.onMVPGLUpdate.connect(self.__update)
+        
     def initializeGL(self):
         params = {'get_proc_address': self.get_proc_addr_c}
         self.ctx = MpvRenderContext(self.mpv,
@@ -90,7 +88,6 @@ def paintGL(self):
                       'fbo': self.defaultFramebufferObject()}
         self.ctx.render(flip_y=True, opengl_fbo=opengl_fbo)
 
-
     @pyqtSlot()
     def __update(self):
         if self.window().isMinimized():
@@ -104,16 +101,15 @@ def __update(self):
     def on_update(self, ctx=None):
         # __update method should run on the thread that creates the
         # OpenGLContext, which in general is the main thread.
-        # QMetaObject.invokeMethod can do this trick.
-        QMetaObject.invokeMethod(self, '__update')
+        self.onMVPGLUpdate.emit()
 
     def sizeHint(self):
         return QtCore.QSize(self._defaultWidth, self._defaultHeight)
 
+    #Called by MpvPlayer#_onTimePos
     def updateUI(self,frameNumber,framecount,timeinfo):
         self.trigger.emit(frameNumber,framecount,timeinfo)
 
-    
 class MpvPlayer():
     ERR_IDS=["No video or audio streams selected.","Failed to recognize file format."]
     def __init__(self):
@@ -130,6 +126,7 @@ def initPlayer(self,container):
         return self.mediaPlayer 
 
     def initGLPlayer(self):
+        #stripes when using file explorer (initial call without file) 
         kwArgs=self.__baseMpvArgs()
         kwArgs["vo"]="libmpv" 
         self.mediaPlayer = MPV(**kwArgs)
@@ -191,7 +188,9 @@ def __baseMpvArgs(self):
             #"demuxer_cache_wait" : 'no', #if yes remote files take too long...
             #"demuxer_max_bytes " : '10000MiB',
             #"demuxer_backward_playback_step" : 180,
-            "volume" : 100
+            "volume" : 100,
+            #"gpu_context":'x11egl',  # Or explicitly specify 'egl', 'x11', etc.
+            "opengl_early_flush":'yes'
             }
 
     def _resetState(self):
@@ -228,35 +227,8 @@ def _hookEvents(self):
         self.mediaPlayer.observe_property("eof-reached",self._onPlayEnd)
         #mostly wrong: self.mediaPlayer.observe_property("estimated-frame-count",self._onFramecount)
         self.mediaPlayer.observe_property("video-frame-info",self._onFrameInfo)
-    
-    '''
-    TEst with jasegs event handler...
-    def open_withEvent(self,filePath):
-        print("open:",filePath)
-        try:
-            self._resetState()
-            self.mediaPlayer.close()
-            self.mediaPlayer.loadfile(filePath)
-            #Try to pin down a potential file error 
-            @self.mediaPlayer.event_callback('end_file')
-            def eofHandler(evt):
-                self._superviseEndFileEvent(evt)
-            self._getReady()
-            eofHandler.unregister_mpv_events()
-        except Exception as ex:
-            Log.logException("Open mpv file")
-            print(ex)
-            
-    def _superviseEndFileEvent(self,evt):
-        if evt['event']['reason'] != MpvEventEndFile.REDIRECT or evt['event']['reason'] != MpvEventEndFile.RESTARTED:
-            self.lastError=self.ERR_IDS[0] 
-            with self.seekLock:
-                print('check notify:',evt)
-                self.seekLock.notify()
 
-        return True
-    '''        
-    
+  
     def open(self,filePath):
         try:     
             #Very verbose: self.mediaPlayer.register_event_callback(self._oncallback)
@@ -471,7 +443,6 @@ def _passLog(self,loglevel, component, message):
         msg='{}: {}'.format(component, message)
         Log.error(">%s",msg)
         with self.seekLock:
-            #TODO: file not recognized seems not be working"
             if message in self.ERR_IDS:
                 self.lastError=message
                 self.seekLock.notifyAll()
@@ -586,13 +557,13 @@ def _createGLWidget(self,parent):
         self.player= MpvPlayer()
         mpv=self.player.initGLPlayer()    
         self.mpvWidget=VideoGLWidget(parent,mpv)
-        self.player.connectTo(self.mpvWidget.updateUI)
+        self.player.connectTo(self.mpvWidget.updateUI) #GL connect
         return self.mpvWidget
 
     def __setupPlayer(self):
         if self.showGL:
             return #already happened
-        if self.player:
+        if self.player: #Non GL connect
             self.player.close()
         self.player= MpvPlayer()
         self.player.initPlayer(self.mpvWidget)

src/SimplePlayer.py

@@ -16,28 +16,28 @@
 from PyQt6.QtCore import QByteArray, pyqtSignal, pyqtSlot, Qt
 from PyQt6.QtOpenGLWidgets import QOpenGLWidget
 from lib.mpv import MPV, MpvGlGetProcAddressFn, MpvRenderContext
-import ctypes,sys
-
+import sys
 
 def get_process_address(_, name):
     glctx =  QOpenGLContext.currentContext()
     address = int(glctx.getProcAddress(QByteArray(name)))
     #return ctypes.cast(address, ctypes.c_void_p).value
     return address
 
+def getMPV():
+        kwArgs={"log_handler":print,"log-file":"gl.txt","loglevel" : 'info',"pause":False,"audio" : "1","keep_open" : "always","vo":"libmpv"}
+        return MPV(**kwArgs)
+
 class Player(QOpenGLWidget):
     onUpdate = pyqtSignal()
     initialized = pyqtSignal()
 
     def __init__(self, parent) -> None:
         super().__init__(parent)
-        kwArgs={"log_handler":print,"log-file":"gl.txt","loglevel" : 'trace',"audio" : "1","keep_open" : "always","vo":"libmpv"}
-        self.mpv = MPV(**kwArgs)
+        self.mpv = getMPV()
         self.ctx = None
         self._proc_addr_wrapper = MpvGlGetProcAddressFn(get_process_address)
         self.onUpdate.connect(self.do_update)
-        self.c = 0
-
         self.setUpdateBehavior(QOpenGLWidget.UpdateBehavior.PartialUpdate)
 
     def initializeGL(self) -> None:
@@ -53,29 +53,11 @@ def initializeGL(self) -> None:
             self.initialized.emit()
 
     def paintGL(self) -> None:
-        if self.c > 100:
-            self.c = 0
-        else:
-            self.c += 1
         rect = self.rect()
         if self.ctx:
             fbo = self.defaultFramebufferObject()
             self.ctx.render(flip_y=True, opengl_fbo={'w': rect.width(), 'h': rect.height(), 'fbo': fbo})
-
-                    
-        # Draw on bottom center
-        '''
-        p = QPainter(self)
-        width = rect.size().width()
-        height = rect.size().height()
-        label_rect = rect.adjusted((width/2)-75, height-100, -(width/2)+75, -50)
-        p.setPen(QColor("#ffffff"))
-        
-        text = '.'*int((self.c/20)) + "playing" + '.'*int((self.c/20))
-        p.fillRect(label_rect, QBrush(QColor("#ff00ff"), Qt.BrushStyle.FDiagPattern))
-        p.drawText(label_rect, Qt.AlignmentFlag.AlignCenter, text)
-        '''
-
+                  
     def do_update(self):
         self.update()
 
@@ -107,25 +89,35 @@ def __init__(self, qapp,aPath=None):
 
     def initUI(self):
         self.player = Player(self)
+        #self.player = VideoGLWidget(self,getMPV())
 
         self.uiLabel= QtWidgets.QLabel(self)
         self.uiLabel.setText("Player demo")
         self.uiPlayButton = QtWidgets.QPushButton(" Play")
+        self.uiPlayButton.clicked.connect(self.execPlayButton)
+        self.uiStopButton = QtWidgets.QPushButton(" Stop")
+        self.uiStopButton.clicked.connect(self.execStopButton)
+        
 
         box = self._makeLayout()
         wid = QtWidgets.QWidget(self)
         self.setCentralWidget(wid)    
         wid.setLayout(box)
         self.resize(500, 600) 
         #self.player.initialized.connect(lambda: [self.player.play("/media/disk1/UHD/gog.mp4")])
-        self.player.initialized.connect(lambda: [self.player.mpv.loadfile("icons/film-clapper.png")])
+        #self.player.initialized.connect(lambda: [self.player.mpv.loadfile("icons/film-clapper.png")])
+        self.player.initialized.connect(self._initIcon)
+
+    def _initIcon(self):
+        self.player.mpv.loadfile("icons/film-clapper.png")
 
     def _makeLayout(self):
         mainBox = QtWidgets.QVBoxLayout()  # for all
         btn1Box = QtWidgets.QHBoxLayout()  # test widgets
         btn1Box.setSpacing(20)
         btn1Box.addWidget(self.uiLabel)
         btn1Box.addWidget(self.uiPlayButton)
+        btn1Box.addWidget(self.uiStopButton)
 
         mainBox.addWidget(self.player)
         mainBox.addLayout(btn1Box)
@@ -138,6 +130,14 @@ def centerWindow(self):
         centerPoint = self.screen().availableGeometry().center()
         frameGm.moveCenter(centerPoint)
         self.move(frameGm.topLeft())    
+    
+    def execPlayButton(self):
+        #self.player.play("/media/disk1/UHD/gog.mp4")
+        self.player.play("/media/disk1/makemkv/title_t00.mkv")
+    
+    def execStopButton(self):
+        playing = self.player.mpv.pause #property
+        self.player.mpv.pause=not playing
 
 if __name__ == '__main__':