Регулятор громкости в CLDX заменён на volumeicon

profiles/templates/3.1/2_ac_install_merge/media-sound/pnmixer/pnmixer.desktop

@@ -1 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/pnmixer.desktop path=/etc/xdg/autostart

profiles/templates/3.1/2_ac_install_merge/media-sound/volumeicon/volumeicon.desktop

@@ -0,0 +1,12 @@
+# Calculate format=kde path=/etc/xdg/autostart
+
+[Desktop Entry]
+Name=VolumeIcon
+GenericName=Volume Icon
+Comment=A lightweight volume control that sits in your systray
+Exec=volumeicon
+Icon=/usr/share/volumeicon/gui/appicon.svg
+Terminal=false
+Type=Application
+Categories=AudioVideo;
+NoDisplay=true

profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-19/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip merge(media-sound/pnmixer)!=&&merge(xfce-base/xfce4-panel)!=&&ini(update.patch)!=off&&ini(ver.patch)<19&&cl_ver>=3.1.8

profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-19/ini.env

@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 19
+
+[update]
+patch = on

profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-19/xfce4-panel.xml

@@ -0,0 +1,7 @@
+# Calculate multiline format=patch path=~/.config/xfce4/xfconf/xfce-perchannel-xml
+<reg>^.*value type="int" value="11".*$\n</reg>
+<text></text>
+<reg>^.*value="xfce4-mixer-plugin"/$\n</reg>
+<text></text>
+<reg>^.*value="mixer"[\S\s]*?&lt;/property.*$\n</reg>
+<text></text>

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/mixer/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip pkg(sys-apps/calculate-desktop)>=2.2.28-r1

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/mixer/panel/xfce4-mixer-plugin-11.rc

@@ -1,4 +0,0 @@
-# Calculate cl_desktop_gst_card!=
-card=#-cl_desktop_gst_card-#
-track=#-cl_desktop_gst_masterchannel-#
-command=xfce4-mixer

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/mixer/xfconf/xfce-perchannel-xml/xfce4-mixer.xml

@@ -1,13 +0,0 @@
-# Calculate format=xml_xfce cl_desktop_gst_card!=
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-mixer" version="1.0">
-  <property name="sound-card" type="string" value="#-cl_desktop_gst_card-#"/>
-  <property name="window-height" type="int" value="400"/>
-  <property name="window-width" type="int" value="600"/>
-  <property name="sound-cards" type="empty">
-    <property name="#-cl_desktop_gst_card-#" type="array">
-#-cl_desktop_xfce_mixer-#
-    </property>
-  </property>
-</channel>

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -27,7 +27,6 @@
         <value type="int" value="9"/>
         <value type="int" value="6"/>
         <value type="int" value="10"/>
-        <value type="int" value="11"/>
         <value type="int" value="5"/>
         <value type="int" value="7"/>
         <value type="int" value="2"/>
@@ -116,15 +115,6 @@
     <property name="plugin-8" type="string" value="showdesktop"/>
     <property name="plugin-9" type="string" value="thunar-tpa"/>
     <property name="plugin-10" type="string" value="xkb-plugin"/>
-#?pkg(xfce-extra/xfce4-mixer)<4.10#
-    <property name="plugin-11" type="string" value="xfce4-mixer-plugin"/>
-#pkg#
-#?pkg(xfce-extra/xfce4-mixer)>=4.10#
-    <property name="plugin-11" type="string" value="mixer">
-      <property name="sound-card" type="string" value="#-cl_desktop_gst_card-#"/>
-      <property name="track" type="string" value="#-cl_desktop_gst_masterchannel-#"/>
-    </property>
-#pkg#
     <property name="plugin-7" type="string" value="launcher">
       <property name="items" type="array">
         <value type="string" value="10000000007.desktop"/>

profiles/templates/3.1/6_ac_update_sync/world/1_create/ini.env

@@ -1,4 +1,4 @@
 # Calculate path=/etc/calculate format=samba
 
 [update]
-world = 53
+world = 54

profiles/templates/3.1/6_ac_update_sync/world/1_create/xfce

@@ -2,7 +2,7 @@
 
 app-arch/file-roller
 media-sound/pavucontrol
-media-sound/pnmixer
+media-sound/volumeicon
 x11-misc/light-locker
 x11-terms/xfce4-terminal
 xfce-base/xfce4-meta

profiles/templates/3.1/6_ac_update_sync/world/2_update/53

@@ -5,6 +5,5 @@
 #?in(os_linux_shortname, CLDX)!=#
 !xfce-extra/xfce4-mixer
 media-sound/pavucontrol
-media-sound/pnmixer
 #in#
 

profiles/templates/3.1/6_ac_update_sync/world/2_update/54

@@ -0,0 +1,9 @@
+# Calculate format=world name=world ini(update.world)<54
+
+#-ini(update.world,54)-#
+
+#?in(os_linux_shortname, CLDX)!=#
+!media-sound/pnmixer
+media-sound/volumeicon
+#in#
+