Skip to content

Commit c33f801

Browse files
author
Chris Poore
committed
Miscellaneous style updates
1 parent 8c37a2b commit c33f801

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2706
-1904
lines changed

‎CHANGELOG.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## 2023-07-03
5+
6+
Miscellaneous style updates.
7+
8+
### Added
9+
10+
- Custom pushbutton/combobox text color option
11+
- Disabled text color option
12+
- Icon style (light/dark) color option
13+
- Autofill combobox to populate custom color values (light/dark/custom)
14+
- New color defaults to Options dialog
15+
16+
### Changed
17+
18+
- Assigned global combobox styles and removed extra lines for the exceptions
19+
- Selection font and background colors
20+
- Resized data type combobox in IQ Recording table
21+
22+
### Fixed
23+
24+
- Table comboboxes not resizing to the full height
25+
- Table font size styling
26+
- Combobox font color not set to a defined color
27+
- Disabled doublespinbox/spinbox background color
28+
- Removed extra padding in comboboxes
29+
- Restored right align for certain comboxes
30+
- Menu item shortcuts added to top level items
31+
- Missing custom color replacements in the installer
32+
- Added default values in CRC Calculator tab for Python3_maint-3.10 and Python2_maint-3.7 branches
33+
- Constructed Sequence position in Packet Crafter tab for Python2_maint-3.7 branch
34+
435
## 2023-06-28
536

637
Terminals for menu items, Read the Docs test files.

‎Installer/installer‎

Lines changed: 63 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import subprocess
77
import os
88
import sys
99
import time
10+
import re
1011

1112
this_file_directory = os.path.dirname(os.path.realpath(__file__))
1213
fissure_directory = os.path.abspath(os.path.join(this_file_directory, os.pardir))
@@ -7838,13 +7839,39 @@ class InstallDialog2(QtWidgets.QDialog, form_class2):
78387839
color3 = "#17365D"
78397840
color4 = "#000000"
78407841
color5 = "#FFFFFF"
7842+
color6 = "#FEFEFE"
7843+
color7 = "#EFEFEF"
7844+
color8 = "#FEFEFE"
7845+
color9 = "#EFEFEF"
7846+
color10 = "#FEFEFE"
7847+
color11 = "#F8F8F8"
7848+
color12 = "#000000"
7849+
color13 = "#C0C0C0"
78417850
get_css_text = str(open('/' + os.path.dirname(os.path.realpath(__file__)).strip('/Installer') + "/UI/Style_Sheets/light.css","r").read())
7842-
get_css_text = get_css_text.replace("@color1",color1)
7843-
get_css_text = get_css_text.replace("@color2",color2)
7844-
get_css_text = get_css_text.replace("@color3",color3)
7845-
get_css_text = get_css_text.replace("@color4",color4)
7846-
get_css_text = get_css_text.replace("@color5",color5)
7851+
get_css_text = re.sub(r'@color1\b',color1,get_css_text)
7852+
get_css_text = re.sub(r'@color2\b',color2,get_css_text)
7853+
get_css_text = re.sub(r'@color3\b',color3,get_css_text)
7854+
get_css_text = re.sub(r'@color4\b',color4,get_css_text)
7855+
get_css_text = re.sub(r'@color5\b',color5,get_css_text)
7856+
get_css_text = re.sub(r'@color6\b',color6,get_css_text)
7857+
get_css_text = re.sub(r'@color7\b',color7,get_css_text)
7858+
get_css_text = re.sub(r'@color8\b',color8,get_css_text)
7859+
get_css_text = re.sub(r'@color9\b',color9,get_css_text)
7860+
get_css_text = re.sub(r'@color10\b',color10,get_css_text)
7861+
get_css_text = re.sub(r'@color11\b',color11,get_css_text)
7862+
get_css_text = re.sub(r'@color12\b',color12,get_css_text)
7863+
get_css_text = re.sub(r'@color13\b',color13,get_css_text)
7864+
get_css_text = re.sub(r'@unchecked_enabled\b','light-unchecked.png',get_css_text)
7865+
get_css_text = re.sub(r'@checked_enabled\b','light-checked.png',get_css_text)
7866+
get_css_text = re.sub(r'@checked_disabled\b','light-checked-disabled.png',get_css_text)
7867+
get_css_text = re.sub(r'@unchecked_disabled\b','light-unchecked-disabled.png',get_css_text)
7868+
get_css_text = re.sub(r'@down_arrow_enabled\b','light-down-arrow.png',get_css_text)
7869+
get_css_text = re.sub(r'@down_arrow_disabled\b','light-down-arrow-disabled.png',get_css_text)
7870+
get_css_text = re.sub(r'@radio_unchecked_enabled\b','light-radio.png',get_css_text)
7871+
get_css_text = re.sub(r'@radio_checked_enabled\b','light-radio-checked.png',get_css_text)
78477872
get_css_text = get_css_text.replace("@icon_path",'/' + os.path.dirname(os.path.realpath(__file__)).strip('/Installer') + "/docs/Icons")
7873+
get_css_text = get_css_text.replace('@menu_hover_padding','0px')
7874+
self.setStyleSheet(get_css_text)
78487875
self.setStyleSheet(get_css_text)
78497876

