From 2da4fb1b63b42f0e0f2d2ac6962eeba2e31619c7 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 5 Jan 2024 19:15:21 +0000 Subject: [PATCH] Resolve KASM-5359 "Feature/ desktop backgrounds multimonitor" --- dockerfile-kasm-core | 5 +- .../xfce-perchannel-xml/xfce4-desktop.xml | 72 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 72 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 72 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 92 ++++++++++++++++-- .../xfce-perchannel-xml/xfce4-desktop.xml | 74 ++++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 70 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 70 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 80 ++++++++++++++-- .../xfce-perchannel-xml/xfce4-desktop.xml | 86 ++++++++++++++--- .../xfce4-desktop.xml | 25 ++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 94 +++++++++++++++++-- .../xfce4-desktop.xml | 25 ++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 94 +++++++++++++++++-- .../xfce-perchannel-xml/xfce4-desktop.xml | 72 +++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 74 ++++++++++++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 74 ++++++++++++++- .../xfce4-desktop.xml | 25 ++++- .../xfce-perchannel-xml/xfce4-desktop.xml | 86 ++++++++++++++++- 19 files changed, 1174 insertions(+), 88 deletions(-) diff --git a/dockerfile-kasm-core b/dockerfile-kasm-core index 69e0556..1d30b0b 100644 --- a/dockerfile-kasm-core +++ b/dockerfile-kasm-core @@ -51,12 +51,11 @@ RUN bash $INST_SCRIPTS/xfce/install_xfce_ui.sh && rm -rf $INST_SCRIPTS/xfce/ ADD ./src/$DISTRO/xfce/.config/ $HOME/.config/ RUN mkdir -p /usr/share/extra/backgrounds/ RUN mkdir -p /usr/share/extra/icons/ -ADD /src/common/resources/images/bg_kasm.png /usr/share/extra/backgrounds/bg_kasm.png -ADD /src/common/resources/images/$BG_IMG /usr/share/extra/backgrounds/bg_default.png +ADD /src/common/resources/images/bg_kasm.png /usr/share/backgrounds/bg_kasm.png +ADD /src/common/resources/images/$BG_IMG /usr/share/backgrounds/bg_default.png ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_ubuntu.png ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_default.png ADD /src/common/resources/images/icon_kasm.png /usr/share/extra/icons/icon_kasm.png -RUN cp /usr/share/extra/backgrounds/bg_default.png /usr/share/backgrounds/xfce/xfce-stripes.png ### Install kasm_vnc dependencies and binaries COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ diff --git a/src/almalinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/almalinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index c98ef8f..a34dc3c 100644 --- a/src/almalinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/almalinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -12,17 +12,83 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/almalinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/almalinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index c98ef8f..a34dc3c 100644 --- a/src/almalinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/almalinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -12,17 +12,83 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 6574896..52eac9c 100644 --- a/src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/alpine/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -12,17 +12,83 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 938e2ca..a34dc3c 100644 --- a/src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,32 +1,108 @@ + - + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + diff --git a/src/debian/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/debian/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index bec3fa7..c7f13e4 100644 --- a/src/debian/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/debian/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -27,22 +27,88 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index cb9a28e..a34dc3c 100644 --- a/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -25,6 +25,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,7 +102,7 @@ - - + + diff --git a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index cb9a28e..a34dc3c 100644 --- a/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -25,6 +25,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36,7 +102,7 @@ - - + + diff --git a/src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 8845046..a34dc3c 100644 --- a/src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,12 +1,6 @@ - - - - - - @@ -31,12 +25,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -45,4 +101,8 @@ + + + + diff --git a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index d49f276..a34dc3c 100644 --- a/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -3,46 +3,106 @@ - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml index 4331ba6..48590c9 100644 --- a/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/oracle8/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml @@ -6,14 +6,35 @@ - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 9314855..a34dc3c 100644 --- a/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/oracle8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,32 +1,108 @@ + - + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + diff --git a/src/oracle9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml index 4331ba6..48590c9 100644 --- a/src/oracle9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/oracle9/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml @@ -6,14 +6,35 @@ - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/oracle9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/oracle9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 9314855..a34dc3c 100644 --- a/src/oracle9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/oracle9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,32 +1,108 @@ + - + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + diff --git a/src/parrotos5/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/parrotos5/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index cccf036..d093574 100644 --- a/src/parrotos5/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/parrotos5/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -59,17 +59,83 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/rockylinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/rockylinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 25e1b57..a34dc3c 100644 --- a/src/rockylinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/rockylinux8/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -12,27 +12,93 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/rockylinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/rockylinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 25e1b57..a34dc3c 100644 --- a/src/rockylinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/rockylinux9/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -12,27 +12,93 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml b/src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml index 4331ba6..48590c9 100644 --- a/src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/xfce4-desktop.xml @@ -6,14 +6,35 @@ - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 7de608d..e26225c 100644 --- a/src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -1,4 +1,5 @@ + @@ -6,14 +7,95 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +