make voice chat button barely blink when not xmitting (#1256)

* voice chat button not blinking when not xmitting * fixing volcano border * making soft blinking vc button when not xmit * fixing rounded theme border Co-authored-by: jonjamcam <[email protected]>
elieserdejesus · Apr 11, 2020 · 865b3dc · 865b3dc
1 parent 1b31eeb
commit 865b3dc
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 12 deletions.
diff --git a/src/resources/css/common/LocalTrack.css b/src/resources/css/common/LocalTrack.css
@@ -126,7 +126,8 @@ LocalTrackGroupView InstrumentsButton
 }
 
 #xmitButton:!checked,                            /* default state (not checked) is 'not transmiting */
-#voiceChatButton:!checked
+#voiceChatButton:!checked,
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"]
 {
     border-width: 1px;
     font-size: 11px;

diff --git a/src/resources/css/themes/Black_nm/LocalTrack.css b/src/resources/css/themes/Black_nm/LocalTrack.css
@@ -196,6 +196,18 @@ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:0.95, stop:0 rgb(180, 20,
     border: none;
 }
 
+#voiceChatButton:checked
+{
+    background-color: rgb(41, 41, 41);
+    border: none;
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button barely blinking when not transmitting */
+{
+    background-color: rgb(31, 31, 31);
+    border: none;
+}
+
 LocalTrackGroupView #groupNameField
 {
     color: rgb(150, 150, 150);

diff --git a/src/resources/css/themes/Flat/LocalTrack.css b/src/resources/css/themes/Flat/LocalTrack.css
@@ -134,6 +134,18 @@ LocalTrackView #inputPanel:hover
     background-color: rgba(160, 160, 160, 55);
 }
 
+#voiceChatButton:checked
+{
+    background-color: rgba(100, 100, 100, 80);
+    border: 1px solid rgba(100, 100, 100, 55);
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"]  /* Voice chat button barely blinking when not transmitting */
+{
+    background-color: rgba(100, 100, 100, 55);
+    border: 1px solid rgba(100, 100, 100, 55);
+}
+
 LocalTrackView #buttonLooper:disabled
 {
     border: none;

diff --git a/src/resources/css/themes/Game_nm/BaseTrack.css b/src/resources/css/themes/Game_nm/BaseTrack.css
@@ -28,4 +28,7 @@ QLabel#labelPanR
     color: rgb(55, 89, 89);
 }
 
-
+TrackGroupView[unlighted="true"] #topPanel
+{
+    background-color: rgb(15, 29, 30);
+}
diff --git a/src/resources/css/themes/Game_nm/LocalTrack.css b/src/resources/css/themes/Game_nm/LocalTrack.css
@@ -115,7 +115,8 @@ LocalTrackViewStandalone
 }
 
 #voiceChatButton:!checked,
-#voiceChatButton:checked
+#voiceChatButton:checked,
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button not blinking when not transmitting */
 {
     border-image: url('/images/button_checked.png') 7px 8px 7px 7px;
     color: green;

diff --git a/src/resources/css/themes/Ice/LocalTrack.css b/src/resources/css/themes/Ice/LocalTrack.css
@@ -148,16 +148,27 @@ LocalTrackView[unlighted="true"] #inputPanel:hover
 
 #voiceChatButton:!checked
 {
-    background-color: rgba(180, 207, 250, 60);
-    border: 1px outset rgba(0, 0, 140, 120, 60);
-    border-radius: 6px;
+    background-color: rgba(180, 207, 250, 120);
+    border: 1px outset rgba(0, 0, 0, 90);
 }
 
 #voiceChatButton:hover
 {
     background-color: rgba(207, 224, 252, 60);
 }
 
+#voiceChatButton:checked
+{
+    background-color: rgba(180, 207, 250, 120);
+    border: 1px outset rgba(0, 0, 0, 40);
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button barely blinking when not transmitting */
+{
+    background-color: rgba(180, 207, 250, 80);
+    border: 1px outset rgba(0, 0, 0, 40);
+}
+
 LocalTrackView #buttonLooper:disabled
 {
     border: none;

diff --git a/src/resources/css/themes/Navy_nm/BaseTrack.css b/src/resources/css/themes/Navy_nm/BaseTrack.css
@@ -35,7 +35,7 @@ NinjamTrackGroupView[horizontal="true"]
     border-radius: 2px;
 }
 
-
-
-
-
+TrackGroupView[unlighted="true"] #topPanel
+{
+     background-color: rgb(55, 55, 55);
+}
diff --git a/src/resources/css/themes/Navy_nm/LocalTrack.css b/src/resources/css/themes/Navy_nm/LocalTrack.css
@@ -111,7 +111,13 @@ LocalTrackViewStandalone
 #voiceChatButton:!checked,
 #voiceChatButton:checked
 {
-    background-color: rgb(53, 53, 53);
+    background-color: rgb(55, 55, 55);
+    border-color: rgba(0, 0, 0, 30);
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button barely blinking when not transmitting */
+{
+    background-color: rgb(40, 40, 40);
     border-color: rgba(0, 0, 0, 30);
 }
 

diff --git a/src/resources/css/themes/Rounded/LocalTrack.css b/src/resources/css/themes/Rounded/LocalTrack.css
@@ -74,6 +74,11 @@ FxPanelItem QPushButton:checked
     color: rgb(20, 20, 20);
 }
 
+#voiceChatButton:checked[blinking="true"]
+{
+     border: 1px outset rgb(50, 50, 50);
+}
+
 #xmitButton:!checked
 {
     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:0.9, stop:0 rgba(255, 90, 62, 140), stop:1 rgba(175, 0, 0, 140));
@@ -93,10 +98,18 @@ FxPanelItem QPushButton:checked
 }
 
 #voiceChatButton:!checked
+{
+    background-color: qlineargradient(x1:0, y1:0.6, x2:0, y2:1, stop:0 rgba(0, 0, 0, 40), stop:1 rgba(0, 0, 0, 60));
+    border-radius: 2px;
+    border: 1px outset rgb(50, 50, 50);
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button barely blinking when not transmitting */
+
 {
     background-color: qlineargradient(x1:0, y1:0.6, x2:0, y2:1, stop:0 rgba(0, 0, 0, 30), stop:1 rgba(0, 0, 0, 50));
     border-radius: 2px;
-    border: 1px outset rgb(100, 100, 100)
+    border: 1px outset rgb(50, 50, 50);
 }
 
 #voiceChatButton:hover

diff --git a/src/resources/css/themes/Volcano_nm/LocalTrack.css b/src/resources/css/themes/Volcano_nm/LocalTrack.css
@@ -121,6 +121,11 @@ LocalTrackView[unlighted="true"] #inputPanel:hover
     color: black;
 }
 
+#voiceChatButton:checked[blinking="true"]
+{
+     border-color: 1px outset #68300F;
+}
+
 #xmitButton:!checked
 {
     background-color: rgb(255, 0, 0);
@@ -142,6 +147,13 @@ LocalTrackView[unlighted="true"] #inputPanel:hover
 #voiceChatButton:!checked
 {
     background-color:  rgb(189, 90, 29);
+    border: 1px inset #68300F;
+}
+
+TrackGroupView[unlighted="true"] #voiceChatButton:checked[blinking="true"] /* Voice chat button barely blinking when not transmitting */
+{
+    background-color:  rgb(148, 69, 22);
+    border: 1px inset #68300F;
 }
 
 #voiceChatButton:hover