78507877
# Do SIGNAL/Slots Connections
@@ -8138,14 +8165,39 @@ class InstallDialog1(QtWidgets.QDialog, form_class):
81388165
color3 = "#17365D"
81398166
color4 = "#000000"
81408167
color5 = "#FFFFFF"
8168+
color6 = "#FEFEFE"
8169+
color7 = "#EFEFEF"
8170+
color8 = "#FEFEFE"
8171+
color9 = "#EFEFEF"
8172+
color10 = "#FEFEFE"
8173+
color11 = "#F8F8F8"
8174+
color12 = "#000000"
8175+
color13 = "#C0C0C0"
81418176
get_css_text = str(open('/' + os.path.dirname(os.path.realpath(__file__)).strip('/Installer') + "/UI/Style_Sheets/light.css","r").read())
8142-
get_css_text = get_css_text.replace("@color1",color1)
8143-
get_css_text = get_css_text.replace("@color2",color2)
8144-
get_css_text = get_css_text.replace("@color3",color3)
8145-
get_css_text = get_css_text.replace("@color4",color4)
8146-
get_css_text = get_css_text.replace("@color5",color5)
8177+
get_css_text = re.sub(r'@color1\b',color1,get_css_text)
8178+
get_css_text = re.sub(r'@color2\b',color2,get_css_text)
8179+
get_css_text = re.sub(r'@color3\b',color3,get_css_text)
8180+
get_css_text = re.sub(r'@color4\b',color4,get_css_text)
8181+
get_css_text = re.sub(r'@color5\b',color5,get_css_text)
8182+
get_css_text = re.sub(r'@color6\b',color6,get_css_text)
8183+
get_css_text = re.sub(r'@color7\b',color7,get_css_text)
8184+
get_css_text = re.sub(r'@color8\b',color8,get_css_text)
8185+
get_css_text = re.sub(r'@color9\b',color9,get_css_text)
8186+
get_css_text = re.sub(r'@color10\b',color10,get_css_text)
8187+
get_css_text = re.sub(r'@color11\b',color11,get_css_text)
8188+
get_css_text = re.sub(r'@color12\b',color12,get_css_text)
8189+
get_css_text = re.sub(r'@color13\b',color13,get_css_text)
8190+
get_css_text = re.sub(r'@unchecked_enabled\b','light-unchecked.png',get_css_text)
8191+
get_css_text = re.sub(r'@checked_enabled\b','light-checked.png',get_css_text)
8192+
get_css_text = re.sub(r'@checked_disabled\b','light-checked-disabled.png',get_css_text)
8193+
get_css_text = re.sub(r'@unchecked_disabled\b','light-unchecked-disabled.png',get_css_text)
8194+
get_css_text = re.sub(r'@down_arrow_enabled\b','light-down-arrow.png',get_css_text)
8195+
get_css_text = re.sub(r'@down_arrow_disabled\b','light-down-arrow-disabled.png',get_css_text)
8196+
get_css_text = re.sub(r'@radio_unchecked_enabled\b','light-radio.png',get_css_text)
8197+
get_css_text = re.sub(r'@radio_checked_enabled\b','light-radio-checked.png',get_css_text)
81478198
get_css_text = get_css_text.replace("@icon_path",'/' + os.path.dirname(os.path.realpath(__file__)).strip('/Installer') + "/docs/Icons")
8148-
self.setStyleSheet(get_css_text)
8199+
get_css_text = get_css_text.replace('@menu_hover_padding','0px')
8200+
self.setStyleSheet(get_css_text)
81498201

81508202
# Do SIGNAL/Slots Connections
81518203
self._connectSlots()

