v1.2

@Resources/Includes/Tray1.inc

@@ -3,15 +3,15 @@
 [AppVolper0]
 Measure=Plugin
 Plugin=Win7AudioPlugin
-IfCondition=AppVolper0 <= 0
+IfCondition=AppVolper0 < 0
 iftrueaction=[!SetOption MeasureTray IconName "#@#Icons\Volume0#IconTheme#.ico"][!UpdateMeasure MeasureTray]
-IfCondition2=(AppVolPer0 > 0) && (AppVolPer0 < 20)
+IfCondition2=(AppVolPer0 = 0)
 IfTrueAction2=[!SetOption MeasureTray IconName "#@#Icons\Volume1#IconTheme#.ico"][!UpdateMeasure MeasureTray]
-IfCondition3=(AppVolPer0 >= 20) && (AppVolPer0 < 50)
+IfCondition3=(AppVolPer0 > 0) && (AppVolPer0 < 30)
 IfTrueAction3=[!SetOption MeasureTray IconName "#@#Icons\Volume2#IconTheme#.ico"][!UpdateMeasure MeasureTray]
-IfCondition4=(AppVolPer0 >= 50) && (AppVolPer0 < 90)
+IfCondition4=(AppVolPer0 >= 30) && (AppVolPer0 < 70)
 IfTrueAction4=[!SetOption MeasureTray IconName "#@#Icons\Volume3#IconTheme#.ico"][!UpdateMeasure MeasureTray]
-IfCondition5=(AppVolPer0 >= 90)
+IfCondition5=(AppVolPer0 >= 70)
 IfTrueAction5=[!SetOption MeasureTray IconName "#@#Icons\Volume4#IconTheme#.ico"][!UpdateMeasure MeasureTray]
 DynamicVariables=1
 UpdateDivider=1

@Resources/Powershell/generateMixer.ps1

