rattatwinko/mucapy
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ahhhhhhhhhhhhhhhhh ; check fixes
All checks were successful
Build MuCaPy Executable / build-and-package (push) Successful in 1m43s
Details

Browse Source
This commit is contained in:
rattatwinko
2025-06-08 22:39:05 +02:00
parent cc4acb3d3d
commit f2b37b8129
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -11,3 +11,5 @@ mucapy/seperate/__pycache__/NetworkCameraDialog.cpython-313.pyc
mucapy/__pycache__/todo.cpython-313.pyc mucapy/__pycache__/todo.cpython-313.pyc
mucapy/todopackage/__pycache__/__init__.cpython-313.pyc mucapy/todopackage/__pycache__/__init__.cpython-313.pyc
mucapy/todopackage/__pycache__/todo.cpython-313.pyc mucapy/todopackage/__pycache__/todo.cpython-313.pyc
mucapy/todopackage/__pycache__/__init__.cpython-312.pyc
mucapy/todopackage/__pycache__/todo.cpython-312.pyc

24
mucapy/main.py
View File

@@ -17,7 +17,7 @@ from PyQt5.QtCore import Qt, QTimer, QDir, QSize, QSettings, QDateTime, QRect, Q
from PyQt5.QtGui import (QImage, QPixmap, QIcon, QColor, QKeySequence, QPainter, from PyQt5.QtGui import (QImage, QPixmap, QIcon, QColor, QKeySequence, QPainter,
QPen, QBrush) QPen, QBrush)
import platform import platform
import todopackage.todo as todo # This shit will fail eventually import todopackage.todo as todo # This shit will fail eventually | Or not IDK
import time import time
import requests import requests
import subprocess import subprocess
@@ -902,7 +902,7 @@ class AboutWindow(QDialog):
info_label = QLabel(f"<pre>{info_text}</pre>") info_label = QLabel(f"<pre>{info_text}</pre>")
info_label.setWordWrap(True) info_label.setWordWrap(True)
info_label.setAlignment(Qt.AlignCenter) info_label.setAlignment(Qt.AlignCenter)
info_label.setStyleSheet("color: #3eff00 font-style: italic;") info_label.setStyleSheet("color: #2ecc71 ; font-style: italic;")
self.camobj = todo.todo() self.camobj = todo.todo()
cam_text = self.get_cam_text() cam_text = self.get_cam_text()
@@ -1046,13 +1046,8 @@ class NetworkCameraDialog(QDialog):
layout = QVBoxLayout(self) layout = QVBoxLayout(self)
# Instructions label # Instructions label
instructions = QLabel( instructions = QLabel(todo.todo.get_instructions_CaSeDi_QLabel(self))
"Enter network camera details:\n"
"- For DroidCam: Use the IP and port shown in the app\n"
" Example: http://192.168.1.100:4747/video\n"
"- For other IP cameras: Enter the full stream URL\n"
"- Enable authentication if the camera requires username/password"
)
instructions.setWordWrap(True) instructions.setWordWrap(True)
layout.addWidget(instructions) layout.addWidget(instructions)
@@ -1185,14 +1180,9 @@ class CameraSelectorDialog(QDialog):
layout = QVBoxLayout(self) layout = QVBoxLayout(self)
# Instructions with better formatting # Instructions with better formatting
instructions = QLabel( instructions = QLabel(todo.todo.get_instructions_CaSeDi_QLabel(str()))
"Camera Selection Guide:\n\n" print(todo.todo.get_instructions_CaSeDi_QLabel())
"• Local Cameras: Built-in and USB cameras\n"
"• Network Cameras: IP cameras, DroidCam, etc.\n"
"• Use checkboxes to select/deselect cameras\n"
"• Double-click a camera to test the connection\n"
"• Selected cameras will appear in the preview below"
)
instructions.setStyleSheet("QLabel { background-color: #2A2A2A; padding: 10px; border-radius: 4px; }") instructions.setStyleSheet("QLabel { background-color: #2A2A2A; padding: 10px; border-radius: 4px; }")
instructions.setWordWrap(True) instructions.setWordWrap(True)
layout.addWidget(instructions) layout.addWidget(instructions)

18
mucapy/todopackage/todo.py
View File

@@ -20,14 +20,22 @@ NOTE: If you want to run this in Visual Studio Codes built in Terminal you will
NOTE: If you ran this from the Workflow Package, you have somehow managed to fix errors even God cant figure out. NOTE: If you ran this from the Workflow Package, you have somehow managed to fix errors even God cant figure out.
NOTE: If you compiled this yourself ; you are one Fucking Genious NOTE: If you compiled this yourself ; you are one Fucking Genious
#-----------------------# Changes:
# Changes: # Todo in About ; Seperate File (@todo.py)
# Not Very Much lolz #
#-----------------------#
""" # This will center! """ # This will center!
self.instructions_CaSeDi_QLabel : str = ("Camera Selection Guide:\n\n"
"• Local Cameras: Built-in and USB cameras\n"
"• Network Cameras: IP cameras, DroidCam, etc.\n"
"• Use checkboxes to select/deselect cameras\n"
"• Double-click a camera to test the connection\n"
"• Selected cameras will appear in the preview below")
self.todo:str=""" self.todo:str="""
TODO: TODO:
[] - Fix Quesadilla Bug. @todo.py:75 , This has nothing to do with the About Window, but the Network Camera Dialog in @main.py:1038/1049
[] - Fix Network Cameras from Crashing the Programm (This sometimes happens when only network cams are selected and it times out) [] - Fix Network Cameras from Crashing the Programm (This sometimes happens when only network cams are selected and it times out)
[] - Make Seperate Styling (unlikely that this will happen) [] - Make Seperate Styling (unlikely that this will happen)
[] - RTSP Camera Streaming [] - RTSP Camera Streaming
@@ -64,3 +72,5 @@ Cameras:
def getcams(self) -> str: def getcams(self) -> str:
return self.cameraURL return self.cameraURL
def get_instructions_CaSeDi_QLabel(self) -> str:
return self.instructions_CaSeDi_QLabel