diff --git a/.gitignore b/.gitignore index 2285ec4..f343b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ mucapy/seperate/__pycache__/NetworkCameraDialog.cpython-313.pyc mucapy/__pycache__/todo.cpython-313.pyc mucapy/todopackage/__pycache__/__init__.cpython-313.pyc mucapy/todopackage/__pycache__/todo.cpython-313.pyc +mucapy/todopackage/__pycache__/__init__.cpython-312.pyc +mucapy/todopackage/__pycache__/todo.cpython-312.pyc diff --git a/mucapy/main.py b/mucapy/main.py index 3e138ef..9800492 100644 --- a/mucapy/main.py +++ b/mucapy/main.py @@ -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, QPen, QBrush) 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 requests import subprocess @@ -902,7 +902,7 @@ class AboutWindow(QDialog): info_label = QLabel(f"
{info_text}")
info_label.setWordWrap(True)
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()
cam_text = self.get_cam_text()
@@ -1046,13 +1046,8 @@ class NetworkCameraDialog(QDialog):
layout = QVBoxLayout(self)
# Instructions label
- instructions = QLabel(
- "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 = QLabel(todo.todo.get_instructions_CaSeDi_QLabel(self))
+
instructions.setWordWrap(True)
layout.addWidget(instructions)
@@ -1185,14 +1180,9 @@ class CameraSelectorDialog(QDialog):
layout = QVBoxLayout(self)
# Instructions with better formatting
- instructions = QLabel(
- "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"
- )
+ instructions = QLabel(todo.todo.get_instructions_CaSeDi_QLabel(str()))
+ print(todo.todo.get_instructions_CaSeDi_QLabel())
+
instructions.setStyleSheet("QLabel { background-color: #2A2A2A; padding: 10px; border-radius: 4px; }")
instructions.setWordWrap(True)
layout.addWidget(instructions)
diff --git a/mucapy/todopackage/todo.py b/mucapy/todopackage/todo.py
index 52408a5..0603fef 100644
--- a/mucapy/todopackage/todo.py
+++ b/mucapy/todopackage/todo.py
@@ -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 compiled this yourself ; you are one Fucking Genious
-#-----------------------#
-# Changes: #
-# Not Very Much lolz #
-#-----------------------#
+Changes:
+Todo in About ; Seperate File (@todo.py)
+
+
""" # 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="""
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)
[] - Make Seperate Styling (unlikely that this will happen)
[] - RTSP Camera Streaming
@@ -64,3 +72,5 @@ Cameras:
def getcams(self) -> str:
return self.cameraURL
+ def get_instructions_CaSeDi_QLabel(self) -> str:
+ return self.instructions_CaSeDi_QLabel