Skip to content

Commit

Permalink
Merge pull request #611 from ncssar/579-operator-login
Browse files Browse the repository at this point in the history 
WIP #579
  • Loading branch information
@caver456
caver456 authored Dec 31, 2022
2 parents ad6c151 + 0e0dd46 commit c17867c
Show file tree
Hide file tree
Showing 12 changed files with 3,545 additions and 1,858 deletions.
11 changes: 11 additions & 0 deletions config_default/radiolog.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,14 @@
# a different group, separated from the first group's tabs by a gap
# EXAMPLE: tabGroups=[["NCSOcmd","^1[sel][0-9]+"],["NCSO","^1[tpndovg][0-9]+"],["NCPD","^2[atpnsdelovg][0-9]+"],["TPD","^3[atpnsdelovg][0-9]+"],["GVPD","^4[atpnsdelovg][0-9]+"],["CHP","^22s[0-9]+"],["Numbers","^Team [0-9]+"]]
#tabGroups=[["Numbers","^Team [0-9]+"]]

# useOperatorLogin
# - True or False (default = True) - specifies whether operator logins
# are tracked during radiolog sessions. If True:
# - a clickable login silhouette with initials and ID will show at
# the top right of the main window, which opens the login dialog
# - all GUI and generated PDF tables will include a separate column
# showing the initials of the operator for each call
# - generated clue report PDFs will show the initials and ID of the
# operator who entered the clue report
#useOperatorLogin=False
115 changes: 80 additions & 35 deletions designer/help.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>931</width>
<height>532</height>
<height>581</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -31,7 +31,7 @@
<x>12</x>
<y>17</y>
<width>939</width>
<height>504</height>
<height>531</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
Expand Down Expand Up @@ -207,6 +207,11 @@
<string>New Row</string>
</property>
</row>
<row>
<property name="text">
<string>New Row</string>
</property>
</row>
<row>
<property name="text">
<string>F12</string>
Expand Down Expand Up @@ -250,15 +255,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="0" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="0" column="2">
Expand All @@ -284,15 +289,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="1" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="1" column="2">
Expand All @@ -318,15 +323,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="2" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="2" column="2">
Expand All @@ -352,15 +357,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="3" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="3" column="2">
Expand All @@ -386,15 +391,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="4" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="4" column="2">
Expand All @@ -420,15 +425,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="5" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="5" column="2">
Expand All @@ -454,15 +459,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="6" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="6" column="2">
Expand All @@ -488,15 +493,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="7" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="7" column="2">
Expand All @@ -522,15 +527,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="8" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="8" column="2">
Expand All @@ -544,7 +549,7 @@
</font>
</property>
<property name="textAlignment">
<set>AlignLeft|AlignVCenter</set>
<set>AlignLeading|AlignVCenter</set>
</property>
</item>
<item row="9" column="0">
Expand All @@ -559,15 +564,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="9" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="9" column="2">
Expand All @@ -593,15 +598,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="10" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="10" column="2">
Expand All @@ -627,15 +632,15 @@
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="11" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="11" column="2">
Expand All @@ -651,55 +656,95 @@
</item>
<item row="12" column="0">
<property name="text">
<string>F12</string>
<string>F9</string>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="12" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="12" column="2">
<property name="text">
<string>Toggle Team Hotkeys (disables default alphanumeric hotkeys)</string>
<string>Operater Login (if used)</string>
</property>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>9</pointsize>
</font>
</property>
</item>
<item row="13" column="0">
<property name="text">
<string>+ / -</string>
<string>F12</string>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="textAlignment">
<set>AlignRight|AlignVCenter</set>
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="13" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
<set>AlignCenter</set>
</property>
</item>
<item row="13" column="2">
<property name="text">
<string>Toggle Team Hotkeys (disables default alphanumeric hotkeys)</string>
</property>
<property name="font">
<font>
<family>Segoe UI</family>
<pointsize>9</pointsize>
</font>
</property>
</item>
<item row="14" column="0">
<property name="text">
<string>+ / -</string>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="textAlignment">
<set>AlignTrailing|AlignVCenter</set>
</property>
</item>
<item row="14" column="1">
<property name="text">
<string>-</string>
</property>
<property name="textAlignment">
<set>AlignCenter</set>
</property>
</item>
<item row="14" column="2">
<property name="text">
<string>Enlarge / Reduce Font</string>
</property>
Expand Down
Loading

0 comments on commit c17867c

Please sign in to comment.