Free Motion Capture for Everyone πβ¨
TypeScript
Add primary button
nikkirostollandcf418a1ce26
diff --git a/requirements.txt b/requirements.txtindex 059a594e..65a490e2 100644--- a/requirements.txt+++ b/requirements.txt@@ -24,3 +24,5 @@ mediapipe~=0.8.9.1setuptools~=58.0.4aniposelib~=0.4.3rich~=12.3.0+protobuf~=3.19.0+diff --git a/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py b/src/freemocap_qt_gui/conference/shared_widgets/primary_button.pynew file mode 100644index 00000000..a1842537--- /dev/null+++ b/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py@@ -0,0 +1,14 @@+from PyQt6.QtWidgets import QPushButton+++class PrimaryButton(QPushButton):+ def __init__(self, *args, **kwargs):+ super().__init__(*args, **kwargs)+ self.setStyleSheet("""+ background-color: #336e6d;+ border-radius: 4px;+ min-height: 32px;+ max-width: 160px;+ font-weight: 400;+ font-size: 16px;+ """)diff --git a/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py b/src/freemocap_qt_gui/conference/workflows/calibration_instructions.pyindex 2eda4bde..b45eb825 100644--- a/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py+++ b/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py@@ -1,13 +1,14 @@-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidgetfrom src.freemocap_qt_gui.conference.shared_widgets.page_title import PageTitle+from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButtonclass CalibrationInstructions(QWidget):def __init__(self):super().__init__()- self._continue_button = QPushButton("Continue")+ self._continue_button = PrimaryButton("Continue")container = QVBoxLayout()container.addLayout(self._create_title_layout())diff --git a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py b/src/freemocap_qt_gui/conference/workflows/camera_configuration.pyindex 1113c49f..d1bcbd9a 100644--- a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py+++ b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py@@ -4,6 +4,7 @@ from PyQt6.QtGui import QPixmapfrom PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidgetfrom src.freemocap_qt_gui.conference.shared_widgets.page_title import PageTitle+from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButtonfrom src.freemocap_qt_gui.conference.workers.cam_frame_worker import CamFrameWorkerfrom src.freemocap_qt_gui.conference.workflows.available_cameras_list import AvailableCamerasListfrom src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE@@ -52,7 +53,7 @@ class CameraConfiguration(QWidget):return workerdef _create_accept_button(self):- accept_button = QPushButton("Accept")+ accept_button = PrimaryButton("Accept")accept_button.clicked.connect(self._handle_accept_button_click)return accept_buttondiff --git a/src/freemocap_qt_gui/conference/workflows/new_recording_session.py b/src/freemocap_qt_gui/conference/workflows/new_recording_session.pyindex dd8325af..f680414c 100644--- a/src/freemocap_qt_gui/conference/workflows/new_recording_session.py+++ b/src/freemocap_qt_gui/conference/workflows/new_recording_session.py@@ -1,9 +1,9 @@-from PyQt6.QtCore import Qtfrom PyQt6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QVBoxLayout, \QWidgetfrom src.config.home_dir import create_session_idfrom src.freemocap_qt_gui.conference.shared_widgets.page_title import PageTitle+from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButtonfrom src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE@@ -12,6 +12,8 @@ class NewRecordingSession(QWidget):def __init__(self):super().__init__()+ self._submit_button = PrimaryButton("&Start Session")+container = QVBoxLayout()session_title = self._create_record_sesion_title()@@ -24,8 +26,7 @@ class NewRecordingSession(QWidget):container.addLayout(session_id_text_layout)- self._submit_button = self._create_submit_button()- container.addWidget(self._submit_button)+ container.addLayout(self._create_submit_button_layout())self.setLayout(container)@@ -42,11 +43,11 @@ class NewRecordingSession(QWidget):session_text_input.setText(create_session_id())return session_text_input- def _create_submit_button(self):- submit = QPushButton("&Start Session")- submit.setFixedWidth(100)- submit.clicked.connect(self._assign_session_id_to_state)- return submit+ def _create_submit_button_layout(self):+ submit_button_layout = QHBoxLayout()+ self._submit_button.clicked.connect(self._assign_session_id_to_state)+ submit_button_layout.addWidget(self._submit_button)+ return submit_button_layoutdef _assign_session_id_to_state(self):APP_STATE.session_id = self._session_input.text()diff --git a/src/freemocap_qt_gui/conference/workflows/record_instructions.py b/src/freemocap_qt_gui/conference/workflows/record_instructions.pyindex 673191fd..191fea4a 100644--- a/src/freemocap_qt_gui/conference/workflows/record_instructions.py+++ b/src/freemocap_qt_gui/conference/workflows/record_instructions.py@@ -1,11 +1,13 @@-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget++from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButtonclass RecordInstructions(QWidget):def __init__(self):super().__init__()- self._record_button = QPushButton("Record")+ self._record_button = PrimaryButton("Record")container = QVBoxLayout()container.addLayout(self._create_title_layout())diff --git a/src/freemocap_qt_gui/conference/workflows/welcome.py b/src/freemocap_qt_gui/conference/workflows/welcome.pyindex 90bb2f06..1773be4d 100644--- a/src/freemocap_qt_gui/conference/workflows/welcome.py+++ b/src/freemocap_qt_gui/conference/workflows/welcome.py@@ -1,8 +1,9 @@from PyQt6.QtCore import Qtfrom PyQt6.QtGui import QPixmap-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget, QGridLayout+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget, QGridLayout, QSpacerItemfrom src.freemocap_qt_gui.conference.qt_utils.set_font_size import set_font_size+from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButtonclass Welcome(QWidget):@@ -10,7 +11,7 @@ class Welcome(QWidget):def __init__(self):super().__init__()- self._new_session_button = QPushButton("Start New Session")+ self._new_session_button = PrimaryButton("Start New Session")container = QVBoxLayout()# container.addLayout(self._create_logo())@@ -45,4 +46,3 @@ class Welcome(QWidget):# label.setPixmap(pixmap)# grid.addWidget(label, 1, 1)# return grid-