‎Logs/event.log‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
06/28/2023 06:18:01 PM - dashboard: Port Initialized to tcp://127.0.0.1:5051
2-
06/28/2023 06:18:01 PM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
3-
06/28/2023 06:18:01 PM - dashboard: Port Initialized to tcp://127.0.0.1:5057
4-
06/28/2023 06:18:01 PM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
5-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5055
6-
06/28/2023 06:18:01 PM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
7-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5059
8-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5060
9-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5065
10-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5061
11-
06/28/2023 06:18:01 PM - dashboard: Port Connected to tcp://127.0.0.1:5063
12-
06/28/2023 06:18:02 PM - hiprfisr: End of HIPRFISR Initialization
13-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5051
14-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
15-
06/28/2023 06:18:02 PM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052
16-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
17-
06/28/2023 06:18:02 PM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053
18-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
19-
06/28/2023 06:18:02 PM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054
20-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
21-
06/28/2023 06:18:02 PM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055
22-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
23-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5057
24-
06/28/2023 06:18:02 PM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
25-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5059
26-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5060
27-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5065
28-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5061
29-
06/28/2023 06:18:02 PM - hiprfisr: Port Connected to tcp://127.0.0.1:5063
30-
06/28/2023 06:18:02 PM - hiprfisr: Start of Main Event Loop
31-
06/28/2023 06:18:02 PM - fge: Port Connected to tcp://127.0.0.1:5053
32-
06/28/2023 06:18:02 PM - tsi: Port Connected to tcp://localhost:5052
33-
06/28/2023 06:18:02 PM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
34-
06/28/2023 06:18:02 PM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
35-
06/28/2023 06:18:02 PM - tsi: Port Initialized to tcp://*:5059
36-
06/28/2023 06:18:02 PM - fge: Port Initialized to tcp://127.0.0.1:5061
37-
06/28/2023 06:18:02 PM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
38-
06/28/2023 06:18:02 PM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
39-
06/28/2023 06:18:02 PM - tsi: Port Connected to tcp://127.0.0.1:5055
40-
06/28/2023 06:18:02 PM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
41-
06/28/2023 06:18:02 PM - tsi: Port Connected to tcp://127.0.0.1:5057
42-
06/28/2023 06:18:02 PM - fge: Port Connected to tcp://127.0.0.1:5055
43-
06/28/2023 06:18:02 PM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
44-
06/28/2023 06:18:02 PM - fge: Port Connected to tcp://127.0.0.1:5057
45-
06/28/2023 06:18:03 PM - pd: Port Connected to tcp://127.0.0.1:5054
46-
06/28/2023 06:18:03 PM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
47-
06/28/2023 06:18:03 PM - pd: Port Initialized to tcp://127.0.0.1:5063
48-
06/28/2023 06:18:03 PM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
49-
06/28/2023 06:18:03 PM - pd: Port Connected to tcp://127.0.0.1:5055
50-
06/28/2023 06:18:03 PM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
51-
06/28/2023 06:18:03 PM - pd: Port Connected to tcp://127.0.0.1:5057
52-
06/28/2023 06:18:03 PM - hiprfisr: Sending message: HIPRFISR: Connected TSI
53-
06/28/2023 06:18:03 PM - hiprfisr: Sending message: HIPRFISR: Connected FGE
54-
06/28/2023 06:18:03 PM - hiprfisr: Sending message: HIPRFISR: Connected PD
55-
06/28/2023 06:18:04 PM - dashboard: Received message: HIPRFISR: Connected TSI
56-
06/28/2023 06:18:04 PM - dashboard: Received message: HIPRFISR: Connected FGE
57-
06/28/2023 06:18:04 PM - dashboard: Received message: HIPRFISR: Connected PD
58-
06/28/2023 06:18:36 PM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters
59-
06/28/2023 06:18:36 PM - dashboard: Sending message: Dashboard: Stop PD $Parameters
60-
06/28/2023 06:18:36 PM - hiprfisr: Received message: Dashboard: Stop TSI Detector $Parameters
61-
06/28/2023 06:18:36 PM - hiprfisr: Executing Callback: stopTSI_Detector with parameters None
62-
06/28/2023 06:18:36 PM - hiprfisr: Sending message: HIPRFISR: Stop TSI Detector $Parameters
63-
06/28/2023 06:18:36 PM - hiprfisr: Received message: Dashboard: Stop PD $Parameters
64-
06/28/2023 06:18:36 PM - hiprfisr: Executing Callback: stopPD with parameters None
65-
06/28/2023 06:18:36 PM - hiprfisr: Sending message: HIPRFISR: Stop PD $Parameters
1+
07/03/2023 12:26:20 AM - dashboard: Port Initialized to tcp://127.0.0.1:5051
2+
07/03/2023 12:26:20 AM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
3+
07/03/2023 12:26:20 AM - dashboard: Port Initialized to tcp://127.0.0.1:5057
4+
07/03/2023 12:26:20 AM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
5+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5055
6+
07/03/2023 12:26:20 AM - dashboard: Initialized Schema: /home/laptop1/FISSURE/YAML/dashboard.yaml
7+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5059
8+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5060
9+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5065
10+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5061
11+
07/03/2023 12:26:20 AM - dashboard: Port Connected to tcp://127.0.0.1:5063
12+
07/03/2023 12:26:21 AM - hiprfisr: End of HIPRFISR Initialization
13+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5051
14+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
15+
07/03/2023 12:26:21 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052
16+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
17+
07/03/2023 12:26:21 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053
18+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
19+
07/03/2023 12:26:21 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054
20+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
21+
07/03/2023 12:26:21 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055
22+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
23+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5057
24+
07/03/2023 12:26:21 AM - hiprfisr: Initialized Schema: /home/laptop1/FISSURE/YAML/hiprfisr.yaml
25+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5059
26+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5060
27+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5065
28+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5061
29+
07/03/2023 12:26:21 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5063
30+
07/03/2023 12:26:21 AM - hiprfisr: Start of Main Event Loop
31+
07/03/2023 12:26:21 AM - tsi: Port Connected to tcp://localhost:5052
32+
07/03/2023 12:26:21 AM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
33+
07/03/2023 12:26:21 AM - tsi: Port Initialized to tcp://*:5059
34+
07/03/2023 12:26:21 AM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
35+
07/03/2023 12:26:21 AM - tsi: Port Connected to tcp://127.0.0.1:5055
36+
07/03/2023 12:26:21 AM - tsi: Initialized Schema: /home/laptop1/FISSURE/YAML/tsi.yaml
37+
07/03/2023 12:26:21 AM - tsi: Port Connected to tcp://127.0.0.1:5057
38+
07/03/2023 12:26:21 AM - fge: Port Connected to tcp://127.0.0.1:5053
39+
07/03/2023 12:26:21 AM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
40+
07/03/2023 12:26:21 AM - fge: Port Initialized to tcp://127.0.0.1:5061
41+
07/03/2023 12:26:21 AM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
42+
07/03/2023 12:26:21 AM - fge: Port Connected to tcp://127.0.0.1:5055
43+
07/03/2023 12:26:21 AM - fge: Initialized Schema: /home/laptop1/FISSURE/YAML/fge.yaml
44+
07/03/2023 12:26:21 AM - fge: Port Connected to tcp://127.0.0.1:5057
45+
07/03/2023 12:26:22 AM - pd: Port Connected to tcp://127.0.0.1:5054
46+
07/03/2023 12:26:22 AM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
47+
07/03/2023 12:26:22 AM - pd: Port Initialized to tcp://127.0.0.1:5063
48+
07/03/2023 12:26:22 AM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
49+
07/03/2023 12:26:22 AM - pd: Port Connected to tcp://127.0.0.1:5055
50+
07/03/2023 12:26:22 AM - pd: Initialized Schema: /home/laptop1/FISSURE/YAML/pd.yaml
51+
07/03/2023 12:26:22 AM - pd: Port Connected to tcp://127.0.0.1:5057
52+
07/03/2023 12:26:22 AM - hiprfisr: Sending message: HIPRFISR: Connected TSI
53+
07/03/2023 12:26:22 AM - hiprfisr: Sending message: HIPRFISR: Connected FGE
54+
07/03/2023 12:26:22 AM - hiprfisr: Sending message: HIPRFISR: Connected PD
55+
07/03/2023 12:26:23 AM - dashboard: Sending message: Dashboard: Set Process SOIs [False, None, None, None]
56+
07/03/2023 12:26:23 AM - dashboard: Sending message: Dashboard: SOI Selection Mode 0
57+
07/03/2023 12:26:23 AM - dashboard: Received message: HIPRFISR: Connected TSI
58+
07/03/2023 12:26:23 AM - dashboard: Received message: HIPRFISR: Connected FGE
59+
07/03/2023 12:26:23 AM - dashboard: Received message: HIPRFISR: Connected PD
60+
07/03/2023 12:26:23 AM - hiprfisr: Received message: Dashboard: Set Process SOIs [False, None, None, None]
61+
07/03/2023 12:26:23 AM - hiprfisr: Executing Callback: setProcessSOIs with parameters [False, None, None, None]
62+
07/03/2023 12:26:23 AM - hiprfisr: Received message: Dashboard: SOI Selection Mode 0
63+
07/03/2023 12:26:23 AM - hiprfisr: Executing Callback: setSOI_SelectionMode with parameters 0
64+
07/03/2023 12:26:47 AM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters
65+
07/03/2023 12:26:47 AM - dashboard: Sending message: Dashboard: Stop PD $Parameters

0 commit comments

Comments
 (0)