Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Color contrast improvements (#361)

philipqueenafe975a6426d
diff --git a/freemocap/gui/qt/style_sheet/qt_style_sheet.css b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
index dee6cfe4..0528d967 100644
--- a/freemocap/gui/qt/style_sheet/qt_style_sheet.css
+++ b/freemocap/gui/qt/style_sheet/qt_style_sheet.css
@@ -1,4 +1,3 @@
- /* If you want to update the appearance of the GUI, please make changes to the `qt_stylesheet.scss` file. */
* {
font-family: "Dosis", sans-serif;
/*font-size: 12px;*/
@@ -8,9 +7,7 @@ QGroupBox {
border: 1px solid #254342;
border-radius: 4px;
margin-top: 10px;
- font-weight: bold; }
-
-QGroupBox {
+ font-weight: bold;
background-color: #a4d6d9; }
QStatusBar {
@@ -88,6 +85,8 @@ WelcomeScreenButton[recommended_next=true] {
QLabel {
font-size: 14px;
color: #333333; }
+ QTreeView QLabel {
+ color: black; }
QLabel:disabled {
color: #a4d6d9; }
@@ -96,16 +95,16 @@ QLineEdit {
border: 1px solid #29394a;
border-radius: 4px;
padding: 0 8px;
- color: #333333; }
+ color: #333333;
+ background-color: white; }
QLineEdit:disabled {
color: #333333;
- background-color: #29394a; }
+ background-color: #687e90; }
QTreeView {
background-color: #7983b1;
- alternate-background-color: #a3b1ed;
- color: white;
+ color: black;
font-weight: bold;
font-family: "Roboto", sans-serif;
font-size: 12px; }
diff --git a/freemocap/gui/qt/style_sheet/qt_style_sheet.scss b/freemocap/gui/qt/style_sheet/qt_style_sheet.scss
index 69ed877b..ed563305 100644
--- a/freemocap/gui/qt/style_sheet/qt_style_sheet.scss
+++ b/freemocap/gui/qt/style_sheet/qt_style_sheet.scss
@@ -10,7 +10,7 @@ $disabled-button-blue: #687e90;
$tree-primary: #7983b1;
$tree-secondary: #a3b1ed;
$plain-white: white;
-
+$plain-black: black;
* {
font-family: "Dosis", sans-serif;
@@ -23,13 +23,8 @@ QGroupBox {
border-radius: 4px;
margin-top: 10px;
font-weight: bold;
-}
-QGroupBox{
background-color: $skelly-bone-blue;
}
-//QGroupBox[calibration_videos_radio_button_checked=true] {
-// background-color: $laser-red;
-//}
QStatusBar {
color: $freemocap-green;
@@ -76,7 +71,6 @@ QPushButton {
color: $plain-white;
}
-
QPushButton:disabled {
background-color: $tree-primary;
border: 1px solid $tree-primary;
@@ -104,7 +98,6 @@ QPushButton#stop_recording_button:enabled {
border: 3px solid $laser-red;
}
-
WelcomeScreenButton {
border: 2px solid $dark-charcoal;
background-color: $freemocap-green;
@@ -114,16 +107,18 @@ WelcomeScreenButton {
padding: 10px;
}
-
WelcomeScreenButton[recommended_next = true] {
background-color: $laser-red;
color: $plain-white;
}
-
QLabel {
font-size: 14px;
color: $dark-charcoal;
+
+ QTreeView & {
+ color: $plain-black;
+ }
}
QLabel:disabled {
@@ -135,17 +130,16 @@ QLineEdit {
border-radius: 4px;
padding: 0 8px;
color: $dark-charcoal;
-
+ background-color: $plain-white;
}
QLineEdit:disabled {
color: $dark-charcoal;
- background-color: $button-blue;
+ background-color: $disabled-button-blue;
}
QTreeView {
background-color: $tree-primary;
- alternate-background-color: $tree-secondary;
- color: $plain-white;
+ color: $plain-black;
font-weight: bold;
font-family: "Roboto", sans-serif;
font-size: 12px;
@@ -169,3 +163,5 @@ LogViewWidget {
font-size: 12px;
padding: 8px;
}
+
+
diff --git a/freemocap/gui/qt/widgets/camera_controller_group_box.py b/freemocap/gui/qt/widgets/camera_controller_group_box.py
index 1e2fd0c7..454b8bce 100644
--- a/freemocap/gui/qt/widgets/camera_controller_group_box.py
+++ b/freemocap/gui/qt/widgets/camera_controller_group_box.py
@@ -50,6 +50,8 @@ class CameraControllerGroupBox(QGroupBox):
self._layout.addWidget(self._skellycam_controller)
def _create_videos_will_save_to_layout(self):
+ vbox = QVBoxLayout()
+
hbox = QHBoxLayout()
self._recording_string_tag_line_edit = QLineEdit(parent=self)
self._recording_string_tag_line_edit.setPlaceholderText("(Optional)")
@@ -65,7 +67,13 @@ class CameraControllerGroupBox(QGroupBox):
self._recording_path_label = QLabel(f"{self.get_new_recording_path()}")
self._recording_path_label.setStyleSheet("font-family: monospace; font-size: 10px;")
hbox.addWidget(self._recording_path_label)
- return hbox
+
+ vbox.addLayout(hbox)
+
+ lag_note_label = QLabel("NOTE: If you experience lag in your camera views, decrease the resolution and/or use fewer cameras.\nWe are working on a fix which should be done 'soon' (written: 2023-04-05)")
+ vbox.addWidget(lag_note_label)
+
+ return vbox
def _create_mocap_recording_option_layout(self):
hbox = QHBoxLayout()
diff --git a/freemocap/gui/qt/widgets/home_widget.py b/freemocap/gui/qt/widgets/home_widget.py
index 2977b98b..0a90414f 100644
--- a/freemocap/gui/qt/widgets/home_widget.py
+++ b/freemocap/gui/qt/widgets/home_widget.py
@@ -74,7 +74,7 @@ class HomeWidget(QWidget):
self._send_pings_checkbox.setChecked(True)
self._layout.addWidget(self._send_pings_checkbox, alignment=Qt.AlignmentFlag.AlignCenter)
- privacy_policy_link_string = '<a href="https://freemocap.readthedocs.io/en/latest/privacy_policy/" style="color: white;">Click here to view our privacy policy</a>'
+ privacy_policy_link_string = '<a href="https://freemocap.readthedocs.io/en/latest/privacy_policy/" style="color: #333333;">Click here to view our privacy policy</a>'
self._privacy_policy_link = QLabel(privacy_policy_link_string)
self._privacy_policy_link.setOpenExternalLinks(True)
self._layout.addWidget(self._privacy_policy_link, alignment=Qt.AlignmentFlag.AlignCenter)