@@ -2,8 +2,27 @@ function generateMixer {
     $saveLocation = "$($RmAPI.VariableStr('ROOTCONFIGPATH'))Main\Accessories\Page\Main.ini"
     $scale = $RmAPI.VariableStr('scale')
     $pageW = $RmAPI.VariableStr('W')
+    $collapsetype = $RmAPI.VariableStr('CollapseIcons')
 
     $rows = $RmAPI.Measure('AppVolumeParent')
+    if ($collapsetype -ne 0) {
+        $AppArray = @()
+        $SkipIndex = @()
+
+        for (($i = 1); $i -le $rows; $i++) {
+            $RmAPI.Bang("[!SetOption AppVolTester Index $i][!UpdateMeasure AppVolTester]")
+            $AppName = $RmAPI.MeasureStr('AppvolTester')
+            if ($AppName -in $AppArray) {
+                $SkipIndex += $i
+            } 
+            $AppArray += $appName
+        }
+
+        if ($collapsetype -eq 2) {
+            $AppHash = $AppArray | Group-Object -AsHashTable -AsString
+        }
+    } 
+
     if (($rows -gt 0) -and ($RmAPI.Variable('Stroke') -eq 1)) {
         $fileContent += @"
 
@@ -14,15 +33,62 @@ MeterStyle=DividerStyle
 "@
     $additionalSize = 40
     }
-    $pageH = ((60+(40+($RmAPI.Variable('additionalPadding')))*($rows+1)+20+$additionalSize) * $scale)
-    for (($i = 1); $i -le $rows; $i++) {
-        $fileContent += @"
+
+    # $pageH = ((80+(40+($RmAPI.Variable('additionalPadding')))*($rows+1-$SkipIndex.Count)+20+$additionalSize) * $scale)
+    $pad = $RmAPI.Variable('additionalPadding')
+    $pageH = ((80 + (40 + $pad) * ($rows - $SkipIndex.Count) + 40 + $additionalSize) * $scale)
+
+    if ($collapsetype -ne 2) {
+        for (($i = 1); ($i -le $rows) ; $i++) {
+            if ($i -notin $SkipIndex) {
+                $fileContent += @"
+[AppVol$i]
+Measure=Plugin
+Plugin=AppVolume
+Parent=AppVolumeParent
+Index=$i
+Substitute=#ReplaceApp#
+Group=UpdateWhenChange
+
+[AppVolPer$i]
+Measure=Calc
+Formula=Round(AppVol$i * 100)
+Group=UpdateWhenChange
+Substitute="-100":"Muted"
+
+[pVol$i]
+Meter=Image
+MeterStyle=ImageStyle | ImageStyle:#FetchIcons#
+
+[Vol$i]
+Meter=String
+MeterStyle=RegularText | TextStyle | TextStyle:#FetchIcons#
+
+[$i]
+Meter=Shape
+MeterStyle=ShapeStyle
+
+[VolPer$i]
+Meter=String
+MeterStyle=RegularText | VolStyle
+
+"@
+            }
+
+        } 
+    } else {
+        $RmAPI.Log($AppArray)
+        # $RmAPI.Log($rows)
+        # $RmAPI.Log($AppHash['Discord'].Count)
+        for (($i = 1); ($i -le $rows) ; $i++) {
+            if ($i -notin $SkipIndex) {
+                $fileContent += @"
 [AppVol$i]
 Measure=Plugin
 Plugin=AppVolume
 Parent=AppVolumeParent
 Index=$i
-Substitute=".exe":""
+Substitute=#ReplaceApp#
 Group=UpdateWhenChange
 
 [AppVolPer$i]
@@ -39,19 +105,58 @@ MeterStyle=ImageStyle | ImageStyle:#FetchIcons#
 Meter=String
 MeterStyle=RegularText | TextStyle | TextStyle:#FetchIcons#
 
+"@
+                if ($AppHash[$AppArray[$i-1]].Count -gt 1) {
+                    $occuranceArray = (0..($AppArray.Count-1)) | where {$AppArray[$_] -eq "$($AppArray[$i-1])"}
+                    for ($j = 0; $j -lt $occuranceArray.Count; $j++) {
+                        $fileContent += @"
+
+[$($occuranceArray[$j] + 1)]
+Meter=Shape
+X=(#LeftW# * #scale# + ((#W#-(#LeftW#+22+75)*#scale#)/ $($AppHash[$AppArray[$i-1]].Count) - 10 * ($($AppHash[$AppArray[$i-1]].Count) - 1) + 20)* $j)
+MeterStyle=ShapeStyle | ShapeStyle:$($AppHash[$AppArray[$i-1]].Count)
+
+"@
+                    }
+                } else {
+                    $fileContent += @"
+                
 [$i]
 Meter=Shape
 MeterStyle=ShapeStyle
 
+"@
+                }
+                $fileContent += @"
+
 [VolPer$i]
 Meter=String
 MeterStyle=RegularText | VolStyle
 
 "@
+            } else {
+                $fileContent += @"
+[AppVol$i]
+Measure=Plugin
+Plugin=AppVolume
+Parent=AppVolumeParent
+Index=$i
+Substitute=#ReplaceApp#
+Group=UpdateWhenChange
 
+[AppVolPer$i]
+Measure=Calc
+Formula=Round(AppVol$i * 100)
+Group=UpdateWhenChange
+Substitute="-100":"Muted"
+
+"@
+            }
+        }
+
     }
+
     $fileContent | Out-File -FilePath $($RmAPI.VariableStr('ROOTCONFIGPATH') + 'Main\\Accessories\\Page\\Variants\\VolumeMixerCache.inc') -Encoding unicode
 
     $RmAPI.Bang("[!WriteKeyValue Variables W $pageW `"$saveLocation`"][!WriteKeyValue Variables H $pageH `"$saveLocation`"][!Activateconfig `"YourMixer\Main\Accessories\Page`"]")
-
 }