[pulseaudio/qt5core] Switch to pavucontrol-qt

5 files changed, 30 insertions, 18 deletions

diff --git a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
index 599bca7a..074be46f 100755
--- a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
+++ b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/pavucontrol -t 5
+exec /usr/bin/pavucontrol-qt -t 5
diff --git a/core/modules/pulseaudio/module.build b/core/modules/pulseaudio/module.build
index 03a324c2..d2c39da9 100644
--- a/core/modules/pulseaudio/module.build
+++ b/core/modules/pulseaudio/module.build
@@ -15,11 +15,6 @@ build() {
 		ln -ns "$base" "${MODULE_BUILD_DIR}/usr/share/alsa/alsa.conf.d/${link}"
 	done
 	if [ -z "$MLTK_INSTALL" ]; then
-		tarcopy "/usr/share/mime" "${MODULE_BUILD_DIR}/"
-		base="$( grep -o -m1 '^.*/gdk-pixbuf-2.0/' "$PKG_CONTENT_FILE" )"
-		if [ -n "$base" ]; then
-			tarcopy "$( find "$base" -type f -name "loaders.cache" )" "${MODULE_BUILD_DIR}/"
-		fi
 		base="$( grep -m1 -F '/pulseaudio.socket' "$PKG_CONTENT_FILE" )"
 		if [ -n "$base" ]; then
 			base="${base%/*}"
@@ -27,6 +22,5 @@ build() {
 			ln -ns "../pulseaudio.socket" \
 				"${MODULE_BUILD_DIR}${base}/sockets.target.wants/pulseaudio.socket"
 		fi
-		tarcopy "/usr/share/icons/gnome/icon-theme.cache" "${MODULE_BUILD_DIR}/"
 	fi
 }
diff --git a/core/modules/pulseaudio/module.conf b/core/modules/pulseaudio/module.conf
index 15db379d..e0f3ef37 100644
--- a/core/modules/pulseaudio/module.conf
+++ b/core/modules/pulseaudio/module.conf
@@ -8,14 +8,6 @@ REQUIRED_DIRECTORIES="
 	/lib/udev
 	/usr/bin
 	/usr/lib
-	/usr/share/icons/gnome/16x16
 	/usr/share/alsa
-	/usr/share/mime
-	/usr/share/pavucontrol
 	/usr/share/pulseaudio
 "
-
-REQUIRED_FILES="
-	/usr/share/icons/gnome/icon-theme.cache
-	/usr/share/icons/gnome/index.theme
-"
diff --git a/core/modules/pulseaudio/module.conf.ubuntu b/core/modules/pulseaudio/module.conf.ubuntu
index 8449413a..cdbea999 100644
--- a/core/modules/pulseaudio/module.conf.ubuntu
+++ b/core/modules/pulseaudio/module.conf.ubuntu
@@ -3,13 +3,11 @@
 REQUIRED_CONTENT_PACKAGES="
 	alsa-base
 	alsa-topology-conf
-	gnome-icon-theme
 	libasound2
 	libasound2-data
 	libasound2-plugins
-	libgdk-pixbuf2.0-0
 	libpulse0
-	pavucontrol
+	pavucontrol-qt
 	pulseaudio
 	pulseaudio-utils
 "
diff --git a/core/modules/qt5core/data/usr/local/share/qt5ct/qt5ct.conf b/core/modules/qt5core/data/usr/local/share/qt5ct/qt5ct.conf
new file mode 100644
index 00000000..d1c0f2fb
--- /dev/null
+++ b/core/modules/qt5core/data/usr/local/share/qt5ct/qt5ct.conf
@@ -0,0 +1,28 @@
+[Appearance]
+color_scheme_path=/usr/share/qt5ct/colors/airy.conf
+custom_palette=false
+icon_theme=gnome
+standard_dialogs=default
+style=Fusion
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x12\0M\0o\0n\0o\0s\0p\0\x61\0\x63\0\x65@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x16\0\x44\0\x65\0j\0\x61\0V\0u\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\xe\0\0\0\xc7\0\0\x3\xee\0\0\x3\x42\0\0\x1\xf\0\0\0\xdb\0\0\x3\xed\0\0\x3=\0\0\0\0\0\0\0\0\x5\0\0\0\x1\xf\0\0\0\xdb\0\0\x3\xed\0\0\x3=)"