BT #142 - Utworzenie testowych obrazów. Przygotowanie repozytorium na priv.

diff --git a/README.md b/README.md
index 0286eaa83996cf4db36fd99dcb382edddeaff597..163d4054cfe8a30827331d3823244c7fd5b54755 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,15 +2,30 @@
 
 # IMMutable DEbian with Xfce
 
-## GNU/LINUX Debian stable (bookworm)
+## GNU/LINUX Debian testing (trixie)
 
 To repozytorium zawiera pliki służące do tworzenia dystrybucji immudex.
 Zawiera ono wiele ciekawych informacji, jednak podstawowe infomacje na temat 
-tej dystrybucji (wraz z adresami do serwerów lustrzanych z obrazmi płyt)
-znajdują się pod adresem:
+tej dystrybucji znajdują się pod adresem:
 
 [https://morketsmerke.github.io/articles/immudex/immudex.html](https://morketsmerke.github.io/articles/immudex/immudex.html)
 
+### Tworzenie obrazu płyty dystrybucji:
+  
+  ```
+  $ git clone https://github.com/xf0r3m/immudex-testing
+  $ cd immudex-testing
+  $ ./immudex-build --<amd64/i386>
+  ```
+
+### Dodawanie zmian do obrazu płyty:
+
+Aby dołączyć jakiekolwiek zmiany do obrazu płyty należy przed rozpoczęciem
+procesu tworzenia obrazu płyty umieścić modyfikacje, przed poleceniem `tidy` w
+pliku *versions/base.sh*.
+
+### Zastrzeżenia i uznanie autorstwa:
+
 immudex is not affiliated with Debian. Debian is a registered trademark owned 
 by Software in the Public Interest, Inc.
 

diff --git a/additional_packages.txt b/additional_packages.txt
deleted file mode 100644 (file)
index e43b1ee..0000000
--- a/additional_packages.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-0.0.1:
-       bash-completion
-       etherwake
-       wakeonlan
-  cifs-utils
-  wget
-  figlet

diff --git a/addons/baytrail_sound b/addons/baytrail_sound
new file mode 100644 (file)
index 0000000..1805030
--- /dev/null
+++ b/addons/baytrail_sound
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex-addons ]; then
+                  mkdir /usr/share/immudex-addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+if [ ! -d /boot ]; then
+  mkdir /boot;
+       apt purge linux-image* --purge -y;
+       apt install linux-image-amd64;
+fi
+
+cp -vv /etc/apt/sources.list /etc/apt/sources.list.d/baytrail-sound.list;
+sed -e 's/main/contrib non-free non-free-firmware/g' -i /etc/apt/sources.list.d/baytrail-sound.list;
+
+apt update;
+apt install firmware-sof-signed firmware-intel-sound;
+
+rm /etc/apt/sources.list.d/baytrail-sound.list;
+apt update;
+
+apt-get autoclean;
+apt-get autoremove;
+apt-get clean;
+apt-get clean;
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | tee -a /usr/share/immudex-addons/installed-addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+apt remove -y firmware-sof-signed firmware-intel-sound;
+apt-get autoclean;
+apt-get autoremove -y;
+apt-get clean;
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sed -i "s/$(basename $0)//g" /usr/share/immudex-addons/installed-addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/addons/iwlwifi b/addons/iwlwifi
new file mode 100644 (file)
index 0000000..dce35bf
--- /dev/null
+++ b/addons/iwlwifi
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex-addons ]; then
+                  mkdir /usr/share/immudex-addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+if [ ! -d /boot ]; then
+  mkdir /boot;
+       apt purge linux-image* --purge -y;
+       apt install linux-image-amd64;
+fi
+
+cp -vv /etc/apt/sources.list /etc/apt/sources.list.d/iwlwifi.list;
+sed -e 's/main/contrib non-free non-free-firmware/g' -i /etc/apt/sources.list.d/iwlwifi.list;
+
+apt update;
+apt install firmware-iwlwifi;
+
+rm /etc/apt/sources.list.d/iwlwifi.list;
+apt update;
+
+apt-get autoclean;
+apt-get autoremove;
+apt-get clean;
+apt-get clean;
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | tee -a /usr/share/immudex-addons/installed-addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+apt remove -y firmware-iwlwifi;
+apt-get autoclean;
+apt-get autoremove -y;
+apt-get clean;
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sed -i "s/$(basename $0)//g" /usr/share/immudex-addons/installed-addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/addons/lampstack b/addons/lampstack
new file mode 100644 (file)
index 0000000..ba05a55
--- /dev/null
+++ b/addons/lampstack
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex-addons ]; then
+                  mkdir /usr/share/immudex-addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+baseVersion=\$(head -1 /etc/apt/sources.list | awk '{print \$3}')
+
+apt install lsb-release;
+wget https://dev.mysql.com/get/mysql-apt-config_0.8.25-1_all.deb;
+dpkg -i mysql-apt-config_0.8.25-1_all.deb;
+
+sed -i "s/\$baseVersion/bullseye/g" /etc/apt/sources.list;
+
+apt update;
+apt install mysql-server -y
+apt-get install --fix-missing
+
+apt-mark hold libmecab2 libssl1.1 mecab-ipadic mecab-ipadic-utf8 mecab-utils mysql-client mysql-common mysql-community-client mysql-community-client-core mysql-community-client-plugins mysql-community-server mysql-community-server-core
+
+sed -i "s/bullseye/\$baseVersion/g" /etc/apt/sources.list; 
+apt update
+apt install apache2 libapache2-mod-php php php-mysql -y;
+
+apt autoremove;
+apt autoclean;
+apt clean;
+apt clean;
+
+rm mysql-apt-config_0.8.25-1_all.deb;
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | tee -a /usr/share/immudex-addons/installed-addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+apt-mark unhold libmecab2 libssl1.1 mecab-ipadic mecab-ipadic-utf8 mecab-utils mysql-client mysql-common mysql-community-client mysql-community-client-core mysql-community-client-plugins mysql-community-server mysql-community-server-core
+
+apt-get remove -y libssl1.1  mysql-client mysql-common mysql-community-client mysql-community-client-core mysql-community-client-plugins mysql-community-server mysql-community-server-core apache2 libapache2-mod-php php php-mysql mysql-apt-config
+
+apt-get upgrade -y libmecab2 mecab-utils mecab-ipadic mecab-ipadic-utf8;
+
+apt-get autoclean
+apt-get autoremove -y
+apt-get clean
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sed -i "s/$(basename $0)//g" /usr/share/immudex-addons/installed-addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/addons/myuzi b/addons/myuzi
deleted file mode 100755 (executable)
index b0a0325..0000000
--- a/addons/myuzi
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-sudo apt update > /dev/null 2>&1;
-sudo apt install -y gstreamer1.0-libav gstreamer1.0-plugins-good python3-pip ffmpeg;
-sudo wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -O /usr/bin/yt-dlp;
-sudo chmod +x /usr/bin/yt-dlp;
-sudo apt-get clean;
-
-echo | sudo tee -a /etc/apt/sources.list;
-echo "deb http://ftp.icm.edu.pl/pub/Linux/debian bookworm main" | sudo tee -a /etc/apt/sources.list
-
-sudo apt update > /dev/null 2>&1;
-
-sudo apt install --no-install-recommends -y libgtk-4-bin libgtk-4-common libgtk-4-dev;
-
-sudo apt-get clean;
-
-git clone https://gitlab.com/zehkira/myuzi.git
-cd myuzi;
-pip install .
-sudo su -c "make install"
-

diff --git a/addons/ncspot b/addons/ncspot
new file mode 100644 (file)
index 0000000..75dc148
--- /dev/null
+++ b/addons/ncspot
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex-addons ]; then
+                  mkdir /usr/share/immudex-addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+apt update;
+apt install -y libdbus-1-dev libncursesw5-dev libpulse-dev libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev
+wget https://ftp.morketsmerke.org/immudex/testing/addons/ncspot-bin-0.13.4.tar.gz -O /tmp/ncspot-bin-0.13.4.tar.gz;
+tar -xzvf /tmp/ncspot-bin-0.13.4.tar.gz -C /usr/local/bin;
+rm /tmp/ncspot-bin-0.13.4.tar.gz;
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | tee -a /usr/share/immudex-addons/installed-addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+apt remove -y libdbus-1-dev libncursesw5-dev libpulse-dev libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev;
+rm /usr/local/bin/ncspot;
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sed -i "s/$(basename $0)//g" /usr/share/immudex-addons/installed-addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/addons/nvidiaLatest b/addons/nvidiaLatest
new file mode 100644 (file)
index 0000000..4e91a44
--- /dev/null
+++ b/addons/nvidiaLatest
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex-addons ]; then
+                  mkdir /usr/share/immudex-addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+if [ ! -f /proc/cpuinfo ]; then
+echo "There is no system interfaces! Nothing to do. Exiting...";
+rm \$0;
+exit 1;
+else
+if [ ! -d /boot ]; then
+       mkdir /boot;
+       apt purge linux-image* --purge -y;
+       apt install linux-image-amd64 -y;
+fi
+
+cp -vv /etc/apt/sources.list /etc/apt/sources.list.d/nvidia.list;
+sed -e 's/main/contrib non-free non-free-firmware/g' -i /etc/apt/sources.list.d/nvidia.list;
+apt update;
+apt install -y build-essential dkms linux-headers-\$(uname -r);
+apt install -y nvidia-detect;
+apt install -y nvidia-driver;
+fi
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | sudo tee -a /usr/share/immudex-addons/installed-addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+apt remove -y nvidia-driver nvidia-detect dkms linux-headers-\$(uname -r);
+apt purge -y nvidia-*;
+rm /etc/apt/sources.list.d/nvidia.list;
+apt update;
+apt-get autoremove -y;
+apt-get autoclean;
+apt-get clean;
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sed -i "s/$(basename $0)//g" /usr/share/immudexi-addons/installed-addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/addons_script_template b/addons_script_template
new file mode 100644 (file)
index 0000000..7a56e3b
--- /dev/null
+++ b/addons_script_template
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if [ "$1" ]; then
+  case $1 in
+    "install") echo "Installation $(basename $0) addon...";
+                if [ ! -d /usr/share/immudex_addons ]; then
+                  sudo mkdir /usr/share/immudex_addons;
+                fi
+                cat >> $(basename $0)_installer << EOF
+# Here put code for installation addon.
+EOF
+                bash $(basename $0)_installer;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_installer;
+                  echo $(basename $0) | sudo tee -a /usr/share/immudex_addons/installed_addons;
+                  echo "Installation $(basename $0) addon...[ OK ]";
+                fi;;
+    "remove") echo "Removing $(basename $0) addon...";
+                cat >> $(basename $0)_uninstaller << EOF
+# Here put code for remove addon.
+EOF
+                bash $(basename $0)_uninstaller;
+                if [ $? -eq 0 ]; then
+                  rm $(basename $0)_uninstaller;
+                  sudo sed -i "s/$(basename $0)//g" /usr/share/immudex_addons/installed_addons;
+                  echo "Removing $(basename $0) addon...[ OK ]";
+                fi;;
+  esac
+else
+  echo "Internal error: action must be given.";
+  exit 1;
+fi

diff --git a/autostart_domyślnej_sieci_kvm.txt b/autostart_domyślnej_sieci_kvm.txt
deleted file mode 100644 (file)
index f14b7b3..0000000
--- a/autostart_domyślnej_sieci_kvm.txt
+++ /dev/null
@@ -1 +0,0 @@
-ln -s /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml

diff --git a/changelogs/0/0.0.1.txt b/changelogs/0/0.0.1.txt
deleted file mode 100644 (file)
index 0eee7b1..0000000
--- a/changelogs/0/0.0.1.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-. Aktualizacja obecnie zainstalowanych pakietów.
-2. Instalacja pakietów dodatkowych takich jak:
-  - bash-completion
-  - etherwake
-  - wakeonlan
-  - cifs-utils
-  - wget
-  - figlet
-3. Dodanie kilku narzędzi:
-  - immudex_crypt - wyświetlanie, otwieranie i zamykanie partycji LUKS
-  - immudex_upgrade - skrypt aktualizacji immudex, może zostać użyty
-    samodzielnie (wymaga wget), niezależnie od wersji.
-  - import_sshkeys - automatyczne kopiowanie plików kluczy ssh w formacie
-    id_rsa oraz id_rsa.pub do katalogu /home/$USER/.ssh.
-  - motd/motd2 - Informacja wyświetlana podczas otwierania terminala,
-    zawiera nazwę dystrybucji, kilka statystyk, sprawdza dostępność
-    aktualizacji. Zawiera ona również nazwę wydawcy oraz adres projektu.
-    Wersja pierwsza (motd) wyświetla pierwszą partycje luks, natomiast
-    wersja druga wszystkie zamontowane. Zalecene jest używanie wersji
-    drugiej.
-  - padlock - prosty przełacznik, mający za zadanie odblokować, zamontować
-    partycję LUKS w systemie i zwrócić terminal z katalogiem roboczym
-    ustawionym na punkt montowania wspomnianej partycji. Skrypt uruchamia
-    się w terminalu i pyta użytkownika, którą partycję uruchomić nawet
-    jeśli jest tylko jedna. Po zamontowaniu partycji po tym samym 
-    aktywatorem, będzie dostępna wyłącznie funkcją, które odmontuje i
-    zablokuje wszystkie nie używane partycję LUKS.
-4. Zmiana na górnym panelu, zamiast wyświetlać wszystkie przyciski sesji,
-    dostępna jest tylko blokada ekranu oraz wyłączenie komputera. Przyciski
-    sesji dostępne są w menu Debian, na samym końcu.

diff --git a/changelogs/0/0.0.2.txt b/changelogs/0/0.0.2.txt
deleted file mode 100644 (file)
index e7db549..0000000
--- a/changelogs/0/0.0.2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-1. Aktualizacja obecnie zainstalowanego oprogramowania.
-
-2. Instalacja nowych pakietów takich jak:
-  - chirp (programowanie radiotelefonów)
-  - mpv (odtwarzacza multimedialny obsługiwany z poziomu CLI)
-  - youtube-dl (pobieranie filmów z platformy youtube)
-
-3. Zmiana wyświetlania "message of the day". Wyświetlane jest ono raz na
-    uruchomienie systemu.
-
-4. Poprawienie błędu z wersji 0.0.1, brak uprawnień do obsługi KVM.
-    Dodano domyślnych użytkowników do grupy "libvirt" oraz "libvirt-qemu".
-
-5. Poprawienie błędy z wersji 0.0.1, polecenie "ping" wymaga podniesienia
-    uprawnień. Nadanie bitu setuid, plikowi odpowiedzialnemu za polecenie
-    ping.
-
-6. Wgranie ulepszonych/poprawnionych wersji narzędzi takich jak "motd2"
-    oraz "padlock".
-
-7. Wgranie nowych narzędzi:
-  - import_gpgkeys, skrypt który importuje klucze "private.gpg" oraz 
-    "public.gpg" znajdujące się bezpośrednio w katalogu domowym
-    użytkownika.
-  - shoutcasts - wyszukiwarka wolnych stacji radia internetowego. Jej
-    zbiorem danych jest katalog projektu xiph.org
-  - ytaudio - skrypt wykorzystujący mpv oraz youtube-dl do streamowania
-    ścieżki dzwiękowej z filmów na youtube. Przydatny gdy chcemy posłuchać
-    podcastów lub długich kompilacji bez uruchamiania przeglądarki.
-
-8. Wgranie nowej wersji "immudex_install" w związku ze zmianą parametów
-    jądra podczas uruchomienia:
-    - quiet - wyłączenie wyświetlania komunikatów jądra podczas jego
-      ładowania
-    - overlay-size=25% - zmniejszenie rozmiaru katalogu głównego z połowy
-      ilość pamięci RAM do 1/4. 

diff --git a/changelogs/0/0.0.3.txt b/changelogs/0/0.0.3.txt
deleted file mode 100644 (file)
index 1ad1e37..0000000
--- a/changelogs/0/0.0.3.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Aktualizacja jądra Linux
-
-2. Zmiana youtube-dl na yt-dlp. Oryginalny pakiet dalej pozostaje w
-    systemie pod nazwą youtube-dl-orig.
-
-3. Immudex_crypt teraz podczas otwierania tworzy punkt monotowania oraz
-    montuje odblokowane urządzenie LUKS, o ile jest ono sformatowane.
-    skrypt pyta czy chcemy je sformatować. Jeśli odpowiemy twierdząco
-    urządzenie zostanie sformatowane pod EXT4, jeśli odpowiemy przecząco
-    to urządzenie zostanie zamknięte a skrypt zakończy działanie.
-
-4. Ytaudio przechodzi w ytplay. Względem oryginalnego skryptu dodano:
-    funkcję z wyświetleniem pomocy, możliwość odtwarzania filmów oraz
-    możliwość podania konkretnego filmu w postacji linku.
-
-5. Podczas instalacji immudex za pomocą skryptu immudex_install, zerowany
-    jest pierwszy megabajt dysku. Ta czynność jest wymagana kiedy
-    instalujemy ponownie immudex lub instalujemy go nadpisując inny system.
-
-6. Dodanie aliasu "chhome", zmieniającego wartość zmiennej środowiskowej
-    "$HOME" wskazującej na katalog domowy użytkownika. Wartością ustawianą
-    przez ten alias jest ścieżka zwracana przez polecenie "pwd".

diff --git a/changelogs/0/0.0.4.txt b/changelogs/0/0.0.4.txt
deleted file mode 100644 (file)
index 0430919..0000000
--- a/changelogs/0/0.0.4.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-1. Aktualizacja zainstalowanych pakietów.
-
-2. Rozwiązanie problemu z zawieszaniem się systemu po starcie w trybie
-    UEFI. Pomogła prawdopodbnie aktualizacja pakietów lub ponowne
-    utworzenie obrazu płyty.
-
-3. Instalacja pakietu vim-gtk3. Zmiana podstawowego edytora na pasku z
-    mousepad na gVim.
-
-4. Rozwiązanie problemu z poleceniem motd2.
-
-5. Próba rozwiązania problemu z autostartem domyślnej sieci KVM.
-
-6. Instalacja programu redshift. Konfiguracja lokalizacji ustawiona na
-    "manual". Podano lokalizację z ISP.

diff --git a/changelogs/0/0.0.5.txt b/changelogs/0/0.0.5.txt
deleted file mode 100644 (file)
index 2d33cca..0000000
--- a/changelogs/0/0.0.5.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-immudex 0.0.5 - ważna zmiana
-  
-  1. Kompilacja i instalacja najnowszej wersji Python 3.11
-
-  2. Wyłączenie autoukrywania górnego paska. Czasami potrafiło się to
-      zbugować.
-
-  3. Zmiana ikony launchera padlock, kiedy protected zamyka nieużywane
-      cryptfs-y.
-
-  4. Aktualizacja pakietów.
-  
-  5. Dodanie aliasu do MPV pozwalającego na otwieranie streamów z YT.
-  

diff --git a/changelogs/0/0.0.6.txt b/changelogs/0/0.0.6.txt
deleted file mode 100644 (file)
index 46b9c8a..0000000
--- a/changelogs/0/0.0.6.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-immudex 0.0.6 - ważna zmiana
-
-  1. Pozbycie pozostałości z kompilacji i instalacji najnowszej wersji 
-    Pythona 3.11.
-
-  2. Wdrożenie narzędzia pozwalającego na korzystanie z kanałów RSS, za
-    pomocą terminala - newsfeed.
-
-  3. Aktualizacja pakietów.
-
-  4. Zmiany w immudex_crypt. Wprowadzono dowiązania symboliczne do
-      do otwieranych przez ten skrypt cryptfs-ów. Dodano zapis skrótowy
-      do funkcji zamykania cryptfs-ów. Teraz można zamykać je, odwołując 
-      się do nazwy dowiązania (tj. ic0, ic1, itd.) lub do samego indeksu
-      (tj. 0, 1, itd.)
-
-  5. Zmiany w padlock. Wyłączono polecenia, które ze względu na rozwój 
-      immudex_crypt stały się niepotrzebne. Zmieniono domyślny katalog
-      roboczy uruchamianego przez skrypt okna terminala.
-

diff --git a/changelogs/0/0.0.7.txt b/changelogs/0/0.0.7.txt
deleted file mode 100644 (file)
index 0c28c5f..0000000
--- a/changelogs/0/0.0.7.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-immudex 0.0.7 - ważna zmiana
-
-  1. Aktualizacja pakietów
-
-  2. Usunięcie pakietów wykorzystywanych do budowy Pythona 3.11
-
-  3. Instalacja pakietu transmission-gtk
-
-  4. Umożliwienie dodania formatu filmu w ytplay oraz umożliwienie
-      odtworzenia transmisji na żywo.
-
-  5. Usunięcie usterki nr. 10 z pliku issues.txt
-
-  6. Zmiany w prekonfiguracji Mozilli Firefox:
-      - Zmiana strony głównej na: https://searx.morketsmerke.net/searxng
-      - Dodanie wyszukiwarki https://searx.morketsmerke.net/searxng w 
-        postaci dodatku (Mozilla ADD-ONS):
-        https://addons.mozilla.org/pl/firefox/addon/idx-search
-      - Ustawienie searx.morketsmerke.net jako domyślnej wyszukiwarki
-      - Ustawienie pytania gdzie zapisać pobierany plik.
-
-  7. Zmiana czasu oczekiwana na uruchomienie domyślnego wpisu w menu GRUB 
-      w trybie EFI z 30 sekund do 5.
-
-  8. Zmiana domyślnego rozmiaru terminala z 80x24 na 100x30.

diff --git a/changelogs/0/0.0.8.txt b/changelogs/0/0.0.8.txt
deleted file mode 100644 (file)
index b8f0c06..0000000
--- a/changelogs/0/0.0.8.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-immudex 0.0.8 - aktualizacja jądra.
-
-  1. Aktualizacja jądra Linux oraz zainstalowanych pakietów.
-
-  2. Instalacja narzędzia 'morketsmerke', umożliwającego pobranie zawartości 
-      strony morketsmerke.net i używania jej ofline. Oczywiście wersją offline
-      jest aktualna na dzień wydania wersji immudex.
-
-  3. Pobranie zawartości morketsmerke.net i dostosowanie jej (za pomocą
-      narzędzia 'morketsmerke'), aby była dostępna jako dokumentacja offline.
-
-  4. Aktualizacja immudex_crypt - poprawiono treść wiadomości w funcji pomocy.

diff --git a/changelogs/0/0.0.9.txt b/changelogs/0/0.0.9.txt
deleted file mode 100644 (file)
index f8f8420..0000000
--- a/changelogs/0/0.0.9.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-immudex 0.0.9 - zmniejszenie wielkości obrazu
-
-  1. Aktualizacja pakietów
-  
-  2. Usunięcie trzeciej (niepotrzebnej) wersji jądra.

diff --git a/changelogs/0/0.1.0.txt b/changelogs/0/0.1.0.txt
deleted file mode 100644 (file)
index 8df6491..0000000
--- a/changelogs/0/0.1.0.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-immudex 0.1.0 - aktualizacja jądra
-
-  1. Aktualizacja pakietów oraz jądra Linux
-  
-  2. Instalacja pakietu binarnego GRUB dla EFI 32-bit, klienta IRC - irssi,
-    programu nmap oraz instalację oprogramowanie zdalnego pulitu - Remmina.
-    dodanie obsługi NFS (Network File System, pakiet nfs-common).
-
-  3. Dodanie narzędzia create_media, mającego na celu utworzenie dysku USB
-    z immudex dla komputerów z 32-bitowym EFI.
-
-  4. Dodanie możliwości instalacji immudex na komputerach z 32-bitowym EFI,
-    aktualizcja narzędzia immudex_install.
-
-  5. Umożliwienie ponownego odpytania YT pod kątem tych samych słów kluczowych,
-    aktualizacja narzędzia ytplay.
-
-  6. Zmiana serwera dystrybuującego immudex, aktualizacja narzędzia
-    immudex_upgrade.
-
-  7. Zmiana roku z 2022 na 2023, aktualizacja skrypt motd2
-
-  8. Automatyczne połacznie się z serwerem IRC searx.morketsmerke.net po
-    uruchomieniu irssi.
-
-  9. Autostart irssi zaraz po zalogowaniu (tylko użytkownik xf0r3m).
-
-  10. Ustawienie widocznych w ciemnym trybie ikon w LibreOffice.

diff --git a/changelogs/0/0.1.1.txt b/changelogs/0/0.1.1.txt
deleted file mode 100644 (file)
index 2c75642..0000000
--- a/changelogs/0/0.1.1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-immudex 0.1.1 - ważna zmiana
-
-  1. Aktualizacja pakietów.
-
-  2. Zmiana sposobu uruchamiania przeglądarki Firefox. Dotyczasowy skrypt
-      'protected' staje się rozwiązaniem przestarzałym. Obecnie Firefox
-      uruchamiany jest za pomocą sandbox-era Firejail z emulacją stosu TCP/IP.
-
-  3. Instalacja pakietów: openvpn, netselect-apt, debootstrap, squashfs-tools
-      xorriso isolinux syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools
-      dosfstools solaar chrony; 
-
-  4. Aktualizacja skryptu yt-dlp (rozwiązanie problemu z odtwarzaniem z YT w
-      mpv)
-
-  5. Podział 'immudex_upgrade' na 'immudex_upgrade' + 'library.sh'. Niektóre z 
-      funkcji 'immudex_upgrade' mogą być wykorzystywane przez inne narzędzia.
-
-  6. Wdrożenie narzędzia 'notifier', wyświetlającego powiadomienia o dostępności
-      nowej wersji immudex oraz aktualizacjach pakietów (tylko użytkownik xf0r3m).
-
-  7. Przyspieszenie pierwszego uruchomienia powłoki po przez usunięcie z
-      narzędzia 'motd2' sprawdzenia wersji immudex oraz dostępności pakietów.
-
-  8. Zmiana domeny z morketsmerke.net na morketsmerke.org. Wymagana aktualizacja
-      narzędzi: 'immudex_upgrade' oraz 'motd2' oraz aktualizacja plików Firefox.

diff --git a/changelogs/0/0.1.2.txt b/changelogs/0/0.1.2.txt
deleted file mode 100644 (file)
index 03865ba..0000000
--- a/changelogs/0/0.1.2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-immudex 0.1.2 - nieaktualne pakiety
-
-  1. Aktualizacja pakietów.
-
-  2. Instalacja pakietu gimp.
-  
-  3. Instalacja programu pocztowego Mozilla Thunderbird oraz jego konfiguracja
-    tak aby działał z profilami zapisanymi na cryptfs (narzędzie run-thunderbird).
-
-  4. Aktualiazacja narzędzia ytplay (dodanie dla opcji -a trybu --no-video).
-
-  5. Zmiana wyrażenia regularnego określającego głąź immudex w funkcji,
-    'get_debian_branch' w pliku library.sh.
-
-  6. Aktualizacja narzędzia immudex_install (poprawienie wyświetlania
-    komunikatu ostrzegawczego, usunięcie pliku extlinux.conf po skopiowaniu).
-
-  7. Aktualizacja narzędzia immudex_crypt (dodanie funkcji pozwalającej na
-    utworzenie cryptfs ze wskazanej partycji).
-
-  8. Aktualizacja narzędzia immudex_upgrade (dodanie funkcji pozwalającej na
-    łatwe sprawdzenie dostępnych wersji immudex oraz dodanie funkcji
-    pozwaljącej na zmianę gałęzi immudex)
-
-  9. Dodanie do plików konfiguracyjnych programów rozruchowych na LiveCD opcji 
-    'bootfrom=removable' ograniczającej poszukiwanie katalogu '/live' do
-    dysków wymiennych. Dostoswanie narzędzia 'immudex_install' do tej czynności
-    (program korzysta z pliku konfiguracyjnego GRUB z LiveCD, dlatego tę opcję
-    należy usunąć po skopiowaniu pliku na dysk).
-
-  10. Zmiana serwera lustrzanego. Z SunSITE ICM UW na CDN Debiana.

diff --git a/changelogs/0/0.1.3.txt b/changelogs/0/0.1.3.txt
deleted file mode 100644 (file)
index b2d0086..0000000
--- a/changelogs/0/0.1.3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-immudex 0.1.3 - aktualizacja jądra
-
-  1. Aktualizacja pakietów oraz jądra Linux.
-
-  2. Wydłużenie czasu oczekiwania na wybór domyślnej opcji programu
-    rozruchowego, tylko w przypadku obrazów LiveCD.
-
-  3. Dodano do narzędzia 'create_media' funkcję kasowania (nadpisania zerami)
-    pierwszego megabajtu dysku przed zapisaniem obrazu.
-
-  4. W narzędziu 'immudex_install', skrócono czas na wybór domyślnej opcji
-    programu rozruchowego w przypadku instalacji w trybie UEFI.
-
-  5. Do narzędzia 'immudex_upgrade' dodano funkcję wyboru serwera lustrzanego
-    na podstawie jego dostępności w sieci. Serwer lustrzany wybierany jest
-    za każdym razem, gdy potrzeba skorzystać z zawartości zdalnej.
-    Poprawiono również wyświetlanie komunikatów zwracanych przez skrypt.
-
-  6. Dodano skrypt pobierajacy pogodę z serwisu meteo.icm.edu.pl.
-
-  7. Zmieniono domyślne aplikacje otwierające takie pliki jak .jpeg oraz .png.
-
-  8. Dodano narzędzie sync.sh, które pozwala w prosty sposób zsynchronizować
-    katalog zdalny za pomocą rsync.
-
-  9. Instalacja pakietu rsync.

diff --git a/changelogs/1.0.0.txt b/changelogs/1.0.0.txt
deleted file mode 100644 (file)
index 18bcb65..0000000
--- a/changelogs/1.0.0.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-immudex 1.0.0 - wydanie nowej wersji stablinej Debian
-
-  1. Zmiana wersji stabilnej Debian z Bullseye na Bookworm.
-
-  2. Zmiana domyślnego wyglądu pulpitu dla użytkowników. Wykorzystano do tego
-      project xfcedebian dla gałęzi testing (obecnie main). Zmieniona została 
-      tapeta. Jest jeden pasek na dole, przypominający pasek z systemów MS
-      Windows. Aktywatory obecnie znajdują się na pulpicie. Użyto także
-      bardzie rozbudowanej wersji menu, znajdującego się pod przyciskiem start.
-
-  3. Zmiana tła ekranu logowania oraz zmiana domyślnego obrazu użytkownika na
-      ekranie logowania
-
-  4. Rozszerzenie miejsca wymagana do instalacji 'immudex' z 4 do 6GB. Jest to
-      wymagana aby przeprowadzać aktualizacje systemu w czasie jego działania.
-
-  5. Dodanie narzędzia 'immudex_branch' pozwalającego na określenie gałęzi
-      'immudex'. Jest ono głównie wykorzystywane przez widget 'Conky', przez
-      to narzędzie ma dość specyficzne działanie.
-
-  6. Instalacja oraz konfiguracja widgetu 'Conky'. Wiget startuje automatycznie
-      po zalogowaniu użytkownika.
-
-  7. Usunięcie zbędnych plików APT (odzyskanie kilkudziesięciu megabajtów z 
-      rozmiaru obrazu).
-
-  8. Wdrożenie do 'immudex_install' nowej minimalnej wielkości partycji
-      systemowej 'immudex'. 
-
-  9. Instalacja pakietu gvfs-backends. Pakiet pozwala na skorzystanie z różnych
-      protokołów dostępu do plików takich jak 'smb://' czy 'mtp://' za pomocą
-      okienkowego menedżera plików ('Thunar").
-
-  10. Instalacja z gałezi 'experimental' elementu projektu XFCE: 
-      'xfce4-notes-plugin' - mały program pozwalający na tworzenie szybkich
-      notatek na pulpicie. Dostosowanie jego wyglądu do obecnego wyglądu
-      pulpitu 'immudex' (ustawienie ciemnego motywu oraz obrazu tła podobnego
-      do terminala), utworzenie skryptu uruchamiającego 
-      'xfce4-notes-plugin' w pierwszym otwartym 'cryptfs'. Dodanie pliku
-      autostartu dla tego skryptu. Dodanie funkcji uruchamiającej autostart
-      skryptu (funkcja stosowana jest tylko dla użytkownika 'xf0r3m') do
-      pliku szablonu (pliku z funkcjami dla plików wersji).
-
-  11. Dodanie do opcji 'create' narzędzia 'immudex_crypt' funkcji, która
-      ustawia prawa własności dla użytkownika, który właśnie tworzy 'cryptfs'.
-
-  12. Zmiana źródła oraz sposóbu wyświetlania pogody przez narzędzie 'meteo'.
-      Obecnie korzysta ono z serwisu wttr.in i wyświetla informacje w 
-      terminalu.
-
-  13. Utworzono usługę dynamicznej nazwy hosta. Usługa bazuje na informacjach
-      wyświetlanych w polach 'Hardware vendor' oraz 'Hardware model' wyjścia
-      polecenia 'hostnamectl'. Wymaga recznej aktualizacji i dodanie
-      informacji o uruchomionym sprzęcie do skryptu, dlatego. Póki co będzie
-      ona poprawnie ustawiać nazwę hosta dla Komputerów marki Dell z serii
-      Latitude oraz komputerów marki Lenovo z serii ThinkPad. Usługa jest
-      plikiem jednoski 'systemd' i jest uruchamiana przed uruchomienie
-      mendżera wyświetlania 'LightDM'.
-
-  14. Zmieniono domyślny format opcji '-a' ("audio-only") narzędzia 'ytplay'.
-      Z '--bestaudio' (co nie pozwalało na uruchomienie wyłącznie strumienia
-      dźwieku z transmisji na żywo) na '--novideo --best[height=360]'. Co 
-      wpłynęło na wyżej wymieniony problem.
-
-  15. Dodanie nowego narzędzia 'pl'. Pozwalającego na wybór i odtworzenie
-      wybranego linku z pliku tekstowego. Poza odnośnikami z YT jest możliwe
-      odtwarzenie również radia internetowego. 

diff --git a/changelogs/1.0.1.txt b/changelogs/1.0.1.txt
deleted file mode 100644 (file)
index 7d5a21e..0000000
--- a/changelogs/1.0.1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-immudex 1.0.1 - aktualizacja jądra
-
-  1. Aktualizacja pakietów wraz z jądrem Linux.
-
-  2. Zmiana programu pocztowego dostarczanego wraz z dystrybucją.
-    'Thunderbirda' zastąpił 'mutt'.
-
-  3. Aktualizacja narzędzia 'pl'. Umożliwienie odtwarzania filmów oraz
-    możliwość zmiany linku podczas odtwarzania innego.
-
-  4. Aktualizacja narzędzia 'import_gpgkeys'. Obecnie wymagane jest również
-    eksport bazy zaufania kluczy 'trustdb' w pliku 'otrust.txt'. Przez co
-    niema już potrzeby ustawiania poziomu zaufania dla kluczy.
-
-  5. Zmiana nazwy kodowej wersji testowej w narzędziu 'immudex_branch' oraz
-    w funkcji 'get_debian_branch' w pliku 'library.sh' wykorzystywanym przez
-    kilka innych narzędzi.
-
-  6. Uzupełnienie 'immudex_hostname' o zgłoszone hostname-y. Dodano również
-    generowanie hostname-u dla maszyn wirtualnych KVM. Hostname generowany jest
-    na podstawie Machine ID.
-
-  7. Zmiana domyślnych programów dla znanych plików.
-
-  8. Aktualizacja narzędzia 'newsfeed'. Teraz pod tytułami wyświetlone zostanie
-    zawartość pola "<description>" z pliku RSS.

diff --git a/changelogs/1.0.2.txt b/changelogs/1.0.2.txt
deleted file mode 100644 (file)
index 5c768bf..0000000
--- a/changelogs/1.0.2.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-immudex 1.0.2 - aktualizacja jądra
-(immudex 1.0.2 = immudex-testing 1.0.6)
-
-  1. Aktualizacja pakietów wraz z jądrem Linux.
-
-  2. Dodanie zaginione aktualizacji narzędzia 'create_media'. Dodanie opcji
-    '--nuke', pozwalające wyzerować pierwszy megabajt dysku - BT #83
-
-  3. Aktualizacja narzędzia 'pl'. Oczyszczenie odnośnika do yt z początkowej
-    spacji, mogło to powodować zablokowania odtwarzania filmów, w niektórych
-    wersjach 'mpv' - BT#85
-
-  4. Wdrożenie zunifikowanego narzędzia 'immudex_hostname' - BT #92
-
-  5. Definicja skrótów klawiszowych:
-    - Ctrl+Alt+T - uruchmia xfce4-terminal.
-    - Win - wyświetla/chowa menu "Start" (identycznie jak systemach MS Windows)

diff --git a/changelogs/1.0.3.txt b/changelogs/1.0.3.txt
deleted file mode 100644 (file)
index b44d80f..0000000
--- a/changelogs/1.0.3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-immudex 1.0.3 - aktualizacja jądra
-(immudex 1.0.3 = immudex-testing 1.0.8)
-
-       1. Aktualizacja pakietów wraz z jądrem Linux.
-
-  2. Usunięcie pakietu 'xpra'.
-
-  3. Aktualizcja skryptu yt-dlp.
-
-  4. Dodanie skrótów klawiszowych pozwalających wyrównać okno do wybranej
-    krawędzi ekranu (zgodnie z klawiszami kierunkowymi w 'Vim') oraz 
-    przenieść okno na wybrany monitor
-    (Ctrl+Shift+! - lewy, Ctrl+Shift+@ - prawy)
-
-  5. Dodanie klienta projektu IDLE.
-
-  6. Aktualizacja narzędzia 'pl'. Dodanie możliwości podania odnośnika URL
-    (HTTP/HTTPS) do listy z linkami.
-
-  7. Wyłącznie przesuwania okna poprzez kliknięcie na nie z przytrzymanym
-      lewym klawiszem 'Alt'. 
-
-  
-

diff --git a/changelogs/1.0.4.txt b/changelogs/1.0.4.txt
deleted file mode 100644 (file)
index c59c497..0000000
--- a/changelogs/1.0.4.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-immudex 1.0.4 - aktualizacja jądra
-(immudex 1.0.4 = immudex-testing 1.1.0)
-
-       1. Aktualizacja pakietów wraz z jądrem Linux.
-
-  2. Dodanie przeglądarki LibreWolf.
-
-  3. Zmiana przeglądarki uruchamianej przez Firejail z Firefox ESR na LibreWolf.
-
-  4. Usunięcie obrazów, do których nie mam żadnych praw:
-    4.1. Zmiana tapety menedżera wyświetlania LightDM.
-    4.2. Usunięcie obrazu z tła terminala.
-    4.3. Usunięcie obrazu z tła pluginu notatek XFCE.

diff --git a/changelogs/1.0.5.txt b/changelogs/1.0.5.txt
deleted file mode 100644 (file)
index e1d9b01..0000000
--- a/changelogs/1.0.5.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-immudex 1.0.5 - aktualizacja Debiana 12.2
-(immudex 1.0.5 = immudex-testing: 5ebc813)
-
-       1. Aktualizacja pakietów wraz z jądrem Linux.
-
-  2. Dodanie do profile LibreWolf 3 zakładek.
-
-  3. Dodanie do skryptu funkcji 'library.sh', funkcji ascii_colors (motd2); 
-
-  4. Aktualizcja narzędzia motd2:
-    4.1. Zmiana wyświelania baneru 'immudex'. Obecnie użyto funkcji:
-         'library.sh/ascii_colors'.
-    4.2. Poprawiono wyświetlanie uptime-u.
-
-  5. Aktualizacja narzędzia newsfeed:
-    5.1. Zmieniono metodę przetwarzania plików z kanałów RSS.
-    5.2. Dodano podopcje '--show-one' do opcji '--check' wyświetlającą
-          pierwszą wiadomość z kanału.
-    5.3. Zaktualizowano komunikat pomocy.
-
-  6. Aktualizacja narzędzia sync.sh:
-    6.1. Zmieniono obsługi katalogów. Porzucono prostą synchonizację na rzecz
-          repozytorium Git.
-
-  7. Dodano narzędzie 'unlock-ds'. Narzędzie to pozwala odblokować poprzez
-      odmontowanie zamontowanych wewnątrz datastore-u systemów plików oraz
-      (UWAGA!) ZABICIE procesów posiadających otware pliki na datastore.
-      Korzystanie z tego narzędzia wyłącznie na własną odpowiedzialność.

diff --git a/changelogs/1.0.6.txt b/changelogs/1.0.6.txt
deleted file mode 100644 (file)
index 6b6aa20..0000000
--- a/changelogs/1.0.6.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-immudex 1.0.6 - aktualizacja awaryjna
-(immudex 1.0.6 = immudex-testing: )
-
-       1. Aktualizacja narzędzia curl, za pomoca kompilacji źródeł: CVE-2023-38545

diff --git a/files/0/001/xfce4-panel.xml b/files/0/001/xfce4-panel.xml
deleted file mode 100644 (file)
index 4316b3e..0000000
--- a/files/0/001/xfce4-panel.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="configver" type="int" value="2"/>
-  <property name="panels" type="array">
-    <value type="int" value="1"/>
-    <value type="int" value="2"/>
-    <property name="dark-mode" type="bool" value="true"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=960;y=1066"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="icon-size" type="uint" value="16"/>
-      <property name="size" type="uint" value="26"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-        <value type="int" value="3"/>
-        <value type="int" value="4"/>
-        <value type="int" value="5"/>
-        <value type="int" value="11"/>
-        <value type="int" value="13"/>
-      </property>
-      <property name="span-monitors" type="bool" value="true"/>
-    </property>
-    <property name="panel-2" type="empty">
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="position" type="string" value="p=11;x=903;y=28"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="48"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="23"/>
-        <value type="int" value="16"/>
-        <value type="int" value="17"/>
-        <value type="int" value="18"/>
-        <value type="int" value="19"/>
-        <value type="int" value="20"/>
-        <value type="int" value="30"/>
-        <value type="int" value="31"/>
-        <value type="int" value="32"/>
-        <value type="int" value="29"/>
-        <value type="int" value="21"/>
-        <value type="int" value="22"/>
-        <value type="int" value="24"/>
-        <value type="int" value="12"/>
-        <value type="int" value="28"/>
-        <value type="int" value="25"/>
-        <value type="int" value="26"/>
-        <value type="int" value="27"/>
-        <value type="int" value="1"/>
-        <value type="int" value="6"/>
-        <value type="int" value="8"/>
-        <value type="int" value="9"/>
-        <value type="int" value="10"/>
-        <value type="int" value="7"/>
-        <value type="int" value="14"/>
-        <value type="int" value="15"/>
-      </property>
-      <property name="span-monitors" type="bool" value="false"/>
-      <property name="length-adjust" type="bool" value="false"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="icon-size" type="uint" value="0"/>
-      <property name="enter-opacity" type="uint" value="100"/>
-      <property name="leave-opacity" type="uint" value="100"/>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="tasklist">
-      <property name="grouping" type="uint" value="0"/>
-    </property>
-    <property name="plugin-3" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-11" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-13" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-15" type="string" value="showdesktop"/>
-    <property name="plugin-16" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-17" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="166081777910.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-18" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608164222.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-19" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608166085.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16609267132.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-21" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-22" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/xf0r3m"/>
-    </property>
-    <property name="plugin-7" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-23" type="string" value="applicationsmenu">
-      <property name="show-button-title" type="bool" value="false"/>
-      <property name="button-icon" type="string" value="debian-logo"/>
-    </property>
-    <property name="plugin-24" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-25" type="string" value="systemload"/>
-    <property name="plugin-26" type="string" value="netload"/>
-    <property name="plugin-27" type="string" value="fsguard"/>
-    <property name="plugin-30" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177187.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-31" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177268.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-32" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177609.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-1" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="known-legacy-items" type="array">
-        <value type="string" value="aplet networkmanager"/>
-      </property>
-      <property name="icon-size" type="int" value="45"/>
-      <property name="known-items" type="array">
-        <value type="string" value="vlc"/>
-      </property>
-    </property>
-    <property name="plugin-8" type="string" value="pulseaudio">
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-      <property name="mpris-players" type="string" value="firefox.instance1280;firefox.instance1290;firefox.instance1308;firefox.instance1309;firefox.instance1387;firefox.instance2389;firefox.instance5436;vlc"/>
-    </property>
-    <property name="plugin-9" type="string" value="notification-plugin"/>
-    <property name="plugin-10" type="string" value="power-manager-plugin"/>
-    <property name="plugin-12" type="string" value="clock"/>
-    <property name="plugin-14" type="string" value="actions">
-      <property name="appearance" type="uint" value="0"/>
-      <property name="items" type="array">
-        <value type="string" value="+lock-screen"/>
-        <value type="string" value="-switch-user"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-suspend"/>
-        <value type="string" value="-hibernate"/>
-        <value type="string" value="-hybrid-sleep"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="+shutdown"/>
-        <value type="string" value="-restart"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-logout"/>
-        <value type="string" value="-logout-dialog"/>
-      </property>
-    </property>
-    <property name="plugin-28" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-29" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16633324331.desktop"/>
-      </property>
-    </property>
-  </property>
-</channel>

diff --git a/files/0/004/xfce4-panel.xml b/files/0/004/xfce4-panel.xml
deleted file mode 100644 (file)
index e0213bd..0000000
--- a/files/0/004/xfce4-panel.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="configver" type="int" value="2"/>
-  <property name="panels" type="array">
-    <value type="int" value="1"/>
-    <value type="int" value="2"/>
-    <property name="dark-mode" type="bool" value="true"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=960;y=1066"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="icon-size" type="uint" value="16"/>
-      <property name="size" type="uint" value="26"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-        <value type="int" value="3"/>
-        <value type="int" value="4"/>
-        <value type="int" value="5"/>
-        <value type="int" value="11"/>
-        <value type="int" value="13"/>
-      </property>
-      <property name="span-monitors" type="bool" value="true"/>
-    </property>
-    <property name="panel-2" type="empty">
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="position" type="string" value="p=11;x=903;y=28"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="48"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="23"/>
-        <value type="int" value="16"/>
-        <value type="int" value="17"/>
-        <value type="int" value="18"/>
-        <value type="int" value="19"/>
-        <value type="int" value="20"/>
-        <value type="int" value="30"/>
-        <value type="int" value="31"/>
-        <value type="int" value="32"/>
-        <value type="int" value="29"/>
-        <value type="int" value="21"/>
-        <value type="int" value="22"/>
-        <value type="int" value="24"/>
-        <value type="int" value="12"/>
-        <value type="int" value="28"/>
-        <value type="int" value="25"/>
-        <value type="int" value="26"/>
-        <value type="int" value="27"/>
-        <value type="int" value="1"/>
-        <value type="int" value="6"/>
-        <value type="int" value="8"/>
-        <value type="int" value="9"/>
-        <value type="int" value="10"/>
-        <value type="int" value="7"/>
-        <value type="int" value="14"/>
-        <value type="int" value="15"/>
-      </property>
-      <property name="span-monitors" type="bool" value="false"/>
-      <property name="length-adjust" type="bool" value="false"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="icon-size" type="uint" value="0"/>
-      <property name="enter-opacity" type="uint" value="100"/>
-      <property name="leave-opacity" type="uint" value="100"/>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="tasklist">
-      <property name="grouping" type="uint" value="0"/>
-    </property>
-    <property name="plugin-3" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-11" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-13" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-15" type="string" value="showdesktop"/>
-    <property name="plugin-16" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-17" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="166081777910.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-18" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608164222.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-19" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608166085.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16609267132.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-21" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-22" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/xf0r3m"/>
-    </property>
-    <property name="plugin-7" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-23" type="string" value="applicationsmenu">
-      <property name="show-button-title" type="bool" value="false"/>
-      <property name="button-icon" type="string" value="debian-logo"/>
-    </property>
-    <property name="plugin-24" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-25" type="string" value="systemload"/>
-    <property name="plugin-26" type="string" value="netload"/>
-    <property name="plugin-27" type="string" value="fsguard"/>
-    <property name="plugin-30" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177187.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-31" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177268.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-32" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16674118881.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-1" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="known-legacy-items" type="array">
-        <value type="string" value="aplet networkmanager"/>
-      </property>
-      <property name="icon-size" type="int" value="45"/>
-      <property name="known-items" type="array">
-        <value type="string" value="vlc"/>
-      </property>
-    </property>
-    <property name="plugin-8" type="string" value="pulseaudio">
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-      <property name="mpris-players" type="string" value="firefox.instance1280;firefox.instance1290;firefox.instance1308;firefox.instance1309;firefox.instance1387;firefox.instance1710;firefox.instance2389;firefox.instance5436;vlc"/>
-    </property>
-    <property name="plugin-9" type="string" value="notification-plugin"/>
-    <property name="plugin-10" type="string" value="power-manager-plugin"/>
-    <property name="plugin-12" type="string" value="clock"/>
-    <property name="plugin-14" type="string" value="actions">
-      <property name="appearance" type="uint" value="0"/>
-      <property name="items" type="array">
-        <value type="string" value="+lock-screen"/>
-        <value type="string" value="-switch-user"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-suspend"/>
-        <value type="string" value="-hibernate"/>
-        <value type="string" value="-hybrid-sleep"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="+shutdown"/>
-        <value type="string" value="-restart"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-logout"/>
-        <value type="string" value="-logout-dialog"/>
-      </property>
-    </property>
-    <property name="plugin-28" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-29" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16633324331.desktop"/>
-      </property>
-    </property>
-  </property>
-</channel>

diff --git a/files/0/007/mozilla.tgz b/files/0/007/mozilla.tgz
deleted file mode 100644 (file)
index 8468a26..0000000
Binary files a/files/0/007/mozilla.tgz and /dev/null differ

diff --git a/files/0/010/.irssi/config b/files/0/010/.irssi/config
deleted file mode 100644 (file)
index 8b6b901..0000000
--- a/files/0/010/.irssi/config
+++ /dev/null
@@ -1,317 +0,0 @@
-servers = (
-  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
-  {
-    address = "ssl.efnet.org";
-    chatnet = "EFNet";
-    port = "9999";
-    use_tls = "yes";
-  },
-  {
-    address = "irc.esper.net";
-    chatnet = "EsperNet";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  {
-    address = "chat.freenode.net";
-    chatnet = "Freenode";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  {
-    address = "irc.gamesurge.net";
-    chatnet = "GameSurge";
-    port = "6667";
-  },
-  {
-    address = "eu.irc6.net";
-    chatnet = "IRCnet";
-    port = "6667";
-    use_tls = "yes";
-  },
-  { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
-  {
-    address = "irc.ircsource.net";
-    chatnet = "IRCSource";
-    port = "6667";
-  },
-  { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
-  {
-    address = "irc.oftc.net";
-    chatnet = "OFTC";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  { 
-    address = "irc.quakenet.org";
-    chatnet = "QuakeNet";
-    port = "6667";
-  },
-  {
-    address = "irc.rizon.net";
-    chatnet = "Rizon";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
-  { 
-    address = "irc.undernet.org";
-    chatnet = "Undernet";
-    port = "6667";
-  },
-  {
-    address = "searx.morketsmerke.net";
-    chatnet = "morketsmerke.net";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-    tls_capath = "/etc/ssl/certs";
-    autoconnect = "yes";
-  }
-);
-
-chatnets = {
-  DALnet = {
-    type = "IRC";
-    max_kicks = "4";
-    max_msgs = "20";
-    max_whois = "30";
-  };
-  EFNet = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  EsperNet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  Freenode = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  GameSurge = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  IRCnet = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  IRCSource = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  NetFuze = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  OFTC = { type = "IRC"; max_kicks = "1"; max_msgs = "1"; max_whois = "1"; };
-  QuakeNet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  Rizon = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  SILC = { type = "SILC"; };
-  Undernet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  "morketsmerke.net" = { type = "IRC"; };
-};
-
-channels = (
-  { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
-  { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; },
-  { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
-  { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
-  { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
-  { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
-  { name = "silc"; chatnet = "SILC"; autojoin = "No"; },
-  { 
-    name = "#general";
-    chatnet = "morketsmerke.net";
-    autojoin = "yes";
-  }
-);
-
-aliases = {
-  ATAG = "WINDOW SERVER";
-  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
-  B = "BAN";
-  BACK = "AWAY";
-  BANS = "BAN";
-  BYE = "QUIT";
-  C = "CLEAR";
-  CALC = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
-  CHAT = "DCC CHAT";
-  DATE = "TIME";
-  DEHIGHLIGHT = "DEHILIGHT";
-  DESCRIBE = "ACTION";
-  DHL = "DEHILIGHT";
-  EXEMPTLIST = "MODE $C +e";
-  EXIT = "QUIT";
-  GOTO = "SCROLLBACK GOTO";
-  HIGHLIGHT = "HILIGHT";
-  HL = "HILIGHT";
-  HOST = "USERHOST";
-  INVITELIST = "MODE $C +I";
-  J = "JOIN";
-  K = "KICK";
-  KB = "KICKBAN";
-  KN = "KNOCKOUT";
-  LAST = "LASTLOG";
-  LEAVE = "PART";
-  M = "MSG";
-  MUB = "UNBAN *";
-  N = "NAMES";
-  NMSG = "^MSG";
-  P = "PART";
-  Q = "QUERY";
-  RESET = "SET -default";
-  RUN = "SCRIPT LOAD";
-  SAY = "MSG *";
-  SB = "SCROLLBACK";
-  SBAR = "STATUSBAR";
-  SIGNOFF = "QUIT";
-  SV = "MSG * Irssi $J ($V) - https://irssi.org";
-  T = "TOPIC";
-  UB = "UNBAN";
-  UMODE = "MODE $N";
-  UNSET = "SET -clear";
-  W = "WHO";
-  WC = "WINDOW CLOSE";
-  WG = "WINDOW GOTO";
-  WJOIN = "JOIN -window";
-  WI = "WHOIS";
-  WII = "WHOIS $0 $0";
-  WL = "WINDOW LIST";
-  WN = "WINDOW NEW HIDDEN";
-  WQUERY = "QUERY -window";
-  WW = "WHOWAS";
-};
-
-statusbar = {
-
-  items = {
-
-    barstart = "{sbstart}";
-    barend = "{sbend}";
-
-    topicbarstart = "{topicsbstart}";
-    topicbarend = "{topicsbend}";
-
-    time = "{sb $Z}";
-    user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}";
-
-    window = "{sb $winref:$tag/$itemname{sbmode $M}}";
-    window_empty = "{sb $winref{sbservertag $tag}}";
-
-    prompt = "{prompt $[.15]itemname}";
-    prompt_empty = "{prompt $winname}";
-
-    topic = " $topic";
-    topic_empty = " Irssi v$J - https://irssi.org";
-
-    lag = "{sb Lag: $0-}";
-    act = "{sb Act: $0-}";
-    more = "-- more --";
-  };
-
-  default = {
-
-    window = {
-
-      disabled = "no";
-      type = "window";
-      placement = "bottom";
-      position = "1";
-      visible = "active";
-
-      items = {
-        barstart = { priority = "100"; };
-        time = { };
-        user = { };
-        window = { };
-        window_empty = { };
-        lag = { priority = "-1"; };
-        act = { priority = "10"; };
-        more = { priority = "-1"; alignment = "right"; };
-        barend = { priority = "100"; alignment = "right"; };
-      };
-    };
-
-    window_inact = {
-
-      type = "window";
-      placement = "bottom";
-      position = "1";
-      visible = "inactive";
-
-      items = {
-        barstart = { priority = "100"; };
-        window = { };
-        window_empty = { };
-        more = { priority = "-1"; alignment = "right"; };
-        barend = { priority = "100"; alignment = "right"; };
-      };
-    };
-
-    prompt = {
-
-      type = "root";
-      placement = "bottom";
-      position = "100";
-      visible = "always";
-
-      items = {
-        prompt = { priority = "-1"; };
-        prompt_empty = { priority = "-1"; };
-        input = { priority = "10"; };
-      };
-    };
-
-    topic = {
-
-      type = "root";
-      placement = "top";
-      position = "1";
-      visible = "always";
-
-      items = {
-        topicbarstart = { priority = "100"; };
-        topic = { };
-        topic_empty = { };
-        topicbarend = { priority = "100"; alignment = "right"; };
-      };
-    };
-  };
-};

diff --git a/files/0/010/irssi.desktop b/files/0/010/irssi.desktop
deleted file mode 100644 (file)
index b3b5002..0000000
--- a/files/0/010/irssi.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=irssi
-Comment=irc client
-Exec=/usr/bin/xfce4-terminal -T irssi -e /usr/bin/irssi
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=true
-Hidden=false
-

diff --git a/files/0/011/16608166085.desktop b/files/0/011/16608166085.desktop
deleted file mode 100644 (file)
index eb0a4da..0000000
--- a/files/0/011/16608166085.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=(Firejailed) Firefox ESR
-Name[pl]=(Firejailed) Firefox ESR
-Comment=Browse the World Wide Web
-Comment[pl]=Przeglądanie stron WWW 
-GenericName=Web Browser
-GenericName[pl]=Przeglądarka WWW
-X-GNOME-FullName=Firefox ESR Web Browser
-X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
-Exec=/usr/local/bin/secured-firefox
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=firefox-esr
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Firefox-esr
-StartupNotify=true
-X-XFCE-Source=file:///usr/share/applications/firefox-esr.desktop

diff --git a/files/0/011/Notifier - packages.desktop b/files/0/011/Notifier - packages.desktop
deleted file mode 100644 (file)
index 1e0c636..0000000
--- a/files/0/011/Notifier - packages.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Notifier - packages
-Comment=Notifier - packages
-Exec=/usr/local/bin/notifier packages
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/files/0/012/launcher-33/16827613901.desktop b/files/0/012/launcher-33/16827613901.desktop
deleted file mode 100755 (executable)
index 899d137..0000000
--- a/files/0/012/launcher-33/16827613901.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Klient poczty Thunderbird
-Comment=Czytanie i wysyłanie e-maili
-Exec=/usr/local/bin/run-thunderbird
-Icon=thunderbird
-Path=
-Terminal=false
-StartupNotify=true

diff --git a/files/0/012/xfce4-panel.xml b/files/0/012/xfce4-panel.xml
deleted file mode 100644 (file)
index 92769eb..0000000
--- a/files/0/012/xfce4-panel.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="configver" type="int" value="2"/>
-  <property name="panels" type="array">
-    <value type="int" value="1"/>
-    <value type="int" value="2"/>
-    <property name="dark-mode" type="bool" value="true"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=960;y=1066"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="icon-size" type="uint" value="16"/>
-      <property name="size" type="uint" value="26"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-        <value type="int" value="3"/>
-        <value type="int" value="4"/>
-        <value type="int" value="5"/>
-        <value type="int" value="11"/>
-        <value type="int" value="13"/>
-      </property>
-      <property name="span-monitors" type="bool" value="true"/>
-    </property>
-    <property name="panel-2" type="empty">
-      <property name="autohide-behavior" type="uint" value="0"/>
-      <property name="position" type="string" value="p=11;x=903;y=28"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="48"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="23"/>
-        <value type="int" value="16"/>
-        <value type="int" value="17"/>
-        <value type="int" value="18"/>
-        <value type="int" value="19"/>
-        <value type="int" value="20"/>
-        <value type="int" value="30"/>
-        <value type="int" value="31"/>
-        <value type="int" value="32"/>
-        <value type="int" value="33"/>
-        <value type="int" value="29"/>
-        <value type="int" value="21"/>
-        <value type="int" value="22"/>
-        <value type="int" value="24"/>
-        <value type="int" value="12"/>
-        <value type="int" value="28"/>
-        <value type="int" value="25"/>
-        <value type="int" value="26"/>
-        <value type="int" value="27"/>
-        <value type="int" value="1"/>
-        <value type="int" value="6"/>
-        <value type="int" value="8"/>
-        <value type="int" value="9"/>
-        <value type="int" value="10"/>
-        <value type="int" value="7"/>
-        <value type="int" value="14"/>
-        <value type="int" value="15"/>
-      </property>
-      <property name="span-monitors" type="bool" value="false"/>
-      <property name="length-adjust" type="bool" value="false"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="icon-size" type="uint" value="0"/>
-      <property name="enter-opacity" type="uint" value="100"/>
-      <property name="leave-opacity" type="uint" value="100"/>
-      <property name="disable-struts" type="bool" value="false"/>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="tasklist">
-      <property name="grouping" type="uint" value="0"/>
-    </property>
-    <property name="plugin-3" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-11" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-13" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-15" type="string" value="showdesktop"/>
-    <property name="plugin-16" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-17" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="166081777910.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-18" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608164222.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-19" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608166085.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16609267132.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-21" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-22" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/xf0r3m"/>
-    </property>
-    <property name="plugin-7" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-23" type="string" value="applicationsmenu">
-      <property name="show-button-title" type="bool" value="false"/>
-      <property name="button-icon" type="string" value="debian-logo"/>
-    </property>
-    <property name="plugin-24" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-25" type="string" value="systemload"/>
-    <property name="plugin-26" type="string" value="netload"/>
-    <property name="plugin-27" type="string" value="fsguard"/>
-    <property name="plugin-30" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177187.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-31" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16608177268.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-32" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16674118881.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-1" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="known-legacy-items" type="array">
-        <value type="string" value="aplet networkmanager"/>
-      </property>
-      <property name="icon-size" type="int" value="45"/>
-      <property name="known-items" type="array">
-        <value type="string" value="indicator-solaar"/>
-        <value type="string" value="vlc"/>
-      </property>
-    </property>
-    <property name="plugin-8" type="string" value="pulseaudio">
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-      <property name="mpris-players" type="string" value="firefox.instance1280;firefox.instance1290;firefox.instance1308;firefox.instance1309;firefox.instance1387;firefox.instance1710;firefox.instance2389;firefox.instance5436;vlc"/>
-    </property>
-    <property name="plugin-9" type="string" value="notification-plugin"/>
-    <property name="plugin-10" type="string" value="power-manager-plugin"/>
-    <property name="plugin-12" type="string" value="clock"/>
-    <property name="plugin-14" type="string" value="actions">
-      <property name="appearance" type="uint" value="0"/>
-      <property name="items" type="array">
-        <value type="string" value="+lock-screen"/>
-        <value type="string" value="-switch-user"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-suspend"/>
-        <value type="string" value="-hibernate"/>
-        <value type="string" value="-hybrid-sleep"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="+shutdown"/>
-        <value type="string" value="-restart"/>
-        <value type="string" value="+separator"/>
-        <value type="string" value="-logout"/>
-        <value type="string" value="-logout-dialog"/>
-      </property>
-    </property>
-    <property name="plugin-28" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-      <property name="expand" type="bool" value="true"/>
-    </property>
-    <property name="plugin-29" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16633324331.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-33" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16827613901.desktop"/>
-      </property>
-    </property>
-  </property>
-</channel>

diff --git a/files/0/013/meteo/leg60.png b/files/0/013/meteo/leg60.png
deleted file mode 100644 (file)
index 47ee492..0000000
Binary files a/files/0/013/meteo/leg60.png and /dev/null differ

diff --git a/files/0/013/mimeapps.list b/files/0/013/mimeapps.list
deleted file mode 100644 (file)
index cb1e1d5..0000000
--- a/files/0/013/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-[Default Applications]
-image/jpeg=ristretto.desktop
-image/png=ristretto.desktop
-
-[Added Associations]
-image/jpeg=ristretto.desktop;
-image/png=ristretto.desktop;

diff --git a/files/0/013/sync.sh/sync.conf b/files/0/013/sync.sh/sync.conf
deleted file mode 100755 (executable)
index 092f209..0000000
--- a/files/0/013/sync.sh/sync.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-server="";
-# Użytkownik zdalny
-ruser="";
-# Ścieżka bezwzględna do katalogu użytkownika zdalnego
-rdirectory="";
-
-# Dodatkowe ustawienia SSH, dla RSYNC
-export RSYNC_RSH='';
-
-# Ścieżka do katalogu lokalnego
-ldirectory="";

diff --git a/files/100/Klient poczty Thunderbird.desktop b/files/100/Klient poczty Thunderbird.desktop
deleted file mode 100755 (executable)
index 899d137..0000000
--- a/files/100/Klient poczty Thunderbird.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Klient poczty Thunderbird
-Comment=Czytanie i wysyłanie e-maili
-Exec=/usr/local/bin/run-thunderbird
-Icon=thunderbird
-Path=
-Terminal=false
-StartupNotify=true

diff --git a/files/100/Notifier - distro.desktop b/files/100/Notifier - distro.desktop
deleted file mode 100644 (file)
index 497ce3e..0000000
--- a/files/100/Notifier - distro.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Notifier - distro
-Comment=Notifier - distro
-Exec=/usr/local/bin/notifier distro
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/files/100/Notifier - packages.desktop b/files/100/Notifier - packages.desktop
deleted file mode 100644 (file)
index 1e0c636..0000000
--- a/files/100/Notifier - packages.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Notifier - packages
-Comment=Notifier - packages
-Exec=/usr/local/bin/notifier packages
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/files/100/autostart-x4notes.desktop b/files/100/autostart-x4notes.desktop
deleted file mode 100644 (file)
index d0d57c8..0000000
--- a/files/100/autostart-x4notes.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=autostart-x4notes
-Comment=Uruchamianie xfce4-notes w cryptfs
-Exec=/usr/local/bin/autostart-x4notes
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/files/100/config b/files/100/config
deleted file mode 100644 (file)
index a6a5b59..0000000
--- a/files/100/config
+++ /dev/null
@@ -1,322 +0,0 @@
-servers = (
-  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
-  {
-    address = "ssl.efnet.org";
-    chatnet = "EFNet";
-    port = "9999";
-    use_tls = "yes";
-  },
-  {
-    address = "irc.esper.net";
-    chatnet = "EsperNet";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  {
-    address = "chat.freenode.net";
-    chatnet = "Freenode";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  {
-    address = "irc.gamesurge.net";
-    chatnet = "GameSurge";
-    port = "6667";
-  },
-  {
-    address = "eu.irc6.net";
-    chatnet = "IRCnet";
-    port = "6667";
-    use_tls = "yes";
-  },
-  { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
-  {
-    address = "irc.ircsource.net";
-    chatnet = "IRCSource";
-    port = "6667";
-  },
-  { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; },
-  {
-    address = "irc.oftc.net";
-    chatnet = "OFTC";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  { 
-    address = "irc.quakenet.org";
-    chatnet = "QuakeNet";
-    port = "6667";
-  },
-  {
-    address = "irc.rizon.net";
-    chatnet = "Rizon";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-  },
-  { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; },
-  { 
-    address = "irc.undernet.org";
-    chatnet = "Undernet";
-    port = "6667";
-  },
-  {
-    address = "irc.morketsmerke.org";
-    chatnet = "morketsmerke.org";
-    port = "6697";
-    use_tls = "yes";
-    tls_verify = "yes";
-    tls_capath = "/etc/ssl/certs";
-    autoconnect = "yes";
-  }
-);
-
-chatnets = {
-  DALnet = {
-    type = "IRC";
-    max_kicks = "4";
-    max_msgs = "20";
-    max_whois = "30";
-  };
-  EFNet = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  EsperNet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  Freenode = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  GameSurge = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  IRCnet = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  IRCSource = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "4";
-    max_whois = "1";
-  };
-  NetFuze = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  OFTC = { type = "IRC"; max_kicks = "1"; max_msgs = "1"; max_whois = "1"; };
-  QuakeNet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  Rizon = { 
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  SILC = { type = "SILC"; };
-  Undernet = {
-    type = "IRC";
-    max_kicks = "1";
-    max_msgs = "1";
-    max_whois = "1";
-  };
-  "morketsmerke.net" = { type = "IRC"; };
-  "morketsmerke.org" = { type = "IRC"; };
-};
-
-channels = (
-  { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
-  { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; },
-  { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
-  { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
-  { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; },
-  { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; },
-  { name = "silc"; chatnet = "SILC"; autojoin = "No"; },
-  { 
-    name = "#general";
-    chatnet = "morketsmerke.net";
-    autojoin = "yes";
-  }
-);
-
-aliases = {
-  ATAG = "WINDOW SERVER";
-  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{visible_name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}";
-  B = "BAN";
-  BACK = "AWAY";
-  BANS = "BAN";
-  BYE = "QUIT";
-  C = "CLEAR";
-  CALC = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi";
-  CHAT = "DCC CHAT";
-  DATE = "TIME";
-  DEHIGHLIGHT = "DEHILIGHT";
-  DESCRIBE = "ACTION";
-  DHL = "DEHILIGHT";
-  EXEMPTLIST = "MODE $C +e";
-  EXIT = "QUIT";
-  GOTO = "SCROLLBACK GOTO";
-  HIGHLIGHT = "HILIGHT";
-  HL = "HILIGHT";
-  HOST = "USERHOST";
-  INVITELIST = "MODE $C +I";
-  J = "JOIN";
-  K = "KICK";
-  KB = "KICKBAN";
-  KN = "KNOCKOUT";
-  LAST = "LASTLOG";
-  LEAVE = "PART";
-  M = "MSG";
-  MUB = "UNBAN *";
-  N = "NAMES";
-  NMSG = "^MSG";
-  P = "PART";
-  Q = "QUERY";
-  RESET = "SET -default";
-  RUN = "SCRIPT LOAD";
-  SAY = "MSG *";
-  SB = "SCROLLBACK";
-  SBAR = "STATUSBAR";
-  SIGNOFF = "QUIT";
-  SV = "MSG * Irssi $J ($V) - https://irssi.org";
-  T = "TOPIC";
-  UB = "UNBAN";
-  UMODE = "MODE $N";
-  UNSET = "SET -clear";
-  W = "WHO";
-  WC = "WINDOW CLOSE";
-  WG = "WINDOW GOTO";
-  WJOIN = "JOIN -window";
-  WI = "WHOIS";
-  WII = "WHOIS $0 $0";
-  WL = "WINDOW LIST";
-  WN = "WINDOW NEW HIDDEN";
-  WQUERY = "QUERY -window";
-  WW = "WHOWAS";
-};
-
-statusbar = {
-
-  items = {
-
-    barstart = "{sbstart}";
-    barend = "{sbend}";
-
-    topicbarstart = "{topicsbstart}";
-    topicbarend = "{topicsbend}";
-
-    time = "{sb $Z}";
-    user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}";
-
-    window = "{sb $winref:$tag/$itemname{sbmode $M}}";
-    window_empty = "{sb $winref{sbservertag $tag}}";
-
-    prompt = "{prompt $[.15]itemname}";
-    prompt_empty = "{prompt $winname}";
-
-    topic = " $topic";
-    topic_empty = " Irssi v$J - https://irssi.org";
-
-    lag = "{sb Lag: $0-}";
-    act = "{sb Act: $0-}";
-    more = "-- more --";
-  };
-
-  default = {
-
-    window = {
-
-      disabled = "no";
-      type = "window";
-      placement = "bottom";
-      position = "1";
-      visible = "active";
-
-      items = {
-        barstart = { priority = "100"; };
-        time = { };
-        user = { };
-        window = { };
-        window_empty = { };
-        lag = { priority = "-1"; };
-        act = { priority = "10"; };
-        more = { priority = "-1"; alignment = "right"; };
-        barend = { priority = "100"; alignment = "right"; };
-      };
-    };
-
-    window_inact = {
-
-      type = "window";
-      placement = "bottom";
-      position = "1";
-      visible = "inactive";
-
-      items = {
-        barstart = { priority = "100"; };
-        window = { };
-        window_empty = { };
-        more = { priority = "-1"; alignment = "right"; };
-        barend = { priority = "100"; alignment = "right"; };
-      };
-    };
-
-    prompt = {
-
-      type = "root";
-      placement = "bottom";
-      position = "100";
-      visible = "always";
-
-      items = {
-        prompt = { priority = "-1"; };
-        prompt_empty = { priority = "-1"; };
-        input = { priority = "10"; };
-      };
-    };
-
-    topic = {
-
-      type = "root";
-      placement = "top";
-      position = "1";
-      visible = "always";
-
-      items = {
-        topicbarstart = { priority = "100"; };
-        topic = { };
-        topic_empty = { };
-        topicbarend = { priority = "100"; alignment = "right"; };
-      };
-    };
-  };
-};
-settings = {
-  core = { real_name = "Unknown"; user_name = "xf0r3m"; nick = "xf0r3m"; };
-  "fe-text" = { actlist_sort = "refnum"; };
-};

diff --git a/files/100/conkyrc b/files/100/conkyrc
deleted file mode 100644 (file)
index 6ce45dc..0000000
--- a/files/100/conkyrc
+++ /dev/null
@@ -1,75 +0,0 @@
--- Conky, a system monitor https://github.com/brndnmtthws/conky
---
--- This configuration file is Lua code. You can write code in here, and it will
--- execute when Conky loads. You can use it to generate your own advanced
--- configurations.
---
--- Try this (remove the `--`):
---
---   print("Loading Conky config")
---
--- For more on Lua, see:
--- https://www.lua.org/pil/contents.html
-
-conky.config = {
-    alignment = 'top_right',
-    background = true,
-    border_width = 1,
-    cpu_avg_samples = 2,
-    default_color = 'red',
-    default_outline_color = 'brown',
-    default_shade_color = 'brown',
-    double_buffer = true,
-    draw_borders = false,
-    draw_graph_borders = true,
-    draw_outline = false,
-    draw_shades = false,
-    extra_newline = false,
-    font = 'DejaVu Sans Mono:size=12',
-    gap_x = 5,
-    gap_y = 0,
-    minimum_height = 5,
-    minimum_width = 5,
-    net_avg_samples = 2,
-    no_buffers = true,
-    out_to_console = false,
-    out_to_ncurses = false,
-    out_to_stderr = false,
-    out_to_x = true,
-    own_window = true,
-       own_window_transparent = true,
-       own_window_argb_visual = true,
-    own_window_class = 'Conky',
-        own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-    show_graph_range = false,
-    show_graph_scale = false,
-    stippled_borders = 0,
-    update_interval = 1.0,
-    uppercase = false,
-    use_spacer = 'none',
-    use_xft = true,
-}
-
-conky.text = [[
-${color blue}Info:$color ${scroll 32 immudex${exec immudex_branch} ${cat /run/live/medium/live/version} - $sysname $nodename $kernel $machine}
-$hr
-${color blue}Uptime:$color $uptime
-${color blue}Frequency (in MHz):$color $freq
-${color blue}Frequency (in GHz):$color $freq_g
-${color blue}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
-${color blue}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
-${color blue}CPU Usage:$color $cpu% ${cpubar 4}
-${color blue}Processes:$color $processes  ${color blue}Running:$color $running_processes
-${color blue}Battery:$color ${battery}
-$hr
-${color blue}File systems:
- / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
-${color blue}Networking:
-Up:$color ${upspeed} ${color blue} - Down:$color ${downspeed}
-$hr
-${color blue}Name              PID     CPU%   MEM%
-${color red} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color red} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
-${color red} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
-${color red} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
-]]

diff --git a/files/100/default.theme b/files/100/default.theme
deleted file mode 100644 (file)
index 79b1af5..0000000
--- a/files/100/default.theme
+++ /dev/null
@@ -1,295 +0,0 @@
-# When testing changes, the easiest way to reload the theme is with /RELOAD.
-# This reloads the configuration file too, so if you did any changes remember
-# to /SAVE it first. Remember also that /SAVE overwrites the theme file with
-# old data so keep backups :)
-
-# TEMPLATES:
-
-# The real text formats that irssi uses are the ones you can find with
-# /FORMAT command. Back in the old days all the colors and texts were mixed
-# up in those formats, and it was really hard to change the colors since you
-# might have had to change them in tens of different places. So, then came
-# this templating system.
-
-# Now the /FORMATs don't have any colors in them, and they also have very
-# little other styling. Most of the stuff you need to change is in this
-# theme file. If you can't change something here, you can always go back
-# to change the /FORMATs directly, they're also saved in these .theme files.
-
-# So .. the templates. They're those {blahblah} parts you see all over the
-# /FORMATs and here. Their usage is simply {name parameter1 parameter2}.
-# When irssi sees this kind of text, it goes to find "name" from abstracts
-# block below and sets "parameter1" into $0 and "parameter2" into $1 (you
-# can have more parameters of course). Templates can have subtemplates.
-# Here's a small example:
-#   /FORMAT format hello {colorify {underline world}}
-#   abstracts = { colorify = "%G$0-%n"; underline = "%U$0-%U"; }
-# When irssi expands the templates in "format", the final string would be:
-#   hello %G%Uworld%U%n
-# ie. underlined bright green "world" text.
-# and why "$0-", why not "$0"? $0 would only mean the first parameter,
-# $0- means all the parameters. With {underline hello world} you'd really
-# want to underline both of the words, not just the hello (and world would
-# actually be removed entirely).
-
-# COLORS:
-
-# You can find definitions for the color format codes in docs/formats.txt.
-
-# There's one difference here though. %n format. Normally it means the
-# default color of the terminal (white mostly), but here it means the
-# "reset color back to the one it was in higher template". For example
-# if there was /FORMAT test %g{foo}bar, and foo = "%Y$0%n", irssi would
-# print yellow "foo" (as set with %Y) but "bar" would be green, which was
-# set at the beginning before the {foo} template. If there wasn't the %g
-# at start, the normal behaviour of %n would occur. If you _really_ want
-# to use the terminal's default color, use %N.
-
-#############################################################################
-
-# default foreground color (%N) - -1 is the "default terminal color"
-default_color = "-1";
-
-# print timestamp/servertag at the end of line, not at beginning
-info_eol = "false";
-
-# these characters are automatically replaced with specified color
-# (dark grey by default)
-replaces = { "[]=" = "%K$*%n"; };
-
-abstracts = {
-  ##
-  ## generic
-  ##
-
-  # text to insert at the beginning of each non-message line
-  line_start = "%B-%n!%B-%n ";
-
-  # timestamp styling, nothing by default
-  timestamp = "$*";
-
-  # any kind of text that needs hilighting, default is to bold
-  hilight = "%_$*%_";
-
-  # any kind of error message, default is bright red
-  error = "%R$*%n";
-
-  # channel name is printed
-  channel = "%_$*%_";
-
-  # nick is printed
-  nick = "%_$*%_";
-
-  # nick host is printed
-  nickhost = "[$*]";
-
-  # server name is printed
-  server = "%_$*%_";
-
-  # some kind of comment is printed
-  comment = "[$*]";
-
-  # reason for something is printed (part, quit, kick, ..)
-  reason = "{comment $*}";
-
-  # mode change is printed ([+o nick])
-  mode = "{comment $*}";
-
-  ##
-  ## channel specific messages
-  ##
-
-  # highlighted nick/host is printed (joins)
-  channick_hilight = "%C$*%n";
-  chanhost_hilight = "{nickhost %c$*%n}";
-
-  # nick/host is printed (parts, quits, etc.)
-  channick = "%c$*%n";
-  chanhost = "{nickhost $*}";
-
-  # highlighted channel name is printed
-  channelhilight = "%c$*%n";
-
-  # ban/ban exception/invite list mask is printed
-  ban = "%c$*%n";
-
-  ##
-  ## messages
-  ##
-
-  # the basic styling of how to print message, $0 = nick mode, $1 = nick
-  msgnick = "%K<%n$0$1-%K>%n %|";
-
-  # message from you is printed. "ownnick" specifies the styling of the
-  # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
-  # whole line.
-
-  # Example1: You want the message text to be green:
-  #  ownmsgnick = "{msgnick $0 $1-}%g";
-  # Example2.1: You want < and > chars to be yellow:
-  #  ownmsgnick = "%Y{msgnick $0 $1-%Y}%n";
-  #  (you'll also have to remove <> from replaces list above)
-  # Example2.2: But you still want to keep <> grey for other messages:
-  #  pubmsgnick = "%K{msgnick $0 $1-%K}%n";
-  #  pubmsgmenick = "%K{msgnick $0 $1-%K}%n";
-  #  pubmsghinick = "%K{msgnick $1 $0$2-%n%K}%n";
-  #  ownprivmsgnick = "%K{msgnick  $*%K}%n";
-  #  privmsgnick = "%K{msgnick  %R$*%K}%n";
-
-  # $0 = nick mode, $1 = nick
-  ownmsgnick = "{msgnick $0 $1-}";
-  ownnick = "%_$*%n";
-
-  # public message in channel, $0 = nick mode, $1 = nick
-  pubmsgnick = "{msgnick $0 $1-}";
-  pubnick = "%N$*%n";
-
-  # public message in channel meant for me, $0 = nick mode, $1 = nick
-  pubmsgmenick = "{msgnick $0 $1-}";
-  menick = "%Y$*%n";
-
-  # public highlighted message in channel
-  # $0 = highlight color, $1 = nick mode, $2 = nick
-  pubmsghinick = "{msgnick $1 $0$2-%n}";
-
-  # channel name is printed with message
-  msgchannel = "%K:%c$*%n";
-
-  # private message, $0 = nick, $1 = host
-  privmsg = "[%R$0%K(%r$1-%K)%n] ";
-
-  # private message from you, $0 = "msg", $1 = target nick
-  ownprivmsg = "[%r$0%K(%R$1-%K)%n] ";
-
-  # own private message in query
-  ownprivmsgnick = "{msgnick  $*}";
-  ownprivnick = "%_$*%n";
-
-  # private message in query
-  privmsgnick = "{msgnick  %R$*%n}";
-
-  ##
-  ## Actions (/ME stuff)
-  ##
-
-  # used internally by this theme
-  action_core = "%_ * $*%n";
-
-  # generic one that's used by most actions
-  action = "{action_core $*} ";
-
-  # own action, both private/public
-  ownaction = "{action $*}";
-
-  # own action with target, both private/public
-  ownaction_target = "{action_core $0}%K:%c$1%n ";
-
-  # private action sent by others
-  pvtaction = "%_ (*) $*%n ";
-  pvtaction_query = "{action $*}";
-
-  # public action sent by others
-  pubaction = "{action $*}";
-
-
-  ##
-  ## other IRC events
-  ##
-
-  # whois
-  whois = "%# $[8]0 : $1-";
-
-  # notices
-  ownnotice = "[%r$0%K(%R$1-%K)]%n ";
-  notice = "%K-%M$*%K-%n ";
-  pubnotice_channel = "%K:%m$*";
-  pvtnotice_host = "%K(%m$*%K)";
-  servernotice = "%g!$*%n ";
-
-  # CTCPs
-  ownctcp = "[%r$0%K(%R$1-%K)] ";
-  ctcp = "%g$*%n";
-
-  # wallops
-  wallop = "%_$*%n: ";
-  wallop_nick = "%n$*";
-  wallop_action = "%_ * $*%n ";
-
-  # netsplits
-  netsplit = "%R$*%n";
-  netjoin = "%C$*%n";
-
-  # /names list
-  names_prefix = "";
-  names_nick = "[%_$0%_$1-] ";
-  names_nick_op = "{names_nick $*}";
-  names_nick_halfop = "{names_nick $*}";
-  names_nick_voice = "{names_nick $*}";
-  names_users = "[%g$*%n]";
-  names_channel = "%G$*%n";
-
-  # DCC
-  dcc = "%g$*%n";
-  dccfile = "%_$*%_";
-
-  # DCC chat, own msg/action
-  dccownmsg = "[%r$0%K($1-%K)%n] ";
-  dccownnick = "%R$*%n";
-  dccownquerynick = "%_$*%n";
-  dccownaction = "{action $*}";
-  dccownaction_target = "{action_core $0}%K:%c$1%n ";
-
-  # DCC chat, others
-  dccmsg = "[%G$1-%K(%g$0%K)%n] ";
-  dccquerynick = "%G$*%n";
-  dccaction = "%_ (*dcc*) $*%n %|";
-
-  ##
-  ## statusbar
-  ##
-
-  # default background for all statusbars. You can also give
-  # the default foreground color for statusbar items.
-  sb_background = "%4%w";
-  window_border = "%4%w";
-
-  # default backround for "default" statusbar group
-  #sb_default_bg = "%4";
-  # background for prompt / input line
-  sb_prompt_bg = "%n";
-  # background for info statusbar
-  sb_info_bg = "%8";
-  # background for topicbar (same default)
-  #sb_topic_bg = "%4";
-
-  # text at the beginning of statusbars. "sb" already puts a space there,
-  # so we don't use anything by default.
-  sbstart = "";
-  # text at the end of statusbars. Use space so that it's never
-  # used for anything.
-  sbend = " ";
-
-  topicsbstart = "{sbstart $*}";
-  topicsbend = "{sbend $*}";
-
-  prompt = "[$*] ";
-
-  sb = " %c[%n$*%c]%n";
-  sbmode = "(%c+%n$*)";
-  sbaway = " (%GzZzZ%n)";
-  sbservertag = ":$0 (change with ^X)";
-  sbnickmode = "$0";
-
-  # activity in statusbar
-
-  # ',' separator
-  sb_act_sep = "%c$*";
-  # normal text
-  sb_act_text = "%c$*";
-  # public message
-  sb_act_msg = "%W$*";
-  # hilight
-  sb_act_hilight = "%M$*";
-  # hilight with specified color, $0 = color, $1 = text
-  sb_act_hilight_color = "$0$1-%n";
-};

diff --git a/files/100/firejail.config b/files/100/firejail.config
deleted file mode 100644 (file)
index 678501e..0000000
--- a/files/100/firejail.config
+++ /dev/null
@@ -1,178 +0,0 @@
-# This is Firejail system-wide configuration file. The file contains
-# keyword-argument pairs, one per line. Most features are enabled by default.
-# Use 'yes' or 'no' as configuration values.
-
-# Allow programs to display a tray icon (warning: allows escaping the sandbox;
-# see https://github.com/netblue30/firejail/discussions/4053)
-# allow-tray no
-
-# Enable AppArmor functionality, default enabled.
-# apparmor yes
-
-# Number of ARP probes sent when assigning an IP address for --net option,
-# default 2. This is a partial implementation of RFC 5227. A 0.5 seconds
-# timeout is implemented for each probe. Increase this number to 4 if your
-# local layer 2 network uses RSTP (IEEE 802.1w). Permitted values are
-# between 1 and 30.
-# arp-probes 2
-
-# Enable or disable bind support, default enabled.
-# bind yes
-
-# Allow (DRM) execution in browsers, default disabled.
-browser-allow-drm yes
-
-# Disable U2F in browsers, default enabled.
-# browser-disable-u2f yes
-
-# Enable or disable chroot support, default disabled
-chroot yes
-
-# Enable or disable dbus handling, default enabled.
-# dbus yes
-
-# Disable /mnt, /media, /run/mount and /run/media access. By default access
-# to these directories is enabled. Unlike --disable-mnt profile option this
-# cannot be overridden by --noblacklist or --ignore.
-# disable-mnt no
-
-# Enable or disable file transfer support, default enabled.
-# file-transfer yes
-
-# Enable Firejail green prompt in terminal, default disabled
-# firejail-prompt no
-
-# Force use of nonewprivs.  This mitigates the possibility of
-# a user abusing firejail's features to trick a privileged (suid
-# or file capabilities) process into loading code or configuration
-# that is partially under their control.  Default disabled.
-# force-nonewprivs no
-
-# Allow sandbox joining as a regular user, default enabled.
-# root user can always join sandboxes.
-# join yes
-
-# Timeout when joining a sandbox, default five seconds. It is not
-# possible to join a sandbox while it is still starting up. Wait up
-# to the specified period of time to allow sandbox setup to finish.
-# join-timeout 5
-
-# tracelog enables auditing blacklisted files and directories. A message
-# is sent to syslog in case the file or the directory is accessed.
-# Disabled by default.
-# tracelog no
-
-# Enable or disable sandbox name change, default enabled.
-# name-change yes
-
-# Change default netfilter configuration. When using --netfilter option without
-# a file argument, the default filter is hardcoded (see man 1 firejail). This
-# configuration entry allows the user to change the default by specifying
-# a file containing the filter configuration. The filter file format is the
-# format of iptables-save and iptables-restore commands. Example:
-# netfilter-default /etc/iptables.iptables.rules
-
-# Enable or disable networking features, default enabled.
-network yes
-
-# Enable or disable overlayfs features, default enabled.
-# overlayfs yes
-
-# Hide blacklisted files in /etc directory (enabling this may break
-# /etc/resolv.conf; see #5010), default disabled.
-# etc-hide-blacklisted no
-
-# Set the limit for file copy in several --private-* options. The size is set
-# in megabytes. By default we allow up to 500MB.
-# Note: the files are copied in RAM.
-# file-copy-limit 500
-
-# Enable or disable private-bin feature, default enabled.
-# private-bin yes
-
-# Remove /usr/local directories from private-bin list, default disabled.
-# private-bin-no-local no
-
-# Enable or disable private-cache feature, default enabled
-# private-cache yes
-
-# Enable or disable private-etc feature, default enabled.
-# private-etc yes
-
-# Enable or disable private-home feature, default enabled
-# private-home yes
-
-# Enable or disable private-lib feature, default disabled
-# private-lib no
-
-# Enable or disable private-opt feature, default enabled.
-# private-opt yes
-
-# Enable or disable private-srv feature, default enabled.
-# private-srv yes
-
-# Enable --quiet as default every time the sandbox is started. Default disabled.
-# quiet-by-default no
-
-# Enable or disable restricted network support, default disabled. If enabled,
-# networking features should also be enabled (network yes).
-# Restricted networking grants access to --interface, --net=ethXXX and
-# --netfilter only to root user. Regular users are only allowed --net=none.
-restricted-network no
-
-# Enable or disable seccomp support, default enabled.
-# seccomp yes
-
-# Add rules to the default seccomp filter. Same syntax as for --seccomp=
-# None by default; this is an example.
-# seccomp-filter-add !chroot,kcmp,mincore
-
-# Seccomp error action, kill, log or errno (EPERM, ENOSYS etc)
-# seccomp-error-action EPERM
-
-# If seccomp subsystem in Linux kernel kills a program, a message is posted to syslog.
-# Starting with Linux kernel version 4.14, it is possible to send seccomp violation messages
-# even if the program is allowed to continue (see "seccomp-error-action EPERM" above).
-# This logging feature is disabled by default in our implementation.
-# seccomp-log no
-
-# Enable or disable user namespace support, default enabled.
-# userns yes
-
-# Disable whitelist top level directories, in addition to those
-# that are disabled out of the box. None by default; this is an example.
-# whitelist-disable-topdir /etc,/usr/etc
-
-# Enable or disable X11 sandboxing support, default enabled.
-# x11 yes
-
-# Xephyr command extra parameters. None by default; these are examples.
-# xephyr-extra-params -keybd ephyr,,,xkbmodel=evdev
-# xephyr-extra-params -grayscale
-
-# Screen size for --x11=xephyr, default 800x600. Run /usr/bin/xrandr for
-# a full list of resolutions available on your specific setup.
-# xephyr-screen 640x480
-# xephyr-screen 800x600
-# xephyr-screen 1024x768
-# xephyr-screen 1280x1024
-
-# Firejail window title in Xephyr, default enabled.
-# xephyr-window-title yes
-
-# Enable this option if you have a version of Xpra that supports --attach switch
-# for start command, default disabled.
-# xpra-attach no
-
-# Xpra server command extra parameters. None by default; this is an example.
-# xpra-extra-params --dpi 96
-
-# Screen size for --x11=xvfb, default 800x600x24.  The third dimension is
-# color depth; use 24 unless you know exactly what you're doing.
-# xvfb-screen 640x480x24
-# xvfb-screen 800x600x24
-# xvfb-screen 1024x768x24
-# xvfb-screen 1280x1024x24
-
-# Xvfb command extra parameters.  None by default; this is an example.
-# xvfb-extra-params -pixdepths 8 24 32

diff --git a/files/100/gtk-main.css b/files/100/gtk-main.css
deleted file mode 100644 (file)
index cf86688..0000000
--- a/files/100/gtk-main.css
+++ /dev/null
@@ -1,172 +0,0 @@
-@define-color notes_bg_color #343434;
-@define-color theme_base_color #343434;
-@define-color theme_text_color #eeeeec;
-@define-color theme_bg_color @theme_base_color;
-@define-color theme_fg_color shade (@theme_base_color, 0.3);
-@define-color theme_selected_bg_color shade (@theme_base_color, 0.8);
-@define-color theme_selected_fg_color shade (@theme_base_color, 1.4);
-@define-color insensitive_bg_color shade (@theme_bg_color, 1.1);
-@define-color insensitive_fg_color shade (@theme_fg_color, 1.8);
-
-@define-color borders shade (@theme_base_color, 0.8);
-@define-color frame_color shade (@theme_base_color, 0.7);
-@define-color notebook_active_tab_border shade (@theme_base_color, 1.1);
-@define-color notebook_selected_tab_color shade (@theme_base_color, 0.9);
-
-* {
-       border-width: 0px;
-}
-
-/* window and frame */
-window {
-       /*
-       background-image: linear-gradient(to bottom,
-                                         shade (@theme_base_color, 0.8),
-                                         shade (@theme_base_color, 0.95) 87px);
-                                         */
-}
-
-window frame {
-       padding: 1px 2px 4px 2px;
-       border: 1px solid shade (@theme_base_color, 0.7);
-}
-
-/* icon buttons in window title bar */
-window widget#notes-icon-button {
-       color: #eeeeec;
-       background-color: transparent;
-}
-/*
-window widget#notes-icon-button:active {
-       color: lighter (@theme_fg_color);
-       text-shadow: 1px 1px darker (@theme_bg_color);
-}
-*/
-window widget#notes-icon-button:disabled {
-       color: shade (#343434, 1.2);
-}
-window widget#notes-icon-button:hover {
-       color: shade (#eeeeec, 1.4);
-}
-
-/* notebook */
-notebook > header {
-       background: transparent;
-}
-notebook > header.top {
-       border-bottom: 2px solid @theme_selected_bg_color;
-}
-notebook > header.bottom {
-       border-top: 2px solid @theme_selected_bg_color;
-}
-notebook > header.left {
-       border-right: 2px solid @theme_selected_bg_color;
-}
-notebook > header.right {
-       border-left: 2px solid @theme_selected_bg_color;
-}
-
-/* notebook tab style */
-notebook > header.top tab, notebook > header.bottom tab {
-       padding: 0px 4px;
-}
-notebook > header.right tab, notebook > header.left tab {
-       padding: 4px 0px;
-}
-
-notebook > header tab {
-       box-shadow: none;
-       color: @insensitive_fg_color;
-       background: transparent;
-}
-notebook > header tab:checked {
-       color: shade (@theme_text_color, 0.8);
-}
-notebook > header tab.dnd {
-       background: @theme_selected_bg_color;
-}
-
-notebook > header.top > tabs > tab:checked {
-       box-shadow: inset 0px -3px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
-}
-notebook > header.top > tabs > tab:checked:hover {
-       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color; /* NOTE: must be set before .dnd */
-}
-notebook > header.top > tabs > tab:hover {
-       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.bottom > tabs > tab:checked {
-       box-shadow: inset 0px 3px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
-}
-notebook > header.bottom > tabs > tab:checked:hover {
-       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.bottom > tabs > tab:hover {
-       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.left > tabs > tab:checked {
-       box-shadow: inset -3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-}
-notebook > header.left > tabs > tab:checked:hover {
-       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.left > tabs > tab:hover {
-       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.right > tabs > tab:checked {
-       box-shadow: inset 3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-}
-notebook > header.right > tabs > tab:checked:hover {
-       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.right > tabs > tab:hover {
-       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3);
-}
-
-textview > text {
-       color: @theme_text_color;
-       /*
-       background-image: linear-gradient(to bottom,
-                                         shade (@theme_bg_color, 1.2),
-                                         shade (@theme_bg_color, 1.3) 20em);
-                                        */
-       background-image: url("/usr/share/images/desktop-base/notes-background.jpg");
-       background-position: center;
-       background-repeat: no-repeat;
-       background-size: cover;
-       font-weight: bold;
-}
-
-textview > text > selection {
-       color: #343434;
-       background-color: #eeeeec;
-}
-
-scrollbar {
-       background-color: transparent;
-}
-scrollbar slider {
-       background-color: shade (@theme_bg_color, 0.55);
-       min-width: 8px;
-}
-scrollbar slider:hover {
-       background-color: shade (@theme_bg_color, 0.7);
-       transition: 400ms;
-}
-scrollbar slider:hover:active {
-       background-color: shade (@theme_bg_color, 0.55);
-       transition: 200ms;
-}
-
-tooltip, tooltip * {
-       margin: 0px;
-       padding: 0px;
-}
-

diff --git a/files/100/libreoffice/4/user/autotext/mytexts.bau b/files/100/libreoffice/4/user/autotext/mytexts.bau
deleted file mode 100644 (file)
index 60e2432..0000000
Binary files a/files/100/libreoffice/4/user/autotext/mytexts.bau and /dev/null differ

diff --git a/files/100/libreoffice/4/user/basic/Standard/Module1.xba b/files/100/libreoffice/4/user/basic/Standard/Module1.xba
deleted file mode 100644 (file)
index 3424c16..0000000
--- a/files/100/libreoffice/4/user/basic/Standard/Module1.xba
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">REM  *****  BASIC  *****
-
-Sub Main
-
-End Sub</script:module>
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/basic/Standard/dialog.xlb b/files/100/libreoffice/4/user/basic/Standard/dialog.xlb
deleted file mode 100644 (file)
index 669529d..0000000
--- a/files/100/libreoffice/4/user/basic/Standard/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Standard" library:readonly="false" library:passwordprotected="false"/>

diff --git a/files/100/libreoffice/4/user/basic/Standard/script.xlb b/files/100/libreoffice/4/user/basic/Standard/script.xlb
deleted file mode 100644 (file)
index 67c9503..0000000
--- a/files/100/libreoffice/4/user/basic/Standard/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Standard" library:readonly="false" library:passwordprotected="false">
- <library:element library:name="Module1"/>
-</library:library>

diff --git a/files/100/libreoffice/4/user/basic/dialog.xlc b/files/100/libreoffice/4/user/basic/dialog.xlc
deleted file mode 100644 (file)
index d51f682..0000000
--- a/files/100/libreoffice/4/user/basic/dialog.xlc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
-<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
- <library:library library:name="Standard" xlink:href="$(USER)/basic/Standard/dialog.xlb/" xlink:type="simple" library:link="false"/>
-</library:libraries>
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/basic/script.xlc b/files/100/libreoffice/4/user/basic/script.xlc
deleted file mode 100644 (file)
index e074011..0000000
--- a/files/100/libreoffice/4/user/basic/script.xlc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
-<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
- <library:library library:name="Standard" xlink:href="$(USER)/basic/Standard/script.xlb/" xlink:type="simple" library:link="false"/>
-</library:libraries>
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/config/autotbl.fmt b/files/100/libreoffice/4/user/config/autotbl.fmt
deleted file mode 100644 (file)
index 611ac0d..0000000
Binary files a/files/100/libreoffice/4/user/config/autotbl.fmt and /dev/null differ

diff --git a/files/100/libreoffice/4/user/config/javasettings_Linux_X86_64.xml b/files/100/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
deleted file mode 100644 (file)
index ffc3b7c..0000000
--- a/files/100/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--This is a generated file. Do not alter this file!-->
-<java xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<enabled xsi:nil="true"/>
-<userClassPath xsi:nil="true"/>
-<vmParameters xsi:nil="true"/>
-<jreLocations xsi:nil="true"/>
-<javaInfo xsi:nil="false" vendorUpdate="2019-07-26" autoSelect="true">
-<vendor>Debian</vendor>
-<location>file:///usr/lib/jvm/java-11-openjdk-amd64</location>
-<version>11.0.16</version>
-<features>0</features>
-<requirements>1</requirements>
-<vendorData>660069006C0065003A002F002F002F007500730072002F006C00690062002F006A0076006D002F006A006100760061002D00310031002D006F00700065006E006A0064006B002D0061006D006400360034002F006C00690062002F007300650072007600650072002F006C00690062006A0076006D002E0073006F000A002F007500730072002F006C00690062002F006A0076006D002F006A006100760061002D00310031002D006F00700065006E006A0064006B002D0061006D006400360034002F006C00690062002F0061006D006400360034002F0063006C00690065006E0074003A002F007500730072002F006C00690062002F006A0076006D002F006A006100760061002D00310031002D006F00700065006E006A0064006B002D0061006D006400360034002F006C00690062002F0061006D006400360034002F007300650072007600650072003A002F007500730072002F006C00690062002F006A0076006D002F006A006100760061002D00310031002D006F00700065006E006A0064006B002D0061006D006400360034002F006C00690062002F0061006D006400360034002F006E00610074006900760065005F0074006800720065006100640073003A002F007500730072002F006C00690062002F006A0076006D002F006A006100760061002D00310031002D006F00700065006E006A0064006B002D0061006D006400360034002F006C00690062002F0061006D006400360034000A00</vendorData>
-</javaInfo>
-</java>

diff --git a/files/100/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui b/files/100/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui
deleted file mode 100644 (file)
index 8077f46..0000000
--- a/files/100/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui
+++ /dev/null
@@ -1,17402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface domain="sc">
-  <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
-  <object class="GtkMenu" id="Menu Addons">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="NotebookBarAddonsMenuMergePoint" id="AddonCommands-Menu">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">AddonCommand</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="AddonSection-Separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Data">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataSort">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataSort</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SortAscending">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SortAscending</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-SortDescending">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SortDescending</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterAutoFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterAutoFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterStandardFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterStandardFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterSpecialFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterSpecialFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterRemoveFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterRemoveFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataFilterHideAutoFilter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataFilterHideAutoFilter</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DefineDBName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DefineDBName</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Select">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectDB</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataAreaRefresh">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataAreaRefresh</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-InsertPivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertPivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-RecalcPivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RecalcPivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DeletePivotTable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeletePivotTable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Calculate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Calculate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Validation">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Validation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataSubTotals">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataSubTotals</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataForm">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataForm</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataStreams">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataStreams</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-TableOperationDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TableOperationDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-TextToColumns">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TextToColumns</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-DataConsolidate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DataConsolidate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuData-separator7">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Group">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Group</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-Ungroup">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Ungroup</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-AutoOutline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoOutline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ClearOutline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClearOutline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-HideDetail">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HideDetail</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuData-ShowDetail">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowDetail</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Draw">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ToggleObjectBezierMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleObjectBezierMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltDown">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtrusionTiltDown</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltUp">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtrusionTiltUp</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltLeft">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtrusionTiltLeft</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ExtrusionTiltRight">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtrusionTiltRight</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuDraw-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-RenameObject">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameObject</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuDraw-ObjectTitleDescription">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Field">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuField-InsertCurrentDate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCurrentDate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuField-InsertCurrentTime">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCurrentTime</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuField-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuField-InsertFieldDateVariable">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFieldDateVariable</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuField-InsertFieldSheet">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFieldSheet</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuField-InsertFieldDocTitle">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertFieldDocTitle</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu File">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-AddDirect">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddDirect</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-RecentFileList">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RecentFileList</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-CloseDoc">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CloseDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuFile-separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-Save">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Save</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SaveAs">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveAs</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SaveAsRemote">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveAsRemote</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NewGlobalDoc</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuFile-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-ExportTo">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportTo</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-ExportToPDF">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportToPDF</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-ExportToEPUB">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExportToEPUB</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuFile-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SendMail">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendMail</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendMailDocAsPDF</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendViaBluetooth</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuFile-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintPreview">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrintPreview</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrintDefault</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-PrinterSetup">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PrinterSetup</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuFile-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-Signature">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Signature</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SignPDF">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SignPDF</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetDocumentProperties</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator43">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuFile-Quit">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Quit</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Form">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-Label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Label</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-Edit">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Edit</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-CheckBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CheckBox</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-RadioButton">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RadioButton</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-ListBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ListBox</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-ComboBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ComboBox</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuForm-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-Pushbutton">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Pushbutton</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-Imagebutton">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Imagebutton</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuForm-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-FormattedField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FormattedField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuForm-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-DateField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DateField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-TimeField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TimeField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-NumericField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NumericField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-CurrencyField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CurrencyField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-PatternField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PatternField</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuForm-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-ImageControl">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageControl</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-FileControl">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FileControl</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuForm-separator7">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-Grid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Grid</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuForm-NavigationBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NavigationBar</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Help">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HelpIndex</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExtendedHelp</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-Documentation">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Documentation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:QuestionAnswers</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SendFeedback</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GetInvolved</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-Donation">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowLicense</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHelp-About">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:About</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Home">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-Shadowed">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Shadowed</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-OutlineFont">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OutlineFont</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-Overline">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Overline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHome-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseToUpper">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToUpper</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseToLower">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToLower</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseRotateCase">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseRotateCase</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHome-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseToSentenceCase3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToSentenceCase</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseToTitleCase">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToTitleCase</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-ChangeCaseToToggleCase">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeCaseToToggleCase</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHome-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertNonBreakingSpace">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertNonBreakingSpace</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertHardHyphen">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertHardHyphen</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertSoftHyphen">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSoftHyphen</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertZWSP">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertZWSP</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertZWNBSP">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertZWNBSP</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertLRM">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertLRM</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-InsertRLM">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertRLM</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHome-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-SelectAlld">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectAll</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-SelectRow">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectRow</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-SelectColumn">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectColumn</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-SelectData">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SelectData</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuHome-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-FocusToFindbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">vnd.sun.star.findbar:FocusToFindbar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuHome-SearchDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SearchDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-Crop">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Crop</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-ExternalEdit">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExternalEdit</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-ChangePicture">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangePicture</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-CompressGraphic">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CompressGraphic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-SaveGraphic">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SaveGraphic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator29">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-OriginalSize">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OriginalSize</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-FitCellSize">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FitCellSize</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-TransformDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TransformDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ImageMapDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator139">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-RenameObject">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameObject</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-ObjectTitleDescription">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator39">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-EditShapeHyperlink">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditShapeHyperlink</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-DeleteShapeHyperlink">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteShapeHyperlink</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-OpenHyperlinkOnCursor">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuImage-AssignMacro">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignMacro</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Insert">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-FunctionDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FunctionDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertName</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-Gallery">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Gallery</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-TwainSelect">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TwainSelect</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertAVMedia">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAVMedia</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertObject">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObject</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertSheetFromFile">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertSheetFromFile</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-DrawText">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DrawText</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-VerticalText">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:VerticalText</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-FontworkGalleryFloater">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FontworkGalleryFloater</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertObjectFloatingFrame">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertObjectFloatingFrame</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-HyperlinkDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HyperlinkDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-AddName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddName</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-DefineName">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DefineName</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuInsert-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertCurrentDate">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCurrentDate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-InsertCurrentTime">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCurrentTime</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuInsert-EditHeaderAndFooter">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditHeaderAndFooter</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Media">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-AVMediaPlayer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AVMediaPlayer</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-RenameObject">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RenameObject</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-ObjectTitleDescription">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ObjectTitleDescription</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuMedia-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-EditShapeHyperlink">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditShapeHyperlink</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-DeleteShapeHyperlink">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteShapeHyperlink</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-OpenHyperlinkOnCursor">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenHyperlinkOnCursor</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuMedia-AssignMacro">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AssignMacro</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Page">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-InsertCell">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertCell</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-DeleteCell">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteCell</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuPage-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-DefinePrintArea">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DefinePrintArea</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-AddPrintArea">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AddPrintArea</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-EditPrintArea">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:EditPrintArea</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-DeletePrintArea">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeletePrintArea</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuPage-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-InsertRowBreak">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertRowBreak</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-DeleteRowbreak">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteRowbreak</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-InsertColumnBreak">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertColumnBreak</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-DeleteColumnbreak">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DeleteColumnbreak</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuPage-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPage-PageFormatDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageFormatDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Print">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuPrint-PreviousPage">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PreviousPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPrint-NextPage">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NextPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuPrint-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPrint-PageFormatDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PageFormatDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuPrint-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPrint-Print">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Print</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuPrint-ClosePreview">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClosePreview</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Review">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="SpellDialogD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SpellOnlineD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SpellOnline</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ThesaurusDialogD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ThesaurusDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator23">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="SetLanguageAllTextMenuD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SetLanguageAllTextMenu</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator90">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HyphenateD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Hyphenate</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ChineseConversionD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChineseConversion</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HangulHanjaConversionD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HangulHanjaConversion</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MoreDictionariesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MoreDictionaries</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator73">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="TraceChangeModeD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TraceChangeMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AcceptChangesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AcceptChanges</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator79">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="InsertAnnotationD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InsertAnnotation</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ShowAllNotesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowAllNotes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="HideAllNotesD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:HideAllNotes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator80">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="ProtectD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Protect</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="CompareDocuments">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CompareDocuments</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MergeDocumentsD">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MergeDocuments</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Statistic">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-SamplingDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SamplingDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-DescriptiveStatisticsDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:DescriptiveStatisticsDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-AnalysisOfVarianceDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AnalysisOfVarianceDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-CorrelationDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CorrelationDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-CovarianceDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CovarianceDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-ExponentialSmoothingDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ExponentialSmoothingDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-MovingAverageDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MovingAverageDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-RegressionDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RegressionDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-TTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:TTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-FTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:CovarianceDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-ZTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-ChiSquareTestDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChiSquareTestDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuStatistic-FourierAnalysisDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FourierAnalysisDialog</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu Tools">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroRecorder</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-RunMacro">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RunMacro</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicIDEAppear</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroSignature">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-GoalSeekDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:GoalSeekDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-SolverDialog">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SolverDialog</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ShowPrecedents">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowPrecedents</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ShowDependents">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowDependents</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ClearArrows">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClearArrows</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ClearArrowPrecedents">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClearArrowPrecedents</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ClearArrowDependents">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ClearArrowDependents</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ShowErrors">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowErrors</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-RefreshArrows">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:RefreshArrows</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-AuditingFillMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AuditingFillMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-AutoRefreshArrows">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:AutoRefreshArrows</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ShowInvalid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowInvalid</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewDataSourceBrowser</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuTools-separator6">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="Menu View">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-PagebreakMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:PagebreakMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-NormalViewMode">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:NormalViewMode</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuView-separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-FreezePanes">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FreezePanes</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-SplitWindow">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:SplitWindow</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuView-separator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-Menubar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Menubar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-Sidebar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:Sidebar</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-StatusBarVisible">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:StatusBarVisible</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuView-separator3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-InputLineVisible">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:InputLineVisible</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ViewRowColumnHeaders">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewRowColumnHeaders</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ToggleSheetGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleSheetGrid</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuView-separator4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ViewValueHighlighting">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewValueHighlighting</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ToggleFormula">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ToggleFormula</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ShowGraphics">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ShowGraphics</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="MenuView-separator5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ZoomPage">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomPage</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-ZoomPageWidth">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ZoomPageWidth</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuView-FullScreen">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:FullScreen</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkImage" id="RecentFilesImg1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_recentfilelist.png</property>
-  </object>
-  <object class="GtkImage" id="StatisticsImg">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_statisticsmenu.png</property>
-  </object>
-  <object class="GtkImage" id="changebezierImg">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_changebezier.png</property>
-  </object>
-  <object class="GtkImage" id="paragraphstylei">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_insertfieldctrl.png</property>
-  </object>
-  <object class="GtkGrid" id="NotebookBar">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="sfxlo-NotebookbarTabControl" id="ContextContainer">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="File Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="File">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-New">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="File-AddDirect">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:AddDirect</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-New1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-NewDoc1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NewDoc</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SaveAsTemplate1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SaveAsTemplate</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Open">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator92">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-Open">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Open</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Open1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="svtlo-ManagedMenuButton" id="File-RecentFileList1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="focus_on_click">False</property>
-                                <property name="receives_default">False</property>
-                                <property name="action_name">.uno:RecentFileList</property>
-                                <property name="image">RecentFilesImg1</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-OpenRemote1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:OpenRemote</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Save">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-Save">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Save</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Save1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SaveAs1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SaveAs</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SaveAsRemote1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SaveAsRemote</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Export">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator93">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-ExportTo">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ExportTo</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Export1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-ExportDirectToPDF1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExportDirectToPDF</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-ExportDirectToEPUB1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExportDirectToEPUB</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Print">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-Print">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Print</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Print1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-PrintDefault1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PrintDefault</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-PrintPreview1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PrintPreview</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Property">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator91">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-SetDocumentProperties">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SetDocumentProperties</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="File-Section-Property1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-Signature1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Signature</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="File-SignPDF1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SignPDF</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="File-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom80">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-CloseDoc">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:CloseDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="File-HelpIndex">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:HelpIndex</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="GroupB7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="File-FileButton:Menu File">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|FileMenuButton">_File</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="resize_mode">immediate</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="File-HelpButton:Menu Help">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|HelpMenuButton">_Help</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="resize_mode">immediate</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="FileLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|FileLabel">~File</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Home Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Home">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Clipboard">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom87">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Home-Paste">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Paste</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-Cut">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Cut</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-Copy">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Copy</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Style">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator70">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-FormatPaintbrush">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatPaintbrush</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-ResetAttributes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ResetAttributes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="Home-Section-Format">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="VclOptionalBox" id="FileSection8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkBox" id="box76">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="font1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="hexpand">True</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-CharFontName">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="action_name">.uno:CharFontName</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="fontheight1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="margin_left">5</property>
-                                        <property name="margin_right">5</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-FontHeight">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:FontHeight</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Grow">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Grow</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Shrink">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Shrink</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="GroupB11">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="ExtTop4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Bold">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Bold</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Italic">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Italic</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Underline">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Underline</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-Strikeout">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Strikeout</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSeparator" id="separator67">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">end</property>
-                                        <property name="margin_top">5</property>
-                                        <property name="margin_bottom">5</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="orientation">vertical</property>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="ExtTop5">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="halign">end</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-SubScript">
-                                            <property name="visible">False</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:SubScript</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolButton" id="Home-SuperScript">
-                                            <property name="visible">False</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:SuperScript</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSeparator" id="separator78">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">end</property>
-                                        <property name="margin_top">5</property>
-                                        <property name="margin_bottom">5</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="orientation">vertical</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="padding">5</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="sfxlo-NotebookbarToolBox" id="ExtTop2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="toolbar_style">icons</property>
-                                        <property name="show_arrow">False</property>
-                                        <child>
-                                          <object class="GtkMenuToolButton" id="Home-SetBorderStyle">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
-                                            <property name="halign">start</property>
-                                            <property name="action_name">.uno:SetBorderStyle</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuToolButton" id="Home-BackgroundColor">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:BackgroundColor</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkMenuToolButton" id="Home-FontColor">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="action_name">.uno:Color</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="homogeneous">False</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">4</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Align">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator102">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignTop">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignTop</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignVCenter">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignVCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignBottom">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignBottom</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignHorizontalCenter">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignHorizontalCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Align1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB76">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB80">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="GtkSeparator" id="separator74">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first16">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-Spacing">
-                                        <property name="can_focus">False</property>
-                                        <property name="is_important">True</property>
-                                        <property name="action_name">.uno:Spacing</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-IncrementIndent">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|increaseindent1|tooltip_text">Increase Indent</property>
-                                        <property name="is_important">True</property>
-                                        <property name="action_name">.uno:IncrementIndent</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-DecrementIndent">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|decreaseindent1|tooltip_text">Decrease Indent</property>
-                                        <property name="is_important">True</property>
-                                        <property name="action_name">.uno:DecrementIndent</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB85">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second12">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-AlignBlock">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignBlock</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator77">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second14">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-WrapText">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:WrapText</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Number">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator30">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB18">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom36">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NumberFormatType">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:NumberFormatType</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Home-NumberFormatCurrency">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:NumberFormatCurrency</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NumberFormatPercent">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:NumberFormatPercent</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NumberFormatDecimal">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:NumberFormatDecimal</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator27">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NumberFormatIncDecimals">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:NumberFormatIncDecimals</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NumberFormatDecDecimals">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:NumberFormatDecDecimals</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Cell">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator53">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom35">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Home-MergeCells">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ToggleMergeCells</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Cell1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB20">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-InsertRowsBefore">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertRowsBefore</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-DeleteRows">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DeleteRows</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Home-RowOperations">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:RowOperations</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-InsertColumnsBefore">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertColumnsBefore</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-DeleteColumns">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DeleteColumns</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Home-ColumnOperations">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ColumnOperations</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Style2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator25">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="GroupB19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-DesignerDialog">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:DesignerDialog</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom101">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-StyleApply">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="action_name">.uno:StyleApply</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="VclOptionalBox" id="StyleParagraphSection1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom102">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-StandardStyle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Default&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_defaultcharstyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator106">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom93">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-H1Style">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_heading1parastyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-H2Style">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_heading2parastyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparator" id="separator24">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">end</property>
-                                    <property name="margin_top">5</property>
-                                    <property name="margin_bottom">5</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="orientation">vertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">5</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-GoodStyle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Good&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_goodcellstyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-NeutralStyle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Neutral&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_neutralcellstyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Home-BadStyle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:StyleApply?Style:string=Bad&amp;FamilyName:string=CellStyles</property>
-                                        <property name="icon_name">cmd/sc_badcellstyle.png</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">6</property>
-                                  </packing>
-                                </child>
-                                <style>
-                                  <class name="priority-3"/>
-                                </style>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Condition">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom37">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Home-ConditionalFormatMenu">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ConditionalFormatMenu</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Find">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator72">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom26">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="SearchDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SearchDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Home-Section-Find1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB47">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-SortAscending2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:DataSort</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-DataFilterAutoFilter2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:DataFilterAutoFilter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Home-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="PasteBox1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Home-HomeButton:Menu Home">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|HomeMenuButton">_Home</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Home-SearchDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SearchDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Home-SortAscending">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:SortAscending</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Home-DataFilterAutoFilter">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:DataFilterAutoFilter</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator26">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="HomeLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|HomeLabel">~Home</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-default"/>
-                  <class name="context-any"/>
-                  <class name="context-Text"/>
-                  <class name="context-DrawText"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Insert Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Insert">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Function">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom70">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-DataDataPilotRun">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin_left">5</property>
-                                <property name="action_name">.uno:DataDataPilotRun</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Function1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB77">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Insert">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Insert</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB21">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertCell">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertCell</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Chart">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-InsertObjectChart">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:InsertObjectChart</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Chart1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB72">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-FunctionBox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FunctionBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertObject1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertObject</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator36">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom65">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-InsertGraphic">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:InsertGraphic</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Image1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB23">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Gallery">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Gallery</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertAVMedia">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertAVMedia</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Reference">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-HyperlinkDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:HyperlinkDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Reference1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB29">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-AddName">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AddName</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-DefineName">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DefineName</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Field">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Insert-FieldButton:Menu Field">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|FieldMenuButton">Fiel_d</property>
-                            <property name="width_request">70</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:DesignerDialog</property>
-                            <property name="image">paragraphstylei</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-DrawText">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator33">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom97">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-DrawText">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DrawText</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-VerticalText">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:VerticalText</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Draw">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Line1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Line</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Polygon_Unfilled1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Polygon_Unfilled</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-Bezier_Unfilled1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Bezier_Unfilled</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-ArrowsToolbox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ArrowsToolbox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes.rectangle1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BasicShapes.rectangle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes.ellipse1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BasicShapes.ellipse</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-DrawCaption1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DrawCaption</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-LineToolbox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LineToolbox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Draw2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator95">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB71">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-BasicShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BasicShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-SymbolShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SymbolShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-ArrowShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ArrowShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="shapes8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-StarShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:StarShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Inser-CalloutShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CalloutShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-FlowChartShapes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlowChartShapes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Symbol">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator35">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom105">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-InsertSymbol">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:CharmapControl</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Insert-Section-Symbol1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB27">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-InsertObjectStarMath">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InsertObjectStarMath</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Insert-EmojiControl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:EmojiControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Insert-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB26">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Insert-InsertButton:Menu Insert">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|InsertMenuButton">_Insert</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom32">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-DataDataPilotRun1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DataDataPilotRun</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-InsertDraw">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:InsertDraw</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Insert-FunctionBox1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FunctionBox</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="InsertLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|InsertLabel">~Insert</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Layout Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="vexpand">True</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Layout">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-File">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom74">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="PageFormatDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:PageFormatDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-File1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom73">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-EditHeaderAndFooter">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:EditHeaderAndFooter</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-File2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB30">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-NormalViewMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:NormalViewMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-PagebreakMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PagebreakMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-10"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Print">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator111">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom19">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-DefinePrintArea">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:DefinePrintArea</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Print1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB31">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-EditPrintArea">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:EditPrintArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-AddPrintArea">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:AddPrintArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-DeletePrintArea">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:DeletePrintArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-InsertCell">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom33">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-Insert">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Insert</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-RowColumnOperations">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB83">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Layout-RowOperations">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:RowOperations</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Layout-ColumnOperations">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:ColumnOperations</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-RenameTable">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator50">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom86">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-RenameTable">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:RenameTable</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-ShowHide">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB84">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-Show">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Show</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-Hide">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Hide</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Style">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator31">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-AutoFormat">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:AutoFormat</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Style1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-ChooseDesign">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ChooseDesign</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-TableEvents">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:TableEvents</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Group">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator98">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-SelectObject">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SelectObject</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-FormatGroup">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatGroup</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Align">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB79">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Wrap8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Layout-ObjectAlign">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="tooltip_text" translatable="yes" context="CalcNotebookbar|objectalign|tooltip_text">Object Align</property>
-                                    <property name="halign">start</property>
-                                    <property name="action_name">.uno:ObjectAlign</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB81">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="OneStep3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Layout-Section-Arrange1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB82">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="OneStep2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-ObjectForwardOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectForwardOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="BackgroundFront2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Layout-ObjectBackOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectBackOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Layout-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB28">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Layout-LayoutButton:Menu Page">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|LayoutMenuButton">_Layout</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Layout-PageFormatDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:PageFormatDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator12">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="LayoutLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|PageLayoutLabel">~Layout</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Data Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Data">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Source">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom18">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-InsertExternalDataSource">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:InsertExternalDataSource</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Source1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom95">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-DataStreams1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DataStreams</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Source2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB52">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataProvider">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataProvider</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-ManageXMLSource">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ManageXMLSource</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-15"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Calculate">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator37">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-Calculate">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Calculate</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Calculate1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB49">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-RecalcPivotTable">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:RecalcPivotTable</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataProviderRefresh">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataProviderRefresh</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-13"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Sort">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator18">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-DataSort">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DataSort</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Sort1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB39">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-SortAscending">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SortAscending</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-SortDescending">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SortDescending</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-11"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Filter">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator19">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-DataFilterAutoFilter">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DataFilterAutoFilter</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Filter1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB45">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataFilterStandardFilter">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataFilterStandardFilter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataFilterHideAutoFilter">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataFilterHideAutoFilter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Group">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom25">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-DataSubTotals">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DataSubTotals</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Group1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB54">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-Group">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Group</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-Ungroup">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Ungroup</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Group2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB92">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-HideDetail">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:HideDetail</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-ShowDetail">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowDetail</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Define">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom9">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-DefineDBName">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:DefineDBName</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Define1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB56">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-SelectDB">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SelectDB</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataAreaRefresh">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataAreaRefresh</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-TextToColumn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom29">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-TextToColumns">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:TextToColumns</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">14</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-TextToColumn1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB65">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-DataConsolidate">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DataConsolidate</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Data-Validation">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Validation</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">15</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Data-Section-Statistic">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator41">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Data-StatisticsMenu:Menu Statistic">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|StatisticsMenuButton">_Statistics</property>
-                            <property name="width_request">80</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:StatisticsMenu</property>
-                            <property name="image">StatisticsImg</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">16</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Data-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="ViewMenu3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Data-DataButton:Menu Data">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|DataMenuButton">_Data</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Data-SearchDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SearchDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="SortAscending">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:SortAscending</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="DataFilterAutoFilter">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:DataFilterAutoFilter</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator38">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="DataLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|DataLabel">~Data</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Review Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Review">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Language">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom67">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-SpellDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SpellDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Review-ThesaurusDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ThesaurusDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Language1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB40">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-SpellOnline">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SpellOnline</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-Hyphenate">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Hyphenate</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator109">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-InsertAnnotation">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:InsertAnnotation</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Review-EditAnnotation">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:EditAnnotation</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB32">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-ShowAllNotes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowAllNotes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-HideAllNotes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:HideAllNotes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Annotation2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB43">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-DeleteAllNotes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DeleteAllNotes</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-DeleteNote">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DeleteNote</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-TrackChanges">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator112">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom72">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-TraceChangeMode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:TraceChangeMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-TrackChanges1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom88">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-AcceptChanges">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:AcceptChanges</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Document">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom82">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-Protect">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Protect</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Document1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB38">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-ToolProtectionDocument">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToolProtectionDocument</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-ShareDocument">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShareDocument</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-Document2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB86">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-CompareDocuments">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CompareDocuments</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Review-MergeDocuments">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:MergeDocuments</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-RedactDoc">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator75">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom75">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-RedactDoc">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:RedactDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Review-Section-EditDoc">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator52">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom94">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Review-EditDoc">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:EditDoc</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Reference-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB37">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Review-ReviewButton:Menu Review">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ReviewMenuButton">_Review</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="AcceptChanges">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:AcceptChanges</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator96">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="ReviewLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|ReviewLabel">~Review</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="View Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="View">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-View">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-NormalViewMode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:NormalViewMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-View1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom78">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-PagebreakMode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:PagebreakMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-View2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom103">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-PrintPreview">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:PrintPreview</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-View3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB61">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ViewValueHighlighting">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ViewValueHighlighting</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ToggleFormula">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleFormula</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator120">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom24">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-ZoomOptimal">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ZoomOptimal</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB51">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-Zoom100Percent">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Zoom100Percent</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB29">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ZoomPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Zoom2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB50">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA26">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-FullScreen">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FullScreen</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ZoomPageWidth">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ZoomPageWidth</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Split">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator22">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom23">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-FreezePanes">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FreezePanes</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Split1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB36">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-SplitWindow">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SplitWindow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="GroupB35">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="belowspacing2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="View-FreezePanesFirstColumn">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:FreezePanesFirstColumn</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="toolbar_style">both-horiz</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="View-FreezePanesFirstRow">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:FreezePanesFirstRow</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom22">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-Sidebar">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Sidebar</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB48">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ViewRowColumnHeaders">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ViewRowColumnHeaders</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-ToggleSheetGrid">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleSheetGrid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-Visible2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB55">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-Menubar">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Menubar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="View-InputLineVisible">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:InputLineVisible</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="View-Section-New">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator40">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom38">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-NewWindow">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:NewWindow</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="View-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="ViewMenu2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="View-ViewButton:Menu View">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ViewMenuButton">_View</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom20">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="View-Zoom">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:Zoom</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator32">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="ViewLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|ViewLabel">~View</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Image Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-Crop">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Image-AssignMacro">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AssignMacro</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-Crop1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="SecondGroup">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first11">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-CompressGraphic">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:CompressGraphic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">both-horiz</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-Crop">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:Crop</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Draw-XLineStyle1">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineWidth1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom39">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineEndStyle4">
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-XLineColor1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:XLineColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom127">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillStyle4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box22">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-LineEndStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LineEndStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom77">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillShadow1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-Anchor">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom62">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Image-AnchorMenu">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnchorMenu</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignUp">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignMiddle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignDown">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator123">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="grid1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-ObjectForwardOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectForwardOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Image-ObjectBackOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectBackOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-FormatImageFilter">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="Image-Section-InsertCaptionDialog-Separator2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="GraphicFilterToolboxGroup">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:GraphicFilterToolbox</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-ColorSettings1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB87">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafLuminance">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafLuminance</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafTransparence">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafTransparence</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="padding">5</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Image-Section-ColorSettings2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB90">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafContrast">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafContrast</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-SidebarToolBox" id="colorbox6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Image-GrafGamma">
-                                    <property name="width_request">130</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="action_name">.uno:GrafGamma</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Image-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB67">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Image-GraphicButton:Menu Image">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ImageMenuButton">Ima_ge</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom83">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Image-SaveGraphic">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:SaveGraphic</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Image-FormatArea">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:FormatArea</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Image-FormatLine">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:FormatLine</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Image-TransformDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:TransformDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="ImageLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|ImageLabel">Ima~ge</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Graphic"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">7</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Draw Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Draw">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Edit">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-AssignMacro">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AssignMacro</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB69">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom43">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ToggleObjectBezierMode1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleObjectBezierMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom44">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator68">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box6">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Draw-XLineStyle2">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineWidth">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom45">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-LineEndStyle3">
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Draw-XLineColor">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:XLineColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom50">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillStyle2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-LineEndStyle2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LineEndStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom46">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FillShadow">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator58">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom49">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Image-AnchorMenu1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnchorMenu</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-ObjectAlign1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignLeft1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignCenter1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-ObjectAlignRight1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignUp1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignMiddle1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Image-AlignDown1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="grid2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ObjectForwardOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectForwardOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ObjectBackOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectBackOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Group">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator132">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom51">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FormatGroup">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FormatGroup</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Group1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB70">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom52">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-EnterGroup">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:EnterGroup</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom53">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-LeaveGroup">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LeaveGroup</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-3D">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator48">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB73">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first38">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionToggle">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExtrusionToggle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second39">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionDepthFloater">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExtrusionDepthFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-ExtrusionDirectionFloater">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExtrusionDirectionFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Draw-Extrusion3DColor">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Extrusion3DColor</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkMenuToolButton" id="Draw-ExtrusionSurfaceFloater">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ExtrusionSurfaceFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Fontwork">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator46">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom98">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FontworkGalleryFloater">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FontworkGalleryFloater</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Draw-Section-Fontwork1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB68">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom108">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkShapeType">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FontworkShapeType</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkSameLetterHeights">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FontworkSameLetterHeights</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom116">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkAlignmentFloater">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FontworkAlignmentFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FontworkCharacterSpacingFloater">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FontworkCharacterSpacingFloater</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Draw-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB74">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Draw-DrawButton:Menu Draw">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|DrawMenuButton">_Draw</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom48">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FormatArea">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatArea</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-FormatLine">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatLine</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Draw-TransformDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:TransformDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator71">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="DrawLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|DrawLabel">~Draw</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Draw"/>
-                  <class name="context-DrawLine"/>
-                  <class name="context-3DObject"/>
-                  <class name="context-MultiObject"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Object Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Object">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-Edit">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="Big2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Object-AssignMacro">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AssignMacro</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB60">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom42">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-OriginalSize">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:OriginalSize</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom47">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FlipVertical">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipVertical</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FlipHorizontal">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FlipHorizontal</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator56">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatLine3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatLine</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="third4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">text</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Draw-FormatArea3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormatArea</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box30">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox" id="box31">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="first4">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkMenuToolButton" id="Object-XLineStyle5">
-                                        <property name="width_request">100</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="valign">center</property>
-                                        <property name="action_name">.uno:XLineStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="ObjectLineWidth2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineWidth</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="SectionBottom54">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-LineEndStyle5">
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:LineEndStyle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-XLineColor4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:XLineColor</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom55">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FillStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-FormatLineArea2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-LineEndStyle1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LineEndStyle</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom136">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-FillShadow1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FillShadow</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator60">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Object-ConvertButton:Menu Convert">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ConvertMenuButton">Convert</property>
-                            <property name="width_request">70</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="action_name">.uno:ChangeBezier</property>
-                            <property name="image">changebezierImg</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                            <property name="image_position">top</property>
-                            <property name="always_show_image">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignLeft">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignCenter">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignRight">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignUp">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignDown">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignMiddle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Object-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator82">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="grid3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-BringToFront">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-SendToBack">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-ObjectForwardOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectForwardOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-ObjectBackOne">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectBackOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Object-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB78">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Object-DrawMenu:Menu Draw">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ObjectMenuButton">_Object</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom58">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Object-FormatArea">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatArea</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Object-FormatLine">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatLine</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Object-TransformDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:TransformDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator114">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">9</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="ObjectLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|FrameLabel">~Object</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Frame"/>
-                  <class name="context-OLE"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">9</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Media Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Media">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-Edit">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom27">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Media-AssignMacro">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AssignMacro</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB24">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom28">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-AVMediaPlayer">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AVMediaPlayer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom31">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-ToggleObjectRotateMode">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ToggleObjectRotateMode</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-Anchor">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator28">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom56">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkMenuToolButton" id="Object-Anchor2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="action_name">.uno:AnchorMenu</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-ObjectAlign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator34">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkBox" id="AlignGroup2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignLeft2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignLeft</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignCenter2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignCenter</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-ObjectAlignRight2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ObjectAlignRight</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="Align6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignUp2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignUp</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignMiddle2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignMiddle</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="Object-AlignDown2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:AlignDown</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator61">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkGrid" id="grid4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first12">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-BringToFront2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BringToFront</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-SendToBack2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:SendToBack</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-ObjectForwardOne2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectForwardOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="Second3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Object-ObjectBackOne2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ObjectBackOne</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Media-Section-AVMediaToolBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator63">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom132">
-                                <property name="width_request">148</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-AVMediaToolBox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AVMediaToolBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom71">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Media-AVMediaPlayer1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AVMediaPlayer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Media-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB53">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="media:Menu Media">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|MediaMenuButton">_Media</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom30">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">icons</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Media-FormatArea">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatArea</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Media-FormatLine">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:FormatLine</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkToolButton" id="Media-TransformDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="action_name">.uno:TransformDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator42">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">10</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="MediaLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|MediaLabel">~Media</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Media"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">10</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Print Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Print">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Print-Section-ShowPageGroup">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="first28">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="resize_mode">immediate</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Print-PageFormatDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:PageFormatDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="box19">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="resize_mode">immediate</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-Margins">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Margins</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="second11">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="resize_mode">immediate</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-EditHeaderAndFooter">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:EditHeaderAndFooter</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Print-Section-Arrange">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="box21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="first29">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="resize_mode">immediate</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-FirstPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FirstPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-PreviousPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PreviousPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-NextPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NextPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Print-LastPage">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:LastPage</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second13">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="resize_mode">immediate</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Print-ZoomOut">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ZoomOut</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="sfxlo-NotebookbarToolBox" id="second10">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="resize_mode">immediate</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="show_arrow">False</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="Print-ZoomIn">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="action_name">.uno:ZoomIn</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator76">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Print-Section-Print">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="first26">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="resize_mode">immediate</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Print-Print">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:Print</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="first22">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="resize_mode">immediate</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Print-ClosePreview1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:ClosePreview</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Print-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="GroupB33">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="print:Menu Print">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|PrintMenuButton">_Print</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom79">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Print-FullScreen">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FullScreen</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator45">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">11</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="PrintLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|PrintLabel">~Print</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Printpreview"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">11</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Form Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Form">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom89">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Form-SwitchControlDesignMode1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SwitchControlDesignMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-UseWizards">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:UseWizards</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing10">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-GroupBox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:GroupBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator47">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB59">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom114">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-FormProperties">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom115">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ShowFmExplorer">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowFmExplorer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB25">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom118">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-TabDialog1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:TabDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom119">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-OpenReadOnly1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:OpenReadOnly</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator49">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB34">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom128">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ControlProperties2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ControlProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom129">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-AutoControlFocus2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AutoControlFocus</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator51">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB64">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom85">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Label1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Label</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Edit1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Edit</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CheckBox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CheckBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom90">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-RadioButton2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:RadioButton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ListBox2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ListBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ComboBox2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ComboBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator64">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB96">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom91">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NumericField2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NumericField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CurrencyField2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CurrencyField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-PatternField2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PatternField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom92">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormattedField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormattedField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-DateField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DateField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TimeField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:TimeField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Form-Section-Form7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator65">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB75">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom112">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Pushbutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Pushbutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Imagebutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Imagebutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-ImageControl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ImageControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom113">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-FileControl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FileControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-NavigationBar">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NavigationBar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Form-Grid">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Grid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Form-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="Form-Section">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Form-FormButton:Menu Form">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|FormMenuButton">Fo_rm</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom34">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="FormMenu-FormProperties">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:FormProperties</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator44">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">12</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="FormLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|FormLabel">Fo~rm</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="context-Form"/>
-                </style>
-              </object>
-              <packing>
-                <property name="position">12</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Extension Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Extension">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="NotebookBarAddonsToolMergePoint" id="AddonCommand">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Extension-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="Extension-Section">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Extension-ExtensionButton:Menu Addons">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ExtensionMenuButton">E_xtension</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom40">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator20">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">14</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="ExtensionLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|ExtensionLabel">E~xtension</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">14</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-PriorityHBox" id="Tools Tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="sfxlo-PriorityMergedHBox" id="Tools">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Macro">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom41">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-RunMacro">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:RunMacro</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Macro1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB42">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA25">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-BasicIDEAppear">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:BasicIDEAppear</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB26">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-MacroDialog">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:MacroDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-9"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Trace">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator66">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom57">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-AuditingFillMode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:AuditingFillMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Trace1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB44">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowPrecedents">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowPrecedents</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowDependents">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowDependents</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Trace2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB58">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ClearArrowPrecedents">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ClearArrowPrecedents</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ClearArrowDependents">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ClearArrowDependents</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-8"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Formular1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator69">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom60">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-GoalSeekDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:GoalSeekDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Formular2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom84">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-SolverDialog">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SolverDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-7"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Formular3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB62">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineA18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowErrors">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowErrors</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LineB17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowInvalid">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowInvalid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-6"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator141">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom96">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar_style">both</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-SwitchControlDesignMode">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:SwitchControlDesignMode</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkBox" id="GroupB41">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="LeftParaMargin7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-UseWizards1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:UseWizards</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="belowspacing7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="vexpand">True</property>
-                                <property name="toolbar_style">both-horiz</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-GroupBox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:GroupBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-5"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator142">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB88">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom99">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Label">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Label</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Edit">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Edit</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CheckBox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CheckBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom61">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-RadioButton1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:RadioButton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ListBox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ListBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ComboBox1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ComboBox</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-4"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator54">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB63">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom63">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NumericField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NumericField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-CurrencyField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:CurrencyField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-PatternField1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:PatternField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom100">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormattedField">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormattedField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-DateField">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:DateField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TimeField">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:TimeField</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-3"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator144">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB89">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom64">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Pushbutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Pushbutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Imagebutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Imagebutton</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ImageControl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ImageControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom68">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FileControl">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FileControl</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-NavigationBar">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:NavigationBar</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-Grid">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:Grid</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-2"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="VclOptionalBox" id="Tools-Section-Form5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkSeparator" id="separator55">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">5</property>
-                            <property name="orientation">vertical</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="padding">5</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB91">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom106">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-FormProperties">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:FormProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-TabDialog">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:TabDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ControlProperties">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ControlProperties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom107">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-ShowFmExplorer1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:ShowFmExplorer</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-OpenReadOnly">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:OpenReadOnly</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkToolButton" id="Tools-AutoControlFocus">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="action_name">.uno:AutoControlFocus</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="priority-1"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">13</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-DropdownBox" id="Tools-Menu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkBox" id="ViewMenu1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="vexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="svtlo-ManagedMenuButton" id="Tools-ToolsButton:Menu Tools">
-                            <property name="label" translatable="yes" context="CalcNotebookbar|ToolsMenuButton">_Tools</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="relief">none</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="SectionBottom76">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                            <property name="toolbar_style">both-horiz</property>
-                            <property name="show_arrow">False</property>
-                            <property name="icon_size">1</property>
-                            <child>
-                              <object class="GtkToolButton" id="Tools-ShowFmExplorer">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="action_name">.uno:OptionsTreeDialog</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="separator62">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="padding">5</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">13</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="DevLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="CalcNotebookbar|ToolsLabel">~Tools</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="position">13</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-      </packing>
-    </child>
-  </object>
-</interface>

diff --git a/files/100/libreoffice/4/user/database/biblio.odb b/files/100/libreoffice/4/user/database/biblio.odb
deleted file mode 100644 (file)
index 199fd6f..0000000
Binary files a/files/100/libreoffice/4/user/database/biblio.odb and /dev/null differ

diff --git a/files/100/libreoffice/4/user/database/biblio/biblio.dbf b/files/100/libreoffice/4/user/database/biblio/biblio.dbf
deleted file mode 100644 (file)
index 4161cea..0000000
Binary files a/files/100/libreoffice/4/user/database/biblio/biblio.dbf and /dev/null differ

diff --git a/files/100/libreoffice/4/user/database/biblio/biblio.dbt b/files/100/libreoffice/4/user/database/biblio/biblio.dbt
deleted file mode 100644 (file)
index e17daea..0000000
Binary files a/files/100/libreoffice/4/user/database/biblio/biblio.dbt and /dev/null differ

diff --git a/files/100/libreoffice/4/user/extensions/buildid b/files/100/libreoffice/4/user/extensions/buildid
deleted file mode 100644 (file)
index 62666df..0000000
--- a/files/100/libreoffice/4/user/extensions/buildid
+++ /dev/null
@@ -1 +0,0 @@
-00(Build:2)
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/extensions/bundled/extensions.pmap b/files/100/libreoffice/4/user/extensions/bundled/extensions.pmap
deleted file mode 100644 (file)
index 18bfdd6..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/extensions.pmap
+++ /dev/null
@@ -1 +0,0 @@
-Pmp1

diff --git a/files/100/libreoffice/4/user/extensions/bundled/lastsynchronized b/files/100/libreoffice/4/user/extensions/bundled/lastsynchronized
deleted file mode 100644 (file)
index 56a6051..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/lastsynchronized
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 1a59716..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<ext:extension-backend-db xmlns:ext="http://openoffice.org/extensionmanager/extension-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 8561d16..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<comp:component-backend-db xmlns:comp="http://openoffice.org/extensionmanager/component-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
deleted file mode 100644 (file)
index ea8b1a9..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+++ /dev/null
@@ -1 +0,0 @@
-ORIGIN=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index fb4de4d..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<conf:configuration-backend-db xmlns:conf="http://openoffice.org/extensionmanager/configuration-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 496c8c8..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<help:help-backend-db xmlns:help="http://openoffice.org/extensionmanager/help-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 2a96fce..0000000
--- a/files/100/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<script:script-backend-db xmlns:script="http://openoffice.org/extensionmanager/script-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/shared/lastsynchronized b/files/100/libreoffice/4/user/extensions/shared/lastsynchronized
deleted file mode 100644 (file)
index 56a6051..0000000
--- a/files/100/libreoffice/4/user/extensions/shared/lastsynchronized
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

diff --git a/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index fb4de4d..0000000
--- a/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<conf:configuration-backend-db xmlns:conf="http://openoffice.org/extensionmanager/configuration-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 496c8c8..0000000
--- a/files/100/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<help:help-backend-db xmlns:help="http://openoffice.org/extensionmanager/help-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/tmp/extensions.pmap b/files/100/libreoffice/4/user/extensions/tmp/extensions.pmap
deleted file mode 100644 (file)
index 18bfdd6..0000000
--- a/files/100/libreoffice/4/user/extensions/tmp/extensions.pmap
+++ /dev/null
@@ -1 +0,0 @@
-Pmp1

diff --git a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 1a59716..0000000
--- a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<ext:extension-backend-db xmlns:ext="http://openoffice.org/extensionmanager/extension-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index fb4de4d..0000000
--- a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<conf:configuration-backend-db xmlns:conf="http://openoffice.org/extensionmanager/configuration-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 496c8c8..0000000
--- a/files/100/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<help:help-backend-db xmlns:help="http://openoffice.org/extensionmanager/help-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/gallery/sg30.sdv b/files/100/libreoffice/4/user/gallery/sg30.sdv
deleted file mode 100644 (file)
index fc17dd9..0000000
Binary files a/files/100/libreoffice/4/user/gallery/sg30.sdv and /dev/null differ

diff --git a/files/100/libreoffice/4/user/gallery/sg30.thm b/files/100/libreoffice/4/user/gallery/sg30.thm
deleted file mode 100644 (file)
index 9bf97d6..0000000
Binary files a/files/100/libreoffice/4/user/gallery/sg30.thm and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/ExtensionInfo.pack b/files/100/libreoffice/4/user/pack/ExtensionInfo.pack
deleted file mode 100644 (file)
index a50426f..0000000
Binary files a/files/100/libreoffice/4/user/pack/ExtensionInfo.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/autotext/mytexts.pack b/files/100/libreoffice/4/user/pack/autotext/mytexts.pack
deleted file mode 100644 (file)
index e7a497a..0000000
Binary files a/files/100/libreoffice/4/user/pack/autotext/mytexts.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/basic/Standard/Module1.pack b/files/100/libreoffice/4/user/pack/basic/Standard/Module1.pack
deleted file mode 100644 (file)
index d7944bf..0000000
Binary files a/files/100/libreoffice/4/user/pack/basic/Standard/Module1.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/basic/Standard/dialog.pack b/files/100/libreoffice/4/user/pack/basic/Standard/dialog.pack
deleted file mode 100644 (file)
index db56d38..0000000
Binary files a/files/100/libreoffice/4/user/pack/basic/Standard/dialog.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/basic/Standard/script.pack b/files/100/libreoffice/4/user/pack/basic/Standard/script.pack
deleted file mode 100644 (file)
index 763901c..0000000
Binary files a/files/100/libreoffice/4/user/pack/basic/Standard/script.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/basic/dialog.pack b/files/100/libreoffice/4/user/pack/basic/dialog.pack
deleted file mode 100644 (file)
index 31dc3ae..0000000
Binary files a/files/100/libreoffice/4/user/pack/basic/dialog.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/basic/script.pack b/files/100/libreoffice/4/user/pack/basic/script.pack
deleted file mode 100644 (file)
index 354ef1d..0000000
Binary files a/files/100/libreoffice/4/user/pack/basic/script.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/config/autotbl.pack b/files/100/libreoffice/4/user/pack/config/autotbl.pack
deleted file mode 100644 (file)
index c0060a0..0000000
Binary files a/files/100/libreoffice/4/user/pack/config/autotbl.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack b/files/100/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack
deleted file mode 100644 (file)
index e8ba34a..0000000
Binary files a/files/100/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack b/files/100/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack
deleted file mode 100644 (file)
index 00ef996..0000000
Binary files a/files/100/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/database/biblio.pack b/files/100/libreoffice/4/user/pack/database/biblio.pack
deleted file mode 100644 (file)
index 3c388da..0000000
Binary files a/files/100/libreoffice/4/user/pack/database/biblio.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/database/biblio/biblio.pack b/files/100/libreoffice/4/user/pack/database/biblio/biblio.pack
deleted file mode 100644 (file)
index 19a8f5f..0000000
Binary files a/files/100/libreoffice/4/user/pack/database/biblio/biblio.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/pack/registrymodifications.pack b/files/100/libreoffice/4/user/pack/registrymodifications.pack
deleted file mode 100644 (file)
index 7c96ed6..0000000
Binary files a/files/100/libreoffice/4/user/pack/registrymodifications.pack and /dev/null differ

diff --git a/files/100/libreoffice/4/user/registrymodifications.xcu b/files/100/libreoffice/4/user/registrymodifications.xcu
deleted file mode 100644 (file)
index 08664c1..0000000
--- a/files/100/libreoffice/4/user/registrymodifications.xcu
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<item oor:path="/org.openoffice.Office.Canvas"><prop oor:name="ForceSafeServiceImpl" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="AntiAliasing" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperBottomMargin" oor:op="fuse"><value>9999</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperHeight" oor:op="fuse"><value>600</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperLeftMargin" oor:op="fuse"><value>9999</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperRightMargin" oor:op="fuse"><value>9999</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperTopMargin" oor:op="fuse"><value>9999</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="MaximumPaperWidth" oor:op="fuse"><value>600</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="OverlayBuffer" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="OverlayBuffer_Calc" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="OverlayBuffer_DrawImpress" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="OverlayBuffer_Writer" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="PaintBuffer" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="PaintBuffer_Calc" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="PaintBuffer_DrawImpress" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="PaintBuffer_Writer" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="Quadratic3DRenderLimit" oor:op="fuse"><value>1000000</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="QuadraticFormControlRenderLimit" oor:op="fuse"><value>45000</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="RenderDecoratedTextDirect" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="RenderSimpleTextDirect" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="SelectionMaximumLuminancePercent" oor:op="fuse"><value>70</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="SnapHorVerLinesToDiscrete" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="SolidDragCreate" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="StripeColorA" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="StripeColorB" oor:op="fuse"><value>16777215</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="StripeLength" oor:op="fuse"><value>4</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="TransparentSelection" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Drawinglayer"><prop oor:name="TransparentSelectionPercent" oor:op="fuse"><value>75</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="DisableUICustomization" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ExperimentalMode" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="LastTipOfTheDayID" oor:op="fuse"><value>1</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="LastTipOfTheDayShown" oor:op="fuse"><value>19370</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="MacroRecorderMode" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="NotebookbarIconSize" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="Persona" oor:op="fuse"><value>no</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="PersonaSettings" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="PluginsEnabled" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowLinkWarningDialog" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowTipOfTheDay" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolSet" oor:op="fuse"><value>2</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>hicontrast</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ToolboxStyle" oor:op="fuse"><value>1</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="UseSystemFileDialog" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="UseSystemPrintDialog" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/HyphenatorList"><prop oor:name="en" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LibHnjHyphenator</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/HyphenatorList"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LibHnjHyphenator</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/LastFoundHyphenators"><prop oor:name="en" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LibHnjHyphenator</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/LastFoundHyphenators"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.LibHnjHyphenator</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/LastFoundSpellCheckers"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.MySpellSpellChecker</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/LastFoundThesauri"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.new.Thesaurus</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/SpellCheckerList"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.MySpellSpellChecker</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Linguistic/ServiceManager/ThesaurusList"><prop oor:name="en-US" oor:op="fuse" oor:type="oor:string-list"><value><it>org.openoffice.lingu.new.Thesaurus</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.Logging/Settings"><node oor:name="unopkg" oor:op="replace"><prop oor:name="LogLevel" oor:op="fuse"><value>2147483647</value></prop><prop oor:name="DefaultHandler" oor:op="fuse"><value>com.sun.star.logging.FileHandler</value></prop><node oor:name="HandlerSettings"><prop oor:name="FileURL" oor:op="fuse"><value>$(userurl)/$(loggername).log</value></prop></node><prop oor:name="DefaultFormatter" oor:op="fuse"><value>com.sun.star.logging.PlainTextFormatter</value></prop><node oor:name="FormatterSettings"></node></node></item>
-<item oor:path="/org.openoffice.Office.Recovery/RecoveryInfo"><prop oor:name="SessionData" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.Recovery/RecoveryList"><node oor:name="recovery_item_1" oor:op="remove"/></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="ContextActive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="ContextSensitive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="DockPos" oor:op="fuse"><value>0,2</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Docked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="DockingArea" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="HideFromToolbarMenu" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Locked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="NoClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Pos" oor:op="fuse"><value>2147483647,2147483647</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Size" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="SoftClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Style" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']/UIName"><value xml:lang="en-US">Formatting</value></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/formatobjectbar']"><prop oor:name="Visible" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="ContextActive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="ContextSensitive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="DockPos" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Docked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="DockingArea" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="HideFromToolbarMenu" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Locked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="NoClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Pos" oor:op="fuse"><value>2147483647,2147483647</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Size" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="SoftClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Style" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']/UIName"><value xml:lang="en-US">Standard</value></item>
-<item oor:path="/org.openoffice.Office.UI.CalcWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Visible" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['GalleryDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>any, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['NavigatorDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>any, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['PropertyDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>any, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['ScFunctionsDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['StyleListDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>any, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/DeckList/org.openoffice.Office.UI.Sidebar:Deck['WriterPageDeck']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.text.TextDocument, any, visible</it><it>com.sun.star.text.GlobalDocument, any, visible</it><it>com.sun.star.text.WebDocument, any, visible</it><it>com.sun.star.xforms.XMLFormDocument, any, visible</it><it>com.sun.star.sdb.FormDesign, any, visible</it><it>com.sun.star.sdb.TextReportDesign, any, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content"><prop oor:name="LastActiveDeck" oor:op="fuse"><value><it>any,PropertyDeck</it><it>com.sun.star.sheet.SpreadsheetDocument,PropertyDeck</it><it>com.sun.star.text.TextDocument,PropertyDeck</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['ParaPropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, DrawLine, hidden, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, DrawLine, hidden, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, DrawLine, hidden, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, 3DObject, hidden, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, 3DObject, hidden, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, Draw, hidden, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, Draw, hidden, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, Graphic, hidden, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, Graphic, hidden, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.drawing.DrawingDocument, TextObject, visible, .uno:ParagraphDialog</it><it>com.sun.star.presentation.PresentationDocument, TextObject, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.TextDocument, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.GlobalDocument, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.WebDocument, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.xforms.XMLFormDocument, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.FormDesign, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.TextReportDesign, Annotation, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.TextDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.GlobalDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.WebDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.xforms.XMLFormDocument, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.FormDesign, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.TextReportDesign, DrawText, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.TextDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.GlobalDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.WebDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.xforms.XMLFormDocument, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.FormDesign, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.TextReportDesign, Table, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.TextDocument, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.GlobalDocument, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.WebDocument, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.xforms.XMLFormDocument, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.FormDesign, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.TextReportDesign, Text, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.TextDocument, default, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.GlobalDocument, default, visible, .uno:ParagraphDialog</it><it>com.sun.star.text.WebDocument, default, visible, .uno:ParagraphDialog</it><it>com.sun.star.xforms.XMLFormDocument, default, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.FormDesign, default, visible, .uno:ParagraphDialog</it><it>com.sun.star.sdb.TextReportDesign, default, visible, .uno:ParagraphDialog</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['ScAlignmentPropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, Auditing, visible, .uno:Hyphenate</it><it>com.sun.star.sheet.SpreadsheetDocument, Cell, visible, .uno:Hyphenate</it><it>com.sun.star.sheet.SpreadsheetDocument, default, visible, .uno:Hyphenate</it><it>com.sun.star.sheet.SpreadsheetDocument, EditCell, visible, .uno:Hyphenate</it><it>com.sun.star.sheet.SpreadsheetDocument, Pivot, visible, .uno:Hyphenate</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['ScCellAppearancePropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, Auditing, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, Cell, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, EditCell, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, default, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, Pivot, visible, .uno:FormatCellDialog</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['ScNumberFormatPropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, Auditing, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, Cell, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, EditCell, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, default, visible, .uno:FormatCellDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, Pivot, visible, .uno:FormatCellDialog</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['StylesPropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.text.TextDocument, Annotation, visible</it><it>com.sun.star.text.GlobalDocument, Annotation, visible</it><it>com.sun.star.text.WebDocument, Annotation, visible</it><it>com.sun.star.xforms.XMLFormDocument, Annotation, visible</it><it>com.sun.star.sdb.FormDesign, Annotation, visible</it><it>com.sun.star.sdb.TextReportDesign, Annotation, visible</it><it>com.sun.star.text.TextDocument, DrawText, visible</it><it>com.sun.star.text.GlobalDocument, DrawText, visible</it><it>com.sun.star.text.WebDocument, DrawText, visible</it><it>com.sun.star.xforms.XMLFormDocument, DrawText, visible</it><it>com.sun.star.sdb.FormDesign, DrawText, visible</it><it>com.sun.star.sdb.TextReportDesign, DrawText, visible</it><it>com.sun.star.text.TextDocument, Table, visible</it><it>com.sun.star.text.GlobalDocument, Table, visible</it><it>com.sun.star.text.WebDocument, Table, visible</it><it>com.sun.star.xforms.XMLFormDocument, Table, visible</it><it>com.sun.star.sdb.FormDesign, Table, visible</it><it>com.sun.star.sdb.TextReportDesign, Table, visible</it><it>com.sun.star.text.TextDocument, Text, visible</it><it>com.sun.star.text.GlobalDocument, Text, visible</it><it>com.sun.star.text.WebDocument, Text, visible</it><it>com.sun.star.xforms.XMLFormDocument, Text, visible</it><it>com.sun.star.sdb.FormDesign, Text, visible</it><it>com.sun.star.sdb.TextReportDesign, Text, visible</it><it>com.sun.star.text.TextDocument, default, visible</it><it>com.sun.star.text.GlobalDocument, default, visible</it><it>com.sun.star.text.WebDocument, default, visible</it><it>com.sun.star.xforms.XMLFormDocument, default, visible</it><it>com.sun.star.sdb.FormDesign, default, visible</it><it>com.sun.star.sdb.TextReportDesign, default, visible</it><it>com.sun.star.sheet.SpreadsheetDocument, Auditing, visible</it><it>com.sun.star.sheet.SpreadsheetDocument, Cell, visible</it><it>com.sun.star.sheet.SpreadsheetDocument, default, visible</it><it>com.sun.star.sheet.SpreadsheetDocument, EditCell, visible</it><it>com.sun.star.sheet.SpreadsheetDocument, Pivot, visible</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.Sidebar/Content/PanelList/org.openoffice.Office.UI.Sidebar:Panel['TextPropertyPanel']"><prop oor:name="ContextList" oor:op="fuse"><value><it>com.sun.star.sheet.SpreadsheetDocument, Auditing, visible, .uno:CellTextDlg</it><it>com.sun.star.sheet.SpreadsheetDocument, Cell, visible, .uno:CellTextDlg</it><it>com.sun.star.sheet.SpreadsheetDocument, default, visible, .uno:CellTextDlg</it><it>com.sun.star.sheet.SpreadsheetDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, DrawLine, hidden, .uno:FontDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, EditCell, visible, .uno:FontDialog</it><it>com.sun.star.sheet.SpreadsheetDocument, Pivot, visible, .uno:CellTextDlg</it><it>com.sun.star.drawing.DrawingDocument, 3DObject, visible, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, 3DObject, visible, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, Draw, hidden, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, Draw, hidden, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, DrawLine, hidden, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, DrawLine, hidden, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, Graphic, hidden, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, Graphic, hidden, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, OutlineText, visible, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, OutlineText, visible, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.drawing.DrawingDocument, TextObject, visible, .uno:FontDialog</it><it>com.sun.star.presentation.PresentationDocument, TextObject, visible, .uno:FontDialog</it><it>com.sun.star.text.TextDocument, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.text.GlobalDocument, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.text.WebDocument, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.xforms.XMLFormDocument, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.sdb.FormDesign, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.sdb.TextReportDesign, Annotation, visible, .uno:FontDialog</it><it>com.sun.star.text.TextDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.text.GlobalDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.text.WebDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.xforms.XMLFormDocument, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.sdb.FormDesign, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.sdb.TextReportDesign, DrawText, visible, .uno:FontDialog</it><it>com.sun.star.text.TextDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.text.GlobalDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.text.WebDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.xforms.XMLFormDocument, Table, visible, .uno:FontDialog</it><it>com.sun.star.sdb.FormDesign, Table, visible, .uno:FontDialog</it><it>com.sun.star.sdb.TextReportDesign, Table, visible, .uno:FontDialog</it><it>com.sun.star.text.TextDocument, Text, visible, .uno:FontDialog</it><it>com.sun.star.text.GlobalDocument, Text, visible, .uno:FontDialog</it><it>com.sun.star.text.WebDocument, Text, visible, .uno:FontDialog</it><it>com.sun.star.xforms.XMLFormDocument, Text, visible, .uno:FontDialog</it><it>com.sun.star.sdb.FormDesign, Text, visible, .uno:FontDialog</it><it>com.sun.star.sdb.TextReportDesign, Text, visible, .uno:FontDialog</it><it>com.sun.star.text.TextDocument, default, visible, .uno:FontDialog</it><it>com.sun.star.text.GlobalDocument, default, visible, .uno:FontDialog</it><it>com.sun.star.text.WebDocument, default, visible, .uno:FontDialog</it><it>com.sun.star.xforms.XMLFormDocument, default, visible, .uno:FontDialog</it><it>com.sun.star.sdb.FormDesign, default, visible, .uno:FontDialog</it><it>com.sun.star.sdb.TextReportDesign, default, visible, .uno:FontDialog</it></value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="ContextActive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="ContextSensitive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="DockPos" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Docked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="DockingArea" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="HideFromToolbarMenu" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Locked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="NoClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Pos" oor:op="fuse"><value>2147483647,2147483647</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Size" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="SoftClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Style" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']/UIName"><value xml:lang="en-US">Standard</value></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/standardbar']"><prop oor:name="Visible" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="ContextActive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="ContextSensitive" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="DockPos" oor:op="fuse"><value>0,1</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Docked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="DockingArea" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="HideFromToolbarMenu" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Locked" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="NoClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Pos" oor:op="fuse"><value>2147483647,2147483647</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Size" oor:op="fuse"><value>0,0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="SoftClose" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Style" oor:op="fuse"><value>0</value></prop></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']/UIName"><value xml:lang="en-US">Formatting</value></item>
-<item oor:path="/org.openoffice.Office.UI.WriterWindowState/UIElements/States/org.openoffice.Office.UI.WindowState:WindowStateType['private:resource/toolbar/textobjectbar']"><prop oor:name="Visible" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Office.Views/TabDialogs"><node oor:name="cui/ui/customizedialog/CustomizeDialog" oor:op="replace"><prop oor:name="PageID" oor:op="fuse"><value>notebookbar</value></prop><node oor:name="UserData"></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/TabDialogs"><node oor:name="sfx/ui/documentpropertiesdialog/DocumentPropertiesDialog" oor:op="replace"><prop oor:name="PageID" oor:op="fuse"><value>font</value></prop><node oor:name="UserData"></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow0" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,0</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow1" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,0</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow2" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,1,0,10336</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="SplitWindow3" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="UserItem" oor:op="fuse" oor:type="xs:string"><value>V1,2,0</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value xsi:nil="true"/></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows/org.openoffice.Office.Views:WindowType['scalc/10336']/UserData"><prop oor:name="Data" oor:op="fuse" oor:type="xs:string"><value>V2,V,0,AL:(5,16,0/0/36/450,36;450)</value></prop></item>
-<item oor:path="/org.openoffice.Office.Views/Windows/org.openoffice.Office.Views:WindowType['scalc/10336']"><prop oor:name="WindowState" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="scalc/10365" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="Data" oor:op="fuse" oor:type="xs:string"><value>V2,V,128</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value></value></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="scalc/26100" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="Data" oor:op="fuse" oor:type="xs:string"><value>V2,V,20</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value></value></prop></node></item>
-<item oor:path="/org.openoffice.Office.Views/Windows/org.openoffice.Office.Views:WindowType['swriter/10336']/UserData"><prop oor:name="Data" oor:op="fuse" oor:type="xs:string"><value>V2,V,0,AL:(5,16,0/0/36/450,36;450)</value></prop></item>
-<item oor:path="/org.openoffice.Office.Views/Windows/org.openoffice.Office.Views:WindowType['swriter/10336']"><prop oor:name="WindowState" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.Office.Views/Windows"><node oor:name="swriter/10365" oor:op="replace"><prop oor:name="Visible" oor:op="fuse"><value xsi:nil="true"/></prop><node oor:name="UserData"><prop oor:name="Data" oor:op="fuse" oor:type="xs:string"><value>V2,V,128</value></prop></node><prop oor:name="WindowState" oor:op="fuse"><value></value></prop></node></item>
-<item oor:path="/org.openoffice.Setup/L10N"><prop oor:name="ooLocale" oor:op="fuse"><value>en-US</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.frame.StartModule']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>4506,335,269,608;1;0,0,0,0;</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>0,73,1921,981;5;0,73,1920,980;</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryWindowAttributes" oor:op="fuse"><value>0,73,2,2;5;0,73,1920,980;</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office"><prop oor:name="LastCompatibilityCheckID" oor:op="fuse"><value>00(Build:2)</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office"><prop oor:name="OfficeRestartInProgress" oor:op="fuse"><value>false</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Office"><prop oor:name="ooSetupInstCompleted" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeDonateShown" oor:op="fuse"><value>1673610414</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeGetInvolvedShown" oor:op="fuse"><value>1673610414</value></prop></item>
-<item oor:path="/org.openoffice.Setup/Product"><prop oor:name="ooSetupLastVersion" oor:op="fuse"><value>7.0</value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="c" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="encryptionkey" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="encrypttoself" oor:op="fuse"><value>true</value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="facsimiletelephonenumber" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="givenname" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="homephone" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="initials" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="l" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="mail" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="o" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="position" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="postalcode" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="signingkey" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="sn" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="st" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="street" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="telephonenumber" oor:op="fuse"><value></value></prop></item>
-<item oor:path="/org.openoffice.UserProfile/Data"><prop oor:name="title" oor:op="fuse"><value></value></prop></item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 36fe351..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<ext:extension-backend-db xmlns:ext="http://openoffice.org/extensionmanager/extension-registry/2010"><ext:extension url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt"><ext:extension-items><ext:item><ext:url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu</ext:url><ext:media-type>application/vnd.sun.star.configuration-data</ext:media-type></ext:item></ext:extension-items></ext:extension><ext:extension url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt"><ext:extension-items><ext:item><ext:url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu</ext:url><ext:media-type>application/vnd.sun.star.configuration-data</ext:media-type></ext:item></ext:extension-items></ext:extension><ext:extension url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt"><ext:extension-items><ext:item><ext:url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu</ext:url><ext:media-type>application/vnd.sun.star.configuration-data</ext:media-type></ext:item></ext:extension-items></ext:extension></ext:extension-backend-db>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 955acd3..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<conf:configuration-backend-db xmlns:conf="http://openoffice.org/extensionmanager/configuration-registry/2010"><conf:configuration url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu"><conf:data-url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp</conf:data-url><conf:ini-entry>$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu</conf:ini-entry></conf:configuration><conf:configuration url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu"><conf:data-url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp</conf:data-url><conf:ini-entry>$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu</conf:ini-entry></conf:configuration><conf:configuration url="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu"><conf:data-url>vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp</conf:data-url><conf:ini-entry>$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu</conf:ini-entry></conf:configuration></conf:configuration-backend-db>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
deleted file mode 100644 (file)
index 89f8115..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
+++ /dev/null
@@ -1 +0,0 @@
-DATA=$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu $UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu $UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu
deleted file mode 100644 (file)
index 2208faf..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu
deleted file mode 100644 (file)
index b719e09..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu
deleted file mode 100644 (file)
index 3da6615..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
deleted file mode 100644 (file)
index 496c8c8..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<help:help-backend-db xmlns:help="http://openoffice.org/extensionmanager/help-registry/2010"/>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages.pmap b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages.pmap
deleted file mode 100644 (file)
index 1a91152..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages.pmap
+++ /dev/null
@@ -1,7 +0,0 @@
-Pmp1ÿorg.iconset.Hicontrast
-lu1770ujjesp.tmpÿhicontrast.oxtÿapplication/vnd.sun.star.package-bundleÿ1.0.0ÿ0
-ÿorg.iconset.Oxygen
-lu29198uixzco.tmpÿoxygen-theme.oxtÿapplication/vnd.sun.star.package-bundleÿ1.0.0ÿ0
-ÿorg.iconset.tango
-lu29644ujb0o8.tmpÿtango-iconset.oxtÿapplication/vnd.sun.star.package-bundleÿ1.0ÿ0
-

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml
deleted file mode 100644 (file)
index 4e6624f..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
- <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
-   m:full-path="config.xcu"/>
-</m:manifest>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu
deleted file mode 100644 (file)
index 4f366c3..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="%origin%/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml
deleted file mode 100644 (file)
index 3fe2c35..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<description
- xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:dep="http://openoffice.org/extensions/description/2006"
- xmlns:lo="http://libreoffice.org/extensions/description/2011"
- xmlns:xlink="http://www.w3.org/1999/xlink">
-    <identifier value="org.iconset.Hicontrast"/>
-       <version value="1.0.0"/>
-    <display-name name="High Contrast icon theme"/>
-    <dependencies>
-        <lo:LibreOffice-minimal-version d:name="LibreOffice 6.0" value="6.0"/>
-    </dependencies>
-    <publisher>
-           <name xlink:href="https://wiki.documentfoundation.org/Design">LibreOffice Design Team</name>
-    </publisher>
-    <icon>
-        <default xlink:href="icons/Hicontrast-Theme.png"/>
-    </icon>
-    <extension-description>
-       <src xlink:href="pkg-desc/pkg-description.txt" />
-    </extension-description>
-</description>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png
deleted file mode 100644 (file)
index 07021bf..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip
deleted file mode 100644 (file)
index f8609bc..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt
deleted file mode 100644 (file)
index f845995..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hicontrast icon theme as shipped with LibreOffice before version 6.1

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt
deleted file mode 100644 (file)
index 7f0280b..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-Mozilla Public License\r
-Version 2.0\r
-1. Definitions\r
-\r
-1.1. “Contributor”\r
-\r
-    means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.\r
-1.2. “Contributor Version”\r
-\r
-    means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.\r
-1.3. “Contribution”\r
-\r
-    means Covered Software of a particular Contributor.\r
-1.4. “Covered Software”\r
-\r
-    means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.\r
-1.5. “Incompatible With Secondary Licenses”\r
-\r
-    means\r
-\r
-        that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or\r
-\r
-        that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.\r
-\r
-1.6. “Executable Form”\r
-\r
-    means any form of the work other than Source Code Form.\r
-1.7. “Larger Work”\r
-\r
-    means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.\r
-1.8. “License”\r
-\r
-    means this document.\r
-1.9. “Licensable”\r
-\r
-    means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.\r
-1.10. “Modifications”\r
-\r
-    means any of the following:\r
-\r
-        any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or\r
-\r
-        any new file in Source Code Form that contains any Covered Software.\r
-\r
-1.11. “Patent Claims” of a Contributor\r
-\r
-    means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.\r
-1.12. “Secondary License”\r
-\r
-    means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.\r
-1.13. “Source Code Form”\r
-\r
-    means the form of the work preferred for making modifications.\r
-1.14. “You” (or “Your”)\r
-\r
-    means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.\r
-\r
-2. License Grants and Conditions\r
-2.1. Grants\r
-\r
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:\r
-\r
-    under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and\r
-\r
-    under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.\r
-\r
-2.2. Effective Date\r
-\r
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.\r
-2.3. Limitations on Grant Scope\r
-\r
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:\r
-\r
-    for any code that a Contributor has removed from Covered Software; or\r
-\r
-    for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or\r
-\r
-    under Patent Claims infringed by Covered Software in the absence of its Contributions.\r
-\r
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).\r
-2.4. Subsequent Licenses\r
-\r
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).\r
-2.5. Representation\r
-\r
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.\r
-2.6. Fair Use\r
-\r
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.\r
-2.7. Conditions\r
-\r
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.\r
-3. Responsibilities\r
-3.1. Distribution of Source Form\r
-\r
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.\r
-3.2. Distribution of Executable Form\r
-\r
-If You distribute Covered Software in Executable Form then:\r
-\r
-    such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and\r
-\r
-    You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.\r
-\r
-3.3. Distribution of a Larger Work\r
-\r
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).\r
-3.4. Notices\r
-\r
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.\r
-3.5. Application of Additional Terms\r
-\r
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.\r
-4. Inability to Comply Due to Statute or Regulation\r
-\r
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.\r
-5. Termination\r
-\r
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.\r
-\r
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.\r
-\r
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.\r
-6. Disclaimer of Warranty\r
-\r
-Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.\r
-7. Limitation of Liability\r
-\r
-Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.\r
-8. Litigation\r
-\r
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.\r
-9. Miscellaneous\r
-\r
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.\r
-10. Versions of the License\r
-10.1. New Versions\r
-\r
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.\r
-10.2. Effect of New Versions\r
-\r
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.\r
-10.3. Modified Versions\r
-\r
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).\r
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses\r
-\r
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.\r
-Exhibit A - Source Code Form License Notice\r
-\r
-    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.\r
-\r
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.\r
-\r
-You may add additional accurate notices of copyright ownership.\r
-Exhibit B - “Incompatible With Secondary Licenses” Notice\r
-\r
-    This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.\r

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml
deleted file mode 100644 (file)
index 4e6624f..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
- <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
-   m:full-path="config.xcu"/>
-</m:manifest>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu
deleted file mode 100644 (file)
index 4f366c3..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="%origin%/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml
deleted file mode 100644 (file)
index 4575f83..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<description
- xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:dep="http://openoffice.org/extensions/description/2006"
- xmlns:lo="http://libreoffice.org/extensions/description/2011"
- xmlns:xlink="http://www.w3.org/1999/xlink">
-    <identifier value="org.iconset.Oxygen"/>
-       <version value="1.0.0"/>
-    <display-name name="Oxygen Icon Set"/>
-    <dependencies>
-        <lo:LibreOffice-minimal-version d:name="LibreOffice 6.0" value="6.0"/>
-    </dependencies>
-    <publisher>
-           <name xlink:href="https://wiki.documentfoundation.org/Design">The LibreOffice Design Team</name>
-    </publisher>
-    <icon>
-        <default xlink:href="icons/Oxygen-Theme.png"/>
-    </icon>
-    <extension-description>
-       <src xlink:href="pkg-desc/pkg-description.txt" />
-    </extension-description>
-    <registration>
-       <simple-license accept-by="admin">
-          <license-text xlink:href="registration/license.txt" lang="en" />
-       </simple-license>
-    </registration>
-</description>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png
deleted file mode 100644 (file)
index 2145cc7..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip
deleted file mode 100644 (file)
index 1cf4f84..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt
deleted file mode 100644 (file)
index 144f334..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Oxygen-icons is a freedesktop.org compatible icon theme. Not all icons are implemented and you will get the fallback solution in this case.

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt
deleted file mode 100644 (file)
index 004c684..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt
+++ /dev/null
@@ -1,845 +0,0 @@
-All trademarks and registered trademarks mentioned herein are the property of their respective owners.  \r
-Copyright (c) 2010 Gustavo Buzzatti Pacheco. All rights reserved.\r
-\r
-                  GNU LESSER GENERAL PUBLIC LICENSE\r
-                       Version 3, 29 June 2007\r
-\r
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\r
- Everyone is permitted to copy and distribute verbatim copies\r
- of this license document, but changing it is not allowed.\r
-\r
-\r
-  This version of the GNU Lesser General Public License incorporates\r
-the terms and conditions of version 3 of the GNU General Public\r
-License, supplemented by the additional permissions listed below.\r
-\r
-  0. Additional Definitions. \r
-\r
-  As used herein, "this License" refers to version 3 of the GNU Lesser\r
-General Public License, and the "GNU GPL" refers to version 3 of the GNU\r
-General Public License.\r
-\r
-  "The Library" refers to a covered work governed by this License,\r
-other than an Application or a Combined Work as defined below.\r
-\r
-  An "Application" is any work that makes use of an interface provided\r
-by the Library, but which is not otherwise based on the Library.\r
-Defining a subclass of a class defined by the Library is deemed a mode\r
-of using an interface provided by the Library.\r
-\r
-  A "Combined Work" is a work produced by combining or linking an\r
-Application with the Library.  The particular version of the Library\r
-with which the Combined Work was made is also called the "Linked\r
-Version".\r
-\r
-  The "Minimal Corresponding Source" for a Combined Work means the\r
-Corresponding Source for the Combined Work, excluding any source code\r
-for portions of the Combined Work that, considered in isolation, are\r
-based on the Application, and not on the Linked Version.\r
-\r
-  The "Corresponding Application Code" for a Combined Work means the\r
-object code and/or source code for the Application, including any data\r
-and utility programs needed for reproducing the Combined Work from the\r
-Application, but excluding the System Libraries of the Combined Work.\r
-\r
-  1. Exception to Section 3 of the GNU GPL.\r
-\r
-  You may convey a covered work under sections 3 and 4 of this License\r
-without being bound by section 3 of the GNU GPL.\r
-\r
-  2. Conveying Modified Versions.\r
-\r
-  If you modify a copy of the Library, and, in your modifications, a\r
-facility refers to a function or data to be supplied by an Application\r
-that uses the facility (other than as an argument passed when the\r
-facility is invoked), then you may convey a copy of the modified\r
-version:\r
-\r
-   a) under this License, provided that you make a good faith effort to\r
-   ensure that, in the event an Application does not supply the\r
-   function or data, the facility still operates, and performs\r
-   whatever part of its purpose remains meaningful, or\r
-\r
-   b) under the GNU GPL, with none of the additional permissions of\r
-   this License applicable to that copy.\r
-\r
-  3. Object Code Incorporating Material from Library Header Files.\r
-\r
-  The object code form of an Application may incorporate material from\r
-a header file that is part of the Library.  You may convey such object\r
-code under terms of your choice, provided that, if the incorporated\r
-material is not limited to numerical parameters, data structure\r
-layouts and accessors, or small macros, inline functions and templates\r
-(ten or fewer lines in length), you do both of the following:\r
-\r
-   a) Give prominent notice with each copy of the object code that the\r
-   Library is used in it and that the Library and its use are\r
-   covered by this License.\r
-\r
-   b) Accompany the object code with a copy of the GNU GPL and this license\r
-   document.\r
-\r
-  4. Combined Works.\r
-\r
-  You may convey a Combined Work under terms of your choice that,\r
-taken together, effectively do not restrict modification of the\r
-portions of the Library contained in the Combined Work and reverse\r
-engineering for debugging such modifications, if you also do each of\r
-the following:\r
-\r
-   a) Give prominent notice with each copy of the Combined Work that\r
-   the Library is used in it and that the Library and its use are\r
-   covered by this License.\r
-\r
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license\r
-   document.\r
-\r
-   c) For a Combined Work that displays copyright notices during\r
-   execution, include the copyright notice for the Library among\r
-   these notices, as well as a reference directing the user to the\r
-   copies of the GNU GPL and this license document.\r
-\r
-   d) Do one of the following:\r
-\r
-       0) Convey the Minimal Corresponding Source under the terms of this\r
-       License, and the Corresponding Application Code in a form\r
-       suitable for, and under terms that permit, the user to\r
-       recombine or relink the Application with a modified version of\r
-       the Linked Version to produce a modified Combined Work, in the\r
-       manner specified by section 6 of the GNU GPL for conveying\r
-       Corresponding Source.\r
-\r
-       1) Use a suitable shared library mechanism for linking with the\r
-       Library.  A suitable mechanism is one that (a) uses at run time\r
-       a copy of the Library already present on the user's computer\r
-       system, and (b) will operate properly with a modified version\r
-       of the Library that is interface-compatible with the Linked\r
-       Version. \r
-\r
-   e) Provide Installation Information, but only if you would otherwise\r
-   be required to provide such information under section 6 of the\r
-   GNU GPL, and only to the extent that such information is\r
-   necessary to install and execute a modified version of the\r
-   Combined Work produced by recombining or relinking the\r
-   Application with a modified version of the Linked Version. (If\r
-   you use option 4d0, the Installation Information must accompany\r
-   the Minimal Corresponding Source and Corresponding Application\r
-   Code. If you use option 4d1, you must provide the Installation\r
-   Information in the manner specified by section 6 of the GNU GPL\r
-   for conveying Corresponding Source.)\r
-\r
-  5. Combined Libraries.\r
-\r
-  You may place library facilities that are a work based on the\r
-Library side by side in a single library together with other library\r
-facilities that are not Applications and are not covered by this\r
-License, and convey such a combined library under terms of your\r
-choice, if you do both of the following:\r
-\r
-   a) Accompany the combined library with a copy of the same work based\r
-   on the Library, uncombined with any other library facilities,\r
-   conveyed under the terms of this License.\r
-\r
-   b) Give prominent notice with the combined library that part of it\r
-   is a work based on the Library, and explaining where to find the\r
-   accompanying uncombined form of the same work.\r
-\r
-  6. Revised Versions of the GNU Lesser General Public License.\r
-\r
-  The Free Software Foundation may publish revised and/or new versions\r
-of the GNU Lesser General Public License from time to time. Such new\r
-versions will be similar in spirit to the present version, but may\r
-differ in detail to address new problems or concerns.\r
-\r
-  Each version is given a distinguishing version number. If the\r
-Library as you received it specifies that a certain numbered version\r
-of the GNU Lesser General Public License "or any later version"\r
-applies to it, you have the option of following the terms and\r
-conditions either of that published version or of any later version\r
-published by the Free Software Foundation. If the Library as you\r
-received it does not specify a version number of the GNU Lesser\r
-General Public License, you may choose any version of the GNU Lesser\r
-General Public License ever published by the Free Software Foundation.\r
-\r
-  If the Library as you received it specifies that a proxy can decide\r
-whether future versions of the GNU Lesser General Public License shall\r
-apply, that proxy's public statement of acceptance of any version is\r
-permanent authorization for you to choose that version for the\r
-Library.\r
-\r
-\r
-\r
-                    GNU GENERAL PUBLIC LICENSE\r
-                       Version 3, 29 June 2007\r
-\r
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>\r
- Everyone is permitted to copy and distribute verbatim copies\r
- of this license document, but changing it is not allowed.\r
-\r
-                            Preamble\r
-\r
-  The GNU General Public License is a free, copyleft license for\r
-software and other kinds of works.\r
-\r
-  The licenses for most software and other practical works are designed\r
-to take away your freedom to share and change the works.  By contrast,\r
-the GNU General Public License is intended to guarantee your freedom to\r
-share and change all versions of a program--to make sure it remains free\r
-software for all its users.  We, the Free Software Foundation, use the\r
-GNU General Public License for most of our software; it applies also to\r
-any other work released this way by its authors.  You can apply it to\r
-your programs, too.\r
-\r
-  When we speak of free software, we are referring to freedom, not\r
-price.  Our General Public Licenses are designed to make sure that you\r
-have the freedom to distribute copies of free software (and charge for\r
-them if you wish), that you receive source code or can get it if you\r
-want it, that you can change the software or use pieces of it in new\r
-free programs, and that you know you can do these things.\r
-\r
-  To protect your rights, we need to prevent others from denying you\r
-these rights or asking you to surrender the rights.  Therefore, you have\r
-certain responsibilities if you distribute copies of the software, or if\r
-you modify it: responsibilities to respect the freedom of others.\r
-\r
-  For example, if you distribute copies of such a program, whether\r
-gratis or for a fee, you must pass on to the recipients the same\r
-freedoms that you received.  You must make sure that they, too, receive\r
-or can get the source code.  And you must show them these terms so they\r
-know their rights.\r
-\r
-  Developers that use the GNU GPL protect your rights with two steps:\r
-(1) assert copyright on the software, and (2) offer you this License\r
-giving you legal permission to copy, distribute and/or modify it.\r
-\r
-  For the developers' and authors' protection, the GPL clearly explains\r
-that there is no warranty for this free software.  For both users' and\r
-authors' sake, the GPL requires that modified versions be marked as\r
-changed, so that their problems will not be attributed erroneously to\r
-authors of previous versions.\r
-\r
-  Some devices are designed to deny users access to install or run\r
-modified versions of the software inside them, although the manufacturer\r
-can do so.  This is fundamentally incompatible with the aim of\r
-protecting users' freedom to change the software.  The systematic\r
-pattern of such abuse occurs in the area of products for individuals to\r
-use, which is precisely where it is most unacceptable.  Therefore, we\r
-have designed this version of the GPL to prohibit the practice for those\r
-products.  If such problems arise substantially in other domains, we\r
-stand ready to extend this provision to those domains in future versions\r
-of the GPL, as needed to protect the freedom of users.\r
-\r
-  Finally, every program is threatened constantly by software patents.\r
-States should not allow patents to restrict development and use of\r
-software on general-purpose computers, but in those that do, we wish to\r
-avoid the special danger that patents applied to a free program could\r
-make it effectively proprietary.  To prevent this, the GPL assures that\r
-patents cannot be used to render the program non-free.\r
-\r
-  The precise terms and conditions for copying, distribution and\r
-modification follow.\r
-\r
-                       TERMS AND CONDITIONS\r
-\r
-  0. Definitions.\r
-\r
-  "This License" refers to version 3 of the GNU General Public License.\r
-\r
-  "Copyright" also means copyright-like laws that apply to other kinds of\r
-works, such as semiconductor masks.\r
-\r
-  "The Program" refers to any copyrightable work licensed under this\r
-License.  Each licensee is addressed as "you".  "Licensees" and\r
-"recipients" may be individuals or organizations.\r
-\r
-  To "modify" a work means to copy from or adapt all or part of the work\r
-in a fashion requiring copyright permission, other than the making of an\r
-exact copy.  The resulting work is called a "modified version" of the\r
-earlier work or a work "based on" the earlier work.\r
-\r
-  A "covered work" means either the unmodified Program or a work based\r
-on the Program.\r
-\r
-  To "propagate" a work means to do anything with it that, without\r
-permission, would make you directly or secondarily liable for\r
-infringement under applicable copyright law, except executing it on a\r
-computer or modifying a private copy.  Propagation includes copying,\r
-distribution (with or without modification), making available to the\r
-public, and in some countries other activities as well.\r
-\r
-  To "convey" a work means any kind of propagation that enables other\r
-parties to make or receive copies.  Mere interaction with a user through\r
-a computer network, with no transfer of a copy, is not conveying.\r
-\r
-  An interactive user interface displays "Appropriate Legal Notices"\r
-to the extent that it includes a convenient and prominently visible\r
-feature that (1) displays an appropriate copyright notice, and (2)\r
-tells the user that there is no warranty for the work (except to the\r
-extent that warranties are provided), that licensees may convey the\r
-work under this License, and how to view a copy of this License.  If\r
-the interface presents a list of user commands or options, such as a\r
-menu, a prominent item in the list meets this criterion.\r
-\r
-  1. Source Code.\r
-\r
-  The "source code" for a work means the preferred form of the work\r
-for making modifications to it.  "Object code" means any non-source\r
-form of a work.\r
-\r
-  A "Standard Interface" means an interface that either is an official\r
-standard defined by a recognized standards body, or, in the case of\r
-interfaces specified for a particular programming language, one that\r
-is widely used among developers working in that language.\r
-\r
-  The "System Libraries" of an executable work include anything, other\r
-than the work as a whole, that (a) is included in the normal form of\r
-packaging a Major Component, but which is not part of that Major\r
-Component, and (b) serves only to enable use of the work with that\r
-Major Component, or to implement a Standard Interface for which an\r
-implementation is available to the public in source code form.  A\r
-"Major Component", in this context, means a major essential component\r
-(kernel, window system, and so on) of the specific operating system\r
-(if any) on which the executable work runs, or a compiler used to\r
-produce the work, or an object code interpreter used to run it.\r
-\r
-  The "Corresponding Source" for a work in object code form means all\r
-the source code needed to generate, install, and (for an executable\r
-work) run the object code and to modify the work, including scripts to\r
-control those activities.  However, it does not include the work's\r
-System Libraries, or general-purpose tools or generally available free\r
-programs which are used unmodified in performing those activities but\r
-which are not part of the work.  For example, Corresponding Source\r
-includes interface definition files associated with source files for\r
-the work, and the source code for shared libraries and dynamically\r
-linked subprograms that the work is specifically designed to require,\r
-such as by intimate data communication or control flow between those\r
-subprograms and other parts of the work.\r
-\r
-  The Corresponding Source need not include anything that users\r
-can regenerate automatically from other parts of the Corresponding\r
-Source.\r
-\r
-  The Corresponding Source for a work in source code form is that\r
-same work.\r
-\r
-  2. Basic Permissions.\r
-\r
-  All rights granted under this License are granted for the term of\r
-copyright on the Program, and are irrevocable provided the stated\r
-conditions are met.  This License explicitly affirms your unlimited\r
-permission to run the unmodified Program.  The output from running a\r
-covered work is covered by this License only if the output, given its\r
-content, constitutes a covered work.  This License acknowledges your\r
-rights of fair use or other equivalent, as provided by copyright law.\r
-\r
-  You may make, run and propagate covered works that you do not\r
-convey, without conditions so long as your license otherwise remains\r
-in force.  You may convey covered works to others for the sole purpose\r
-of having them make modifications exclusively for you, or provide you\r
-with facilities for running those works, provided that you comply with\r
-the terms of this License in conveying all material for which you do\r
-not control copyright.  Those thus making or running the covered works\r
-for you must do so exclusively on your behalf, under your direction\r
-and control, on terms that prohibit them from making any copies of\r
-your copyrighted material outside their relationship with you.\r
-\r
-  Conveying under any other circumstances is permitted solely under\r
-the conditions stated below.  Sublicensing is not allowed; section 10\r
-makes it unnecessary.\r
-\r
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\r
-\r
-  No covered work shall be deemed part of an effective technological\r
-measure under any applicable law fulfilling obligations under article\r
-11 of the WIPO copyright treaty adopted on 20 December 1996, or\r
-similar laws prohibiting or restricting circumvention of such\r
-measures.\r
-\r
-  When you convey a covered work, you waive any legal power to forbid\r
-circumvention of technological measures to the extent such circumvention\r
-is effected by exercising rights under this License with respect to\r
-the covered work, and you disclaim any intention to limit operation or\r
-modification of the work as a means of enforcing, against the work's\r
-users, your or third parties' legal rights to forbid circumvention of\r
-technological measures.\r
-\r
-  4. Conveying Verbatim Copies.\r
-\r
-  You may convey verbatim copies of the Program's source code as you\r
-receive it, in any medium, provided that you conspicuously and\r
-appropriately publish on each copy an appropriate copyright notice;\r
-keep intact all notices stating that this License and any\r
-non-permissive terms added in accord with section 7 apply to the code;\r
-keep intact all notices of the absence of any warranty; and give all\r
-recipients a copy of this License along with the Program.\r
-\r
-  You may charge any price or no price for each copy that you convey,\r
-and you may offer support or warranty protection for a fee.\r
-\r
-  5. Conveying Modified Source Versions.\r
-\r
-  You may convey a work based on the Program, or the modifications to\r
-produce it from the Program, in the form of source code under the\r
-terms of section 4, provided that you also meet all of these conditions:\r
-\r
-    a) The work must carry prominent notices stating that you modified\r
-    it, and giving a relevant date.\r
-\r
-    b) The work must carry prominent notices stating that it is\r
-    released under this License and any conditions added under section\r
-    7.  This requirement modifies the requirement in section 4 to\r
-    "keep intact all notices".\r
-\r
-    c) You must license the entire work, as a whole, under this\r
-    License to anyone who comes into possession of a copy.  This\r
-    License will therefore apply, along with any applicable section 7\r
-    additional terms, to the whole of the work, and all its parts,\r
-    regardless of how they are packaged.  This License gives no\r
-    permission to license the work in any other way, but it does not\r
-    invalidate such permission if you have separately received it.\r
-\r
-    d) If the work has interactive user interfaces, each must display\r
-    Appropriate Legal Notices; however, if the Program has interactive\r
-    interfaces that do not display Appropriate Legal Notices, your\r
-    work need not make them do so.\r
-\r
-  A compilation of a covered work with other separate and independent\r
-works, which are not by their nature extensions of the covered work,\r
-and which are not combined with it such as to form a larger program,\r
-in or on a volume of a storage or distribution medium, is called an\r
-"aggregate" if the compilation and its resulting copyright are not\r
-used to limit the access or legal rights of the compilation's users\r
-beyond what the individual works permit.  Inclusion of a covered work\r
-in an aggregate does not cause this License to apply to the other\r
-parts of the aggregate.\r
-\r
-  6. Conveying Non-Source Forms.\r
-\r
-  You may convey a covered work in object code form under the terms\r
-of sections 4 and 5, provided that you also convey the\r
-machine-readable Corresponding Source under the terms of this License,\r
-in one of these ways:\r
-\r
-    a) Convey the object code in, or embodied in, a physical product\r
-    (including a physical distribution medium), accompanied by the\r
-    Corresponding Source fixed on a durable physical medium\r
-    customarily used for software interchange.\r
-\r
-    b) Convey the object code in, or embodied in, a physical product\r
-    (including a physical distribution medium), accompanied by a\r
-    written offer, valid for at least three years and valid for as\r
-    long as you offer spare parts or customer support for that product\r
-    model, to give anyone who possesses the object code either (1) a\r
-    copy of the Corresponding Source for all the software in the\r
-    product that is covered by this License, on a durable physical\r
-    medium customarily used for software interchange, for a price no\r
-    more than your reasonable cost of physically performing this\r
-    conveying of source, or (2) access to copy the\r
-    Corresponding Source from a network server at no charge.\r
-\r
-    c) Convey individual copies of the object code with a copy of the\r
-    written offer to provide the Corresponding Source.  This\r
-    alternative is allowed only occasionally and noncommercially, and\r
-    only if you received the object code with such an offer, in accord\r
-    with subsection 6b.\r
-\r
-    d) Convey the object code by offering access from a designated\r
-    place (gratis or for a charge), and offer equivalent access to the\r
-    Corresponding Source in the same way through the same place at no\r
-    further charge.  You need not require recipients to copy the\r
-    Corresponding Source along with the object code.  If the place to\r
-    copy the object code is a network server, the Corresponding Source\r
-    may be on a different server (operated by you or a third party)\r
-    that supports equivalent copying facilities, provided you maintain\r
-    clear directions next to the object code saying where to find the\r
-    Corresponding Source.  Regardless of what server hosts the\r
-    Corresponding Source, you remain obligated to ensure that it is\r
-    available for as long as needed to satisfy these requirements.\r
-\r
-    e) Convey the object code using peer-to-peer transmission, provided\r
-    you inform other peers where the object code and Corresponding\r
-    Source of the work are being offered to the general public at no\r
-    charge under subsection 6d.\r
-\r
-  A separable portion of the object code, whose source code is excluded\r
-from the Corresponding Source as a System Library, need not be\r
-included in conveying the object code work.\r
-\r
-  A "User Product" is either (1) a "consumer product", which means any\r
-tangible personal property which is normally used for personal, family,\r
-or household purposes, or (2) anything designed or sold for incorporation\r
-into a dwelling.  In determining whether a product is a consumer product,\r
-doubtful cases shall be resolved in favor of coverage.  For a particular\r
-product received by a particular user, "normally used" refers to a\r
-typical or common use of that class of product, regardless of the status\r
-of the particular user or of the way in which the particular user\r
-actually uses, or expects or is expected to use, the product.  A product\r
-is a consumer product regardless of whether the product has substantial\r
-commercial, industrial or non-consumer uses, unless such uses represent\r
-the only significant mode of use of the product.\r
-\r
-  "Installation Information" for a User Product means any methods,\r
-procedures, authorization keys, or other information required to install\r
-and execute modified versions of a covered work in that User Product from\r
-a modified version of its Corresponding Source.  The information must\r
-suffice to ensure that the continued functioning of the modified object\r
-code is in no case prevented or interfered with solely because\r
-modification has been made.\r
-\r
-  If you convey an object code work under this section in, or with, or\r
-specifically for use in, a User Product, and the conveying occurs as\r
-part of a transaction in which the right of possession and use of the\r
-User Product is transferred to the recipient in perpetuity or for a\r
-fixed term (regardless of how the transaction is characterized), the\r
-Corresponding Source conveyed under this section must be accompanied\r
-by the Installation Information.  But this requirement does not apply\r
-if neither you nor any third party retains the ability to install\r
-modified object code on the User Product (for example, the work has\r
-been installed in ROM).\r
-\r
-  The requirement to provide Installation Information does not include a\r
-requirement to continue to provide support service, warranty, or updates\r
-for a work that has been modified or installed by the recipient, or for\r
-the User Product in which it has been modified or installed.  Access to a\r
-network may be denied when the modification itself materially and\r
-adversely affects the operation of the network or violates the rules and\r
-protocols for communication across the network.\r
-\r
-  Corresponding Source conveyed, and Installation Information provided,\r
-in accord with this section must be in a format that is publicly\r
-documented (and with an implementation available to the public in\r
-source code form), and must require no special password or key for\r
-unpacking, reading or copying.\r
-\r
-  7. Additional Terms.\r
-\r
-  "Additional permissions" are terms that supplement the terms of this\r
-License by making exceptions from one or more of its conditions.\r
-Additional permissions that are applicable to the entire Program shall\r
-be treated as though they were included in this License, to the extent\r
-that they are valid under applicable law.  If additional permissions\r
-apply only to part of the Program, that part may be used separately\r
-under those permissions, but the entire Program remains governed by\r
-this License without regard to the additional permissions.\r
-\r
-  When you convey a copy of a covered work, you may at your option\r
-remove any additional permissions from that copy, or from any part of\r
-it.  (Additional permissions may be written to require their own\r
-removal in certain cases when you modify the work.)  You may place\r
-additional permissions on material, added by you to a covered work,\r
-for which you have or can give appropriate copyright permission.\r
-\r
-  Notwithstanding any other provision of this License, for material you\r
-add to a covered work, you may (if authorized by the copyright holders of\r
-that material) supplement the terms of this License with terms:\r
-\r
-    a) Disclaiming warranty or limiting liability differently from the\r
-    terms of sections 15 and 16 of this License; or\r
-\r
-    b) Requiring preservation of specified reasonable legal notices or\r
-    author attributions in that material or in the Appropriate Legal\r
-    Notices displayed by works containing it; or\r
-\r
-    c) Prohibiting misrepresentation of the origin of that material, or\r
-    requiring that modified versions of such material be marked in\r
-    reasonable ways as different from the original version; or\r
-\r
-    d) Limiting the use for publicity purposes of names of licensors or\r
-    authors of the material; or\r
-\r
-    e) Declining to grant rights under trademark law for use of some\r
-    trade names, trademarks, or service marks; or\r
-\r
-    f) Requiring indemnification of licensors and authors of that\r
-    material by anyone who conveys the material (or modified versions of\r
-    it) with contractual assumptions of liability to the recipient, for\r
-    any liability that these contractual assumptions directly impose on\r
-    those licensors and authors.\r
-\r
-  All other non-permissive additional terms are considered "further\r
-restrictions" within the meaning of section 10.  If the Program as you\r
-received it, or any part of it, contains a notice stating that it is\r
-governed by this License along with a term that is a further\r
-restriction, you may remove that term.  If a license document contains\r
-a further restriction but permits relicensing or conveying under this\r
-License, you may add to a covered work material governed by the terms\r
-of that license document, provided that the further restriction does\r
-not survive such relicensing or conveying.\r
-\r
-  If you add terms to a covered work in accord with this section, you\r
-must place, in the relevant source files, a statement of the\r
-additional terms that apply to those files, or a notice indicating\r
-where to find the applicable terms.\r
-\r
-  Additional terms, permissive or non-permissive, may be stated in the\r
-form of a separately written license, or stated as exceptions;\r
-the above requirements apply either way.\r
-\r
-  8. Termination.\r
-\r
-  You may not propagate or modify a covered work except as expressly\r
-provided under this License.  Any attempt otherwise to propagate or\r
-modify it is void, and will automatically terminate your rights under\r
-this License (including any patent licenses granted under the third\r
-paragraph of section 11).\r
-\r
-  However, if you cease all violation of this License, then your\r
-license from a particular copyright holder is reinstated (a)\r
-provisionally, unless and until the copyright holder explicitly and\r
-finally terminates your license, and (b) permanently, if the copyright\r
-holder fails to notify you of the violation by some reasonable means\r
-prior to 60 days after the cessation.\r
-\r
-  Moreover, your license from a particular copyright holder is\r
-reinstated permanently if the copyright holder notifies you of the\r
-violation by some reasonable means, this is the first time you have\r
-received notice of violation of this License (for any work) from that\r
-copyright holder, and you cure the violation prior to 30 days after\r
-your receipt of the notice.\r
-\r
-  Termination of your rights under this section does not terminate the\r
-licenses of parties who have received copies or rights from you under\r
-this License.  If your rights have been terminated and not permanently\r
-reinstated, you do not qualify to receive new licenses for the same\r
-material under section 10.\r
-\r
-  9. Acceptance Not Required for Having Copies.\r
-\r
-  You are not required to accept this License in order to receive or\r
-run a copy of the Program.  Ancillary propagation of a covered work\r
-occurring solely as a consequence of using peer-to-peer transmission\r
-to receive a copy likewise does not require acceptance.  However,\r
-nothing other than this License grants you permission to propagate or\r
-modify any covered work.  These actions infringe copyright if you do\r
-not accept this License.  Therefore, by modifying or propagating a\r
-covered work, you indicate your acceptance of this License to do so.\r
-\r
-  10. Automatic Licensing of Downstream Recipients.\r
-\r
-  Each time you convey a covered work, the recipient automatically\r
-receives a license from the original licensors, to run, modify and\r
-propagate that work, subject to this License.  You are not responsible\r
-for enforcing compliance by third parties with this License.\r
-\r
-  An "entity transaction" is a transaction transferring control of an\r
-organization, or substantially all assets of one, or subdividing an\r
-organization, or merging organizations.  If propagation of a covered\r
-work results from an entity transaction, each party to that\r
-transaction who receives a copy of the work also receives whatever\r
-licenses to the work the party's predecessor in interest had or could\r
-give under the previous paragraph, plus a right to possession of the\r
-Corresponding Source of the work from the predecessor in interest, if\r
-the predecessor has it or can get it with reasonable efforts.\r
-\r
-  You may not impose any further restrictions on the exercise of the\r
-rights granted or affirmed under this License.  For example, you may\r
-not impose a license fee, royalty, or other charge for exercise of\r
-rights granted under this License, and you may not initiate litigation\r
-(including a cross-claim or counterclaim in a lawsuit) alleging that\r
-any patent claim is infringed by making, using, selling, offering for\r
-sale, or importing the Program or any portion of it.\r
-\r
-  11. Patents.\r
-\r
-  A "contributor" is a copyright holder who authorizes use under this\r
-License of the Program or a work on which the Program is based.  The\r
-work thus licensed is called the contributor's "contributor version".\r
-\r
-  A contributor's "essential patent claims" are all patent claims\r
-owned or controlled by the contributor, whether already acquired or\r
-hereafter acquired, that would be infringed by some manner, permitted\r
-by this License, of making, using, or selling its contributor version,\r
-but do not include claims that would be infringed only as a\r
-consequence of further modification of the contributor version.  For\r
-purposes of this definition, "control" includes the right to grant\r
-patent sublicenses in a manner consistent with the requirements of\r
-this License.\r
-\r
-  Each contributor grants you a non-exclusive, worldwide, royalty-free\r
-patent license under the contributor's essential patent claims, to\r
-make, use, sell, offer for sale, import and otherwise run, modify and\r
-propagate the contents of its contributor version.\r
-\r
-  In the following three paragraphs, a "patent license" is any express\r
-agreement or commitment, however denominated, not to enforce a patent\r
-(such as an express permission to practice a patent or covenant not to\r
-sue for patent infringement).  To "grant" such a patent license to a\r
-party means to make such an agreement or commitment not to enforce a\r
-patent against the party.\r
-\r
-  If you convey a covered work, knowingly relying on a patent license,\r
-and the Corresponding Source of the work is not available for anyone\r
-to copy, free of charge and under the terms of this License, through a\r
-publicly available network server or other readily accessible means,\r
-then you must either (1) cause the Corresponding Source to be so\r
-available, or (2) arrange to deprive yourself of the benefit of the\r
-patent license for this particular work, or (3) arrange, in a manner\r
-consistent with the requirements of this License, to extend the patent\r
-license to downstream recipients.  "Knowingly relying" means you have\r
-actual knowledge that, but for the patent license, your conveying the\r
-covered work in a country, or your recipient's use of the covered work\r
-in a country, would infringe one or more identifiable patents in that\r
-country that you have reason to believe are valid.\r
-\r
-  If, pursuant to or in connection with a single transaction or\r
-arrangement, you convey, or propagate by procuring conveyance of, a\r
-covered work, and grant a patent license to some of the parties\r
-receiving the covered work authorizing them to use, propagate, modify\r
-or convey a specific copy of the covered work, then the patent license\r
-you grant is automatically extended to all recipients of the covered\r
-work and works based on it.\r
-\r
-  A patent license is "discriminatory" if it does not include within\r
-the scope of its coverage, prohibits the exercise of, or is\r
-conditioned on the non-exercise of one or more of the rights that are\r
-specifically granted under this License.  You may not convey a covered\r
-work if you are a party to an arrangement with a third party that is\r
-in the business of distributing software, under which you make payment\r
-to the third party based on the extent of your activity of conveying\r
-the work, and under which the third party grants, to any of the\r
-parties who would receive the covered work from you, a discriminatory\r
-patent license (a) in connection with copies of the covered work\r
-conveyed by you (or copies made from those copies), or (b) primarily\r
-for and in connection with specific products or compilations that\r
-contain the covered work, unless you entered into that arrangement,\r
-or that patent license was granted, prior to 28 March 2007.\r
-\r
-  Nothing in this License shall be construed as excluding or limiting\r
-any implied license or other defenses to infringement that may\r
-otherwise be available to you under applicable patent law.\r
-\r
-  12. No Surrender of Others' Freedom.\r
-\r
-  If conditions are imposed on you (whether by court order, agreement or\r
-otherwise) that contradict the conditions of this License, they do not\r
-excuse you from the conditions of this License.  If you cannot convey a\r
-covered work so as to satisfy simultaneously your obligations under this\r
-License and any other pertinent obligations, then as a consequence you may\r
-not convey it at all.  For example, if you agree to terms that obligate you\r
-to collect a royalty for further conveying from those to whom you convey\r
-the Program, the only way you could satisfy both those terms and this\r
-License would be to refrain entirely from conveying the Program.\r
-\r
-  13. Use with the GNU Affero General Public License.\r
-\r
-  Notwithstanding any other provision of this License, you have\r
-permission to link or combine any covered work with a work licensed\r
-under version 3 of the GNU Affero General Public License into a single\r
-combined work, and to convey the resulting work.  The terms of this\r
-License will continue to apply to the part which is the covered work,\r
-but the special requirements of the GNU Affero General Public License,\r
-section 13, concerning interaction through a network will apply to the\r
-combination as such.\r
-\r
-  14. Revised Versions of this License.\r
-\r
-  The Free Software Foundation may publish revised and/or new versions of\r
-the GNU General Public License from time to time.  Such new versions will\r
-be similar in spirit to the present version, but may differ in detail to\r
-address new problems or concerns.\r
-\r
-  Each version is given a distinguishing version number.  If the\r
-Program specifies that a certain numbered version of the GNU General\r
-Public License "or any later version" applies to it, you have the\r
-option of following the terms and conditions either of that numbered\r
-version or of any later version published by the Free Software\r
-Foundation.  If the Program does not specify a version number of the\r
-GNU General Public License, you may choose any version ever published\r
-by the Free Software Foundation.\r
-\r
-  If the Program specifies that a proxy can decide which future\r
-versions of the GNU General Public License can be used, that proxy's\r
-public statement of acceptance of a version permanently authorizes you\r
-to choose that version for the Program.\r
-\r
-  Later license versions may give you additional or different\r
-permissions.  However, no additional obligations are imposed on any\r
-author or copyright holder as a result of your choosing to follow a\r
-later version.\r
-\r
-  15. Disclaimer of Warranty.\r
-\r
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\r
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\r
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY\r
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\r
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\r
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\r
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\r
-\r
-  16. Limitation of Liability.\r
-\r
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\r
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\r
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\r
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\r
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\r
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\r
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\r
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\r
-SUCH DAMAGES.\r
-\r
-  17. Interpretation of Sections 15 and 16.\r
-\r
-  If the disclaimer of warranty and limitation of liability provided\r
-above cannot be given local legal effect according to their terms,\r
-reviewing courts shall apply local law that most closely approximates\r
-an absolute waiver of all civil liability in connection with the\r
-Program, unless a warranty or assumption of liability accompanies a\r
-copy of the Program in return for a fee.\r
-\r
-                     END OF TERMS AND CONDITIONS\r
-\r
-            How to Apply These Terms to Your New Programs\r
-\r
-  If you develop a new program, and you want it to be of the greatest\r
-possible use to the public, the best way to achieve this is to make it\r
-free software which everyone can redistribute and change under these terms.\r
-\r
-  To do so, attach the following notices to the program.  It is safest\r
-to attach them to the start of each source file to most effectively\r
-state the exclusion of warranty; and each file should have at least\r
-the "copyright" line and a pointer to where the full notice is found.\r
-\r
-    <one line to give the program's name and a brief idea of what it does.>\r
-    Copyright (C) <year>  <name of author>\r
-\r
-    This program is free software: you can redistribute it and/or modify\r
-    it under the terms of the GNU General Public License as published by\r
-    the Free Software Foundation, either version 3 of the License, or\r
-    (at your option) any later version.\r
-\r
-    This program is distributed in the hope that it will be useful,\r
-    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-    GNU General Public License for more details.\r
-\r
-    You should have received a copy of the GNU General Public License\r
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
-\r
-Also add information on how to contact you by electronic and paper mail.\r
-\r
-  If the program does terminal interaction, make it output a short\r
-notice like this when it starts in an interactive mode:\r
-\r
-    <program>  Copyright (C) <year>  <name of author>\r
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\r
-    This is free software, and you are welcome to redistribute it\r
-    under certain conditions; type `show c' for details.\r
-\r
-The hypothetical commands `show w' and `show c' should show the appropriate\r
-parts of the General Public License.  Of course, your program's commands\r
-might be different; for a GUI interface, you would use an "about box".\r
-\r
-  You should also get your employer (if you work as a programmer) or school,\r
-if any, to sign a "copyright disclaimer" for the program, if necessary.\r
-For more information on this, and how to apply and follow the GNU GPL, see\r
-<http://www.gnu.org/licenses/>.\r
-\r
-  The GNU General Public License does not permit incorporating your program\r
-into proprietary programs.  If your program is a subroutine library, you\r
-may consider it more useful to permit linking proprietary applications with\r
-the library.  If this is what you want to do, use the GNU Lesser General\r
-Public License instead of this License.  But first, please read\r
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.\r

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml
deleted file mode 100644 (file)
index 4e6624f..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
- <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
-   m:full-path="config.xcu"/>
-</m:manifest>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu
deleted file mode 100644 (file)
index 4f366c3..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths/Iconset/InternalPaths">
-  <node oor:name="%origin%/iconsets" oor:op="fuse"/>
- </item>
-</oor:items>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml
deleted file mode 100644 (file)
index e5294fc..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<description
- xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:dep="http://openoffice.org/extensions/description/2006"
- xmlns:lo="http://libreoffice.org/extensions/description/2011"
- xmlns:xlink="http://www.w3.org/1999/xlink">
-    <identifier value="org.iconset.tango"/>
-       <version value="1.0"/>
-    <display-name name="Tango Icon Set"/>
-    <dependencies>
-        <lo:LibreOffice-minimal-version d:name="LibreOffice 6.0" value="6.0"/>
-    </dependencies>
-    <publisher>
-           <name xlink:href="git://git.gnome.org/gnome-icon-theme">GNOME icon theme designer</name>
-    </publisher>
-    <icon>
-        <default xlink:href="icons/Tango-Theme.png"/>
-    </icon>
-    <extension-description>
-       <src xlink:href="pkg-desc/pkg-description.txt" />
-    </extension-description>
-    <registration>
-        <simple-license accept-by="admin">
-            <license-text xlink:href="registration/license.txt" lang="en" />
-        </simple-license>
-</registration>
-</description>

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png
deleted file mode 100644 (file)
index c8a0259..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip
deleted file mode 100644 (file)
index 23d9189..0000000
Binary files a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip and /dev/null differ

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt
deleted file mode 100644 (file)
index 73d79df..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tango icons for LibreOffice

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt
deleted file mode 100644 (file)
index 65ec9d1..0000000
--- a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Copyright (c) Alexander Wilms <f.alexander.wilms@gmail.com> and Miroslav Mazel <mazelm@gmail.com>. All rights reserved.\r
-\r
-                Creative Commons Attribution-Share Alike 3.0 United States License\r
-\r
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.\r
-\r
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.\r
-\r
-1. Definitions\r
-\r
-    "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.\r
-    "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.\r
-    "Creative Commons Compatible License" means a license that is listed at https://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.\r
-    "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.\r
-    "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.\r
-    "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.\r
-    "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.\r
-    "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.\r
-    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.\r
-    "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.\r
-    "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.\r
-\r
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.\r
-\r
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:\r
-\r
-    to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;\r
-    to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";\r
-    to Distribute and Publicly Perform the Work including as incorporated in Collections; and,\r
-    to Distribute and Publicly Perform Adaptations.\r
-\r
-    For the avoidance of doubt:\r
-        Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;\r
-        Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,\r
-        Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.\r
-\r
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.\r
-\r
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:\r
-\r
-    You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.\r
-    You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.\r
-    If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.\r
-    Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.\r
-\r
-5. Representations, Warranties and Disclaimer\r
-\r
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.\r
-\r
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\r
-\r
-7. Termination\r
-\r
-    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.\r
-    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.\r
-\r
-8. Miscellaneous\r
-\r
-    Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.\r
-    Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.\r
-    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.\r
-    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.\r
-    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.\r
-    The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.\r
-\r
-    Creative Commons Notice\r
-\r
-    Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.\r
-\r
-    Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License.\r
-\r
-    Creative Commons may be contacted at https://creativecommons.org/.\r

diff --git a/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties b/files/100/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/files/100/local_user.tar b/files/100/local_user.tar
deleted file mode 100644 (file)
index 8445bef..0000000
Binary files a/files/100/local_user.tar and /dev/null differ

diff --git a/files/100/local_xf0r3m.tar b/files/100/local_xf0r3m.tar
deleted file mode 100644 (file)
index a3645bc..0000000
Binary files a/files/100/local_xf0r3m.tar and /dev/null differ

diff --git a/files/100/mimeapps.list b/files/100/mimeapps.list
deleted file mode 100644 (file)
index 979b836..0000000
--- a/files/100/mimeapps.list
+++ /dev/null
@@ -1,7 +0,0 @@
-[Default Applications]
-image/png=org.xfce.ristretto.desktop
-image/jpeg=org.xfce.ristretto.desktop
-
-[Added Associations]
-image/png=org.xfce.ristretto.desktop;
-image/jpeg=org.xfce.ristretto.desktop;

diff --git a/files/100/redshift.conf b/files/100/redshift.conf
deleted file mode 100644 (file)
index d201e61..0000000
--- a/files/100/redshift.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-; Global settings for redshift
-[redshift]
-; Set the day and night screen temperatures
-temp-day=5700
-temp-night=3500
-
-; Disable the smooth fade between temperatures when Redshift starts and stops.
-; 0 will cause an immediate change between screen temperatures.
-; 1 will gradually apply the new screen temperature over a couple of seconds.
-fade=1
-
-; Solar elevation thresholds.
-; By default, Redshift will use the current elevation of the sun to determine
-; whether it is daytime, night or in transition (dawn/dusk). When the sun is
-; above the degrees specified with elevation-high it is considered daytime and
-; below elevation-low it is considered night.
-;elevation-high=3
-;elevation-low=-6
-
-; Custom dawn/dusk intervals.
-; Instead of using the solar elevation, the time intervals of dawn and dusk
-; can be specified manually. The times must be specified as HH:MM in 24-hour
-; format.
-;dawn-time=6:00-7:45
-;dusk-time=18:35-20:15
-
-; Set the screen brightness. Default is 1.0.
-;brightness=0.9
-; It is also possible to use different settings for day and night
-; since version 1.8.
-;brightness-day=0.7
-;brightness-night=0.4
-; Set the screen gamma (for all colors, or each color channel
-; individually)
-gamma=0.8
-;gamma=0.8:0.7:0.8
-; This can also be set individually for day and night since
-; version 1.10.
-;gamma-day=0.8:0.7:0.8
-;gamma-night=0.6
-
-; Set the location-provider: 'geoclue2', 'manual'
-; type 'redshift -l list' to see possible values.
-; The location provider settings are in a different section.
-location-provider=manual
-
-; Set the adjustment-method: 'randr', 'vidmode'
-; type 'redshift -m list' to see all possible values.
-; 'randr' is the preferred method, 'vidmode' is an older API.
-; but works in some cases when 'randr' does not.
-; The adjustment method settings are in a different section.
-adjustment-method=randr
-
-; Configuration of the location-provider:
-; type 'redshift -l PROVIDER:help' to see the settings.
-; ex: 'redshift -l manual:help'
-; Keep in mind that longitudes west of Greenwich (e.g. the Americas)
-; are negative numbers.
-[manual]
-lat=52.2
-lon=20.8
-
-; Configuration of the adjustment-method
-; type 'redshift -m METHOD:help' to see the settings.
-; ex: 'redshift -m randr:help'
-; In this example, randr is configured to adjust only screen 0.
-; Note that the numbering starts from 0, so this is actually the first screen.
-; If this option is not specified, Redshift will try to adjust _all_ screens.
-[randr]
-screen=0

diff --git a/files/100/redshift.desktop b/files/100/redshift.desktop
deleted file mode 100644 (file)
index c21c11e..0000000
--- a/files/100/redshift.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=redshift
-Comment=Kontrola temperatury barw ekranu
-Exec=/usr/bin/redshift
-OnlyShowIn=XFCE;
-RunHook=0
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/files/100/sync.sh/sync.conf b/files/100/sync.sh/sync.conf
deleted file mode 100755 (executable)
index 092f209..0000000
--- a/files/100/sync.sh/sync.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-server="";
-# Użytkownik zdalny
-ruser="";
-# Ścieżka bezwzględna do katalogu użytkownika zdalnego
-rdirectory="";
-
-# Dodatkowe ustawienia SSH, dla RSYNC
-export RSYNC_RSH='';
-
-# Ścieżka do katalogu lokalnego
-ldirectory="";

diff --git a/files/100/terminalrc b/files/100/terminalrc
deleted file mode 100644 (file)
index d692fa9..0000000
--- a/files/100/terminalrc
+++ /dev/null
@@ -1,35 +0,0 @@
-[Configuration]
-BackgroundMode=TERMINAL_BACKGROUND_IMAGE
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=100x30
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscShowRelaunchDialog=TRUE
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-MiscNewTabAdjacent=FALSE
-MiscSearchDialogOpacity=100
-MiscShowUnsafePasteDialog=TRUE
-MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU
-BackgroundImageFile=/usr/share/images/desktop-base/lofi_girl.jpg
-BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_FILLED
-BackgroundImageShading=0,750000
-FontName=Source Code Pro Medium 12
-

diff --git a/files/102/gtk-main.css b/files/102/gtk-main.css
deleted file mode 100644 (file)
index cf86688..0000000
--- a/files/102/gtk-main.css
+++ /dev/null
@@ -1,172 +0,0 @@
-@define-color notes_bg_color #343434;
-@define-color theme_base_color #343434;
-@define-color theme_text_color #eeeeec;
-@define-color theme_bg_color @theme_base_color;
-@define-color theme_fg_color shade (@theme_base_color, 0.3);
-@define-color theme_selected_bg_color shade (@theme_base_color, 0.8);
-@define-color theme_selected_fg_color shade (@theme_base_color, 1.4);
-@define-color insensitive_bg_color shade (@theme_bg_color, 1.1);
-@define-color insensitive_fg_color shade (@theme_fg_color, 1.8);
-
-@define-color borders shade (@theme_base_color, 0.8);
-@define-color frame_color shade (@theme_base_color, 0.7);
-@define-color notebook_active_tab_border shade (@theme_base_color, 1.1);
-@define-color notebook_selected_tab_color shade (@theme_base_color, 0.9);
-
-* {
-       border-width: 0px;
-}
-
-/* window and frame */
-window {
-       /*
-       background-image: linear-gradient(to bottom,
-                                         shade (@theme_base_color, 0.8),
-                                         shade (@theme_base_color, 0.95) 87px);
-                                         */
-}
-
-window frame {
-       padding: 1px 2px 4px 2px;
-       border: 1px solid shade (@theme_base_color, 0.7);
-}
-
-/* icon buttons in window title bar */
-window widget#notes-icon-button {
-       color: #eeeeec;
-       background-color: transparent;
-}
-/*
-window widget#notes-icon-button:active {
-       color: lighter (@theme_fg_color);
-       text-shadow: 1px 1px darker (@theme_bg_color);
-}
-*/
-window widget#notes-icon-button:disabled {
-       color: shade (#343434, 1.2);
-}
-window widget#notes-icon-button:hover {
-       color: shade (#eeeeec, 1.4);
-}
-
-/* notebook */
-notebook > header {
-       background: transparent;
-}
-notebook > header.top {
-       border-bottom: 2px solid @theme_selected_bg_color;
-}
-notebook > header.bottom {
-       border-top: 2px solid @theme_selected_bg_color;
-}
-notebook > header.left {
-       border-right: 2px solid @theme_selected_bg_color;
-}
-notebook > header.right {
-       border-left: 2px solid @theme_selected_bg_color;
-}
-
-/* notebook tab style */
-notebook > header.top tab, notebook > header.bottom tab {
-       padding: 0px 4px;
-}
-notebook > header.right tab, notebook > header.left tab {
-       padding: 4px 0px;
-}
-
-notebook > header tab {
-       box-shadow: none;
-       color: @insensitive_fg_color;
-       background: transparent;
-}
-notebook > header tab:checked {
-       color: shade (@theme_text_color, 0.8);
-}
-notebook > header tab.dnd {
-       background: @theme_selected_bg_color;
-}
-
-notebook > header.top > tabs > tab:checked {
-       box-shadow: inset 0px -3px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
-}
-notebook > header.top > tabs > tab:checked:hover {
-       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color; /* NOTE: must be set before .dnd */
-}
-notebook > header.top > tabs > tab:hover {
-       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.bottom > tabs > tab:checked {
-       box-shadow: inset 0px 3px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
-}
-notebook > header.bottom > tabs > tab:checked:hover {
-       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.bottom > tabs > tab:hover {
-       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.left > tabs > tab:checked {
-       box-shadow: inset -3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-}
-notebook > header.left > tabs > tab:checked:hover {
-       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.left > tabs > tab:hover {
-       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3);
-}
-
-notebook > header.right > tabs > tab:checked {
-       box-shadow: inset 3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-}
-notebook > header.right > tabs > tab:checked:hover {
-       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
-       background: @theme_selected_bg_color;
-}
-notebook > header.right > tabs > tab:hover {
-       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3);
-}
-
-textview > text {
-       color: @theme_text_color;
-       /*
-       background-image: linear-gradient(to bottom,
-                                         shade (@theme_bg_color, 1.2),
-                                         shade (@theme_bg_color, 1.3) 20em);
-                                        */
-       background-image: url("/usr/share/images/desktop-base/notes-background.jpg");
-       background-position: center;
-       background-repeat: no-repeat;
-       background-size: cover;
-       font-weight: bold;
-}
-
-textview > text > selection {
-       color: #343434;
-       background-color: #eeeeec;
-}
-
-scrollbar {
-       background-color: transparent;
-}
-scrollbar slider {
-       background-color: shade (@theme_bg_color, 0.55);
-       min-width: 8px;
-}
-scrollbar slider:hover {
-       background-color: shade (@theme_bg_color, 0.7);
-       transition: 400ms;
-}
-scrollbar slider:hover:active {
-       background-color: shade (@theme_bg_color, 0.55);
-       transition: 200ms;
-}
-
-tooltip, tooltip * {
-       margin: 0px;
-       padding: 0px;
-}
-

diff --git a/files/102/xfce4-keyboard-shortcuts.xml b/files/102/xfce4-keyboard-shortcuts.xml
deleted file mode 100644 (file)
index 71b775a..0000000
--- a/files/102/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;F1" type="empty"/>
-      <property name="&lt;Alt&gt;F2" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;F3" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="empty"/>
-      <property name="XF86Display" type="empty"/>
-      <property name="&lt;Super&gt;p" type="empty"/>
-      <property name="&lt;Primary&gt;Escape" type="empty"/>
-      <property name="XF86WWW" type="empty"/>
-      <property name="HomePage" type="empty"/>
-      <property name="XF86Mail" type="empty"/>
-      <property name="Print" type="empty"/>
-      <property name="&lt;Alt&gt;Print" type="empty"/>
-      <property name="&lt;Shift&gt;Print" type="empty"/>
-      <property name="&lt;Super&gt;e" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="empty"/>
-      <property name="&lt;Super&gt;r" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-      <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder -c">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="Print" type="string" value="xfce4-screenshooter"/>
-      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
-      <property name="&lt;Shift&gt;Print" type="string" value="xfce4-screenshooter -r"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="string" value="thunar"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
-      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
-      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="string" value="xfce4-taskmanager"/>
-      <property name="&lt;Super&gt;e" type="string" value="thunar"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-      <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="override" type="bool" value="true"/>
-      <property name="Super_L" type="string" value="/usr/bin/xfce4-popup-whiskermenu"/>
-    </property>
-  </property>
-  <property name="xfwm4" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;Insert" type="empty"/>
-      <property name="Escape" type="empty"/>
-      <property name="Left" type="empty"/>
-      <property name="Right" type="empty"/>
-      <property name="Up" type="empty"/>
-      <property name="Down" type="empty"/>
-      <property name="&lt;Alt&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
-      <property name="&lt;Alt&gt;F4" type="empty"/>
-      <property name="&lt;Alt&gt;F6" type="empty"/>
-      <property name="&lt;Alt&gt;F7" type="empty"/>
-      <property name="&lt;Alt&gt;F8" type="empty"/>
-      <property name="&lt;Alt&gt;F9" type="empty"/>
-      <property name="&lt;Alt&gt;F10" type="empty"/>
-      <property name="&lt;Alt&gt;F11" type="empty"/>
-      <property name="&lt;Alt&gt;F12" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
-      <property name="&lt;Alt&gt;space" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Super&gt;Tab" type="empty"/>
-      <property name="&lt;Primary&gt;F1" type="empty"/>
-      <property name="&lt;Primary&gt;F2" type="empty"/>
-      <property name="&lt;Primary&gt;F3" type="empty"/>
-      <property name="&lt;Primary&gt;F4" type="empty"/>
-      <property name="&lt;Primary&gt;F5" type="empty"/>
-      <property name="&lt;Primary&gt;F6" type="empty"/>
-      <property name="&lt;Primary&gt;F7" type="empty"/>
-      <property name="&lt;Primary&gt;F8" type="empty"/>
-      <property name="&lt;Primary&gt;F9" type="empty"/>
-      <property name="&lt;Primary&gt;F10" type="empty"/>
-      <property name="&lt;Primary&gt;F11" type="empty"/>
-      <property name="&lt;Primary&gt;F12" type="empty"/>
-      <property name="&lt;Super&gt;KP_Left" type="empty"/>
-      <property name="&lt;Super&gt;KP_Right" type="empty"/>
-      <property name="&lt;Super&gt;KP_Down" type="empty"/>
-      <property name="&lt;Super&gt;KP_Up" type="empty"/>
-      <property name="&lt;Super&gt;KP_Page_Up" type="empty"/>
-      <property name="&lt;Super&gt;KP_Home" type="empty"/>
-      <property name="&lt;Super&gt;KP_End" type="empty"/>
-      <property name="&lt;Super&gt;KP_Next" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Super&gt;KP_Down" type="string" value="tile_up_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Primary&gt;F2" type="string" value="workspace_2_key"/>
-      <property name="&lt;Primary&gt;F6" type="string" value="workspace_6_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="&lt;Super&gt;KP_Up" type="string" value="tile_down_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Primary&gt;F8" type="string" value="workspace_8_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Super&gt;KP_Right" type="string" value="tile_right_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Primary&gt;F3" type="string" value="workspace_3_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Primary&gt;F9" type="string" value="workspace_9_key"/>
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Primary&gt;F4" type="string" value="workspace_4_key"/>
-      <property name="&lt;Super&gt;KP_Page_Up" type="string" value="tile_up_right_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Super&gt;KP_Home" type="string" value="tile_up_left_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Super&gt;KP_Next" type="string" value="tile_down_right_key"/>
-      <property name="&lt;Super&gt;KP_Left" type="string" value="tile_left_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="&lt;Primary&gt;F5" type="string" value="workspace_5_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="&lt;Super&gt;KP_End" type="string" value="tile_down_left_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Primary&gt;F7" type="string" value="workspace_7_key"/>
-      <property name="&lt;Primary&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Primary&gt;F1" type="string" value="workspace_1_key"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="xfwm4"/>
-    <value type="string" value="commands"/>
-  </property>
-</channel>

diff --git a/files/104/LibreWolf (Firejailed).desktop b/files/104/LibreWolf (Firejailed).desktop
deleted file mode 100755 (executable)
index 203686a..0000000
--- a/files/104/LibreWolf (Firejailed).desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LibreWolf (Firejailed)
-Comment=Bezpieczne przeglądanie stron WWW
-Exec=/usr/local/bin/secured-firefox
-Icon=/usr/lib/librewolf/browser/chrome/icons/default/default48.png
-Path=
-Terminal=false
-StartupNotify=false

diff --git a/files/104/librewolf.tgz b/files/104/librewolf.tgz
deleted file mode 100644 (file)
index bdeca33..0000000
Binary files a/files/104/librewolf.tgz and /dev/null differ

diff --git a/files/105/librewolf.tgz b/files/105/librewolf.tgz
deleted file mode 100644 (file)
index 1194919..0000000
Binary files a/files/105/librewolf.tgz and /dev/null differ

diff --git a/files/0/011/Notifier - distro.desktop b/files/Notifier - distro.desktop
similarity index 80%
rename from files/0/011/Notifier - distro.desktop
rename to files/Notifier - distro.desktop
index 497ce3ec78bf22e870456c522bd3ad4d1478d18e..d3f8b6fc556ec3c3d5ca7890e6232d039ef0f63d 100644 (file)
--- a/files/0/011/Notifier - distro.desktop
+++ b/files/Notifier - distro.desktop
@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=Notifier - distro
 Comment=Notifier - distro
-Exec=/usr/local/bin/notifier distro
+Exec=/usr/local/bin/immudex-notifier distro
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false

diff --git a/files/Notifier - packages.desktop b/files/Notifier - packages.desktop
index 1e0c636ed1cff8a36815fcbe22703a23b46d6b08..4675e14f709768aa9fb03005e1c00f93c8a922c7 100644 (file)
--- a/files/Notifier - packages.desktop
+++ b/files/Notifier - packages.desktop
@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=Notifier - packages
 Comment=Notifier - packages
-Exec=/usr/local/bin/notifier packages
+Exec=/usr/local/bin/immudex-notifier packages
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false

diff --git a/files/autostart-x4notes.desktop b/files/autostart-x4notes.desktop
index d0d57c873e275e4be2015c79db7ff5e30f090d5e..49544be09dd91ffd28a22097b0d51495e7b72164 100644 (file)
--- a/files/autostart-x4notes.desktop
+++ b/files/autostart-x4notes.desktop
@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=autostart-x4notes
 Comment=Uruchamianie xfce4-notes w cryptfs
-Exec=/usr/local/bin/autostart-x4notes
+Exec=/usr/local/bin/immudex-autostart-x4notes
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false

diff --git a/files/0/011/config b/files/config
similarity index 100%
rename from files/0/011/config
rename to files/config

diff --git a/files/0/010/.irssi/default.theme b/files/default.theme
similarity index 100%
rename from files/0/010/.irssi/default.theme
rename to files/default.theme

diff --git a/files/0/011/firejail.config b/files/firejail.config
similarity index 100%
rename from files/0/011/firejail.config
rename to files/firejail.config

diff --git a/files/104/gtk-main.css b/files/gtk-main.css
similarity index 100%
rename from files/104/gtk-main.css
rename to files/gtk-main.css

diff --git a/files/100/immudex_hostname.service b/files/immudex_hostname.service
similarity index 79%
rename from files/100/immudex_hostname.service
rename to files/immudex_hostname.service
index f877706162bbb213deeb508b312a143b48308111..ba3ab19cf3ab47e5e1f77620286adc523faf9ff3 100644 (file)
--- a/files/100/immudex_hostname.service
+++ b/files/immudex_hostname.service
@@ -3,7 +3,7 @@ Description=Set hostname based on Hardware model
 Before=display-manager.service
 [Service]
 Type=OneShot
-ExecStart=/usr/local/bin/immudex_hostname
+ExecStart=/usr/local/bin/immudex-hostname
 RemainAfterExit=yes
 [Install]
 WantedBy=multi-user.target

diff --git a/files/0/010/libreoffice/4/user/autotext/mytexts.bau b/files/libreoffice/4/user/autotext/mytexts.bau
similarity index 100%
rename from files/0/010/libreoffice/4/user/autotext/mytexts.bau
rename to files/libreoffice/4/user/autotext/mytexts.bau

diff --git a/files/0/010/libreoffice/4/user/basic/Standard/Module1.xba b/files/libreoffice/4/user/basic/Standard/Module1.xba
similarity index 100%
rename from files/0/010/libreoffice/4/user/basic/Standard/Module1.xba
rename to files/libreoffice/4/user/basic/Standard/Module1.xba

diff --git a/files/0/010/libreoffice/4/user/basic/Standard/dialog.xlb b/files/libreoffice/4/user/basic/Standard/dialog.xlb
similarity index 100%
rename from files/0/010/libreoffice/4/user/basic/Standard/dialog.xlb
rename to files/libreoffice/4/user/basic/Standard/dialog.xlb

diff --git a/files/0/010/libreoffice/4/user/basic/Standard/script.xlb b/files/libreoffice/4/user/basic/Standard/script.xlb
similarity index 100%
rename from files/0/010/libreoffice/4/user/basic/Standard/script.xlb
rename to files/libreoffice/4/user/basic/Standard/script.xlb

diff --git a/files/0/010/libreoffice/4/user/basic/dialog.xlc b/files/libreoffice/4/user/basic/dialog.xlc
similarity index 100%
rename from files/0/010/libreoffice/4/user/basic/dialog.xlc
rename to files/libreoffice/4/user/basic/dialog.xlc

diff --git a/files/0/010/libreoffice/4/user/basic/script.xlc b/files/libreoffice/4/user/basic/script.xlc
similarity index 100%
rename from files/0/010/libreoffice/4/user/basic/script.xlc
rename to files/libreoffice/4/user/basic/script.xlc

diff --git a/files/0/010/libreoffice/4/user/config/autotbl.fmt b/files/libreoffice/4/user/config/autotbl.fmt
similarity index 100%
rename from files/0/010/libreoffice/4/user/config/autotbl.fmt
rename to files/libreoffice/4/user/config/autotbl.fmt

diff --git a/files/0/010/libreoffice/4/user/config/javasettings_Linux_X86_64.xml b/files/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
rename to files/libreoffice/4/user/config/javasettings_Linux_X86_64.xml

diff --git a/files/0/010/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui b/files/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui
similarity index 100%
rename from files/0/010/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui
rename to files/libreoffice/4/user/config/soffice.cfg/modules/scalc/ui/notebookbar.ui

diff --git a/files/0/010/libreoffice/4/user/database/biblio.odb b/files/libreoffice/4/user/database/biblio.odb
similarity index 100%
rename from files/0/010/libreoffice/4/user/database/biblio.odb
rename to files/libreoffice/4/user/database/biblio.odb

diff --git a/files/0/010/libreoffice/4/user/database/biblio/biblio.dbf b/files/libreoffice/4/user/database/biblio/biblio.dbf
similarity index 100%
rename from files/0/010/libreoffice/4/user/database/biblio/biblio.dbf
rename to files/libreoffice/4/user/database/biblio/biblio.dbf

diff --git a/files/0/010/libreoffice/4/user/database/biblio/biblio.dbt b/files/libreoffice/4/user/database/biblio/biblio.dbt
similarity index 100%
rename from files/0/010/libreoffice/4/user/database/biblio/biblio.dbt
rename to files/libreoffice/4/user/database/biblio/biblio.dbt

diff --git a/files/0/010/libreoffice/4/user/extensions/buildid b/files/libreoffice/4/user/extensions/buildid
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/buildid
rename to files/libreoffice/4/user/extensions/buildid

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/extensions.pmap b/files/libreoffice/4/user/extensions/bundled/extensions.pmap
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/extensions.pmap
rename to files/libreoffice/4/user/extensions/bundled/extensions.pmap

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/lastsynchronized b/files/libreoffice/4/user/extensions/bundled/lastsynchronized
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/lastsynchronized
rename to files/libreoffice/4/user/extensions/bundled/lastsynchronized

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/bundled/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/shared/lastsynchronized b/files/libreoffice/4/user/extensions/shared/lastsynchronized
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/shared/lastsynchronized
rename to files/libreoffice/4/user/extensions/shared/lastsynchronized

diff --git a/files/0/010/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/shared/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/tmp/extensions.pmap b/files/libreoffice/4/user/extensions/tmp/extensions.pmap
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/tmp/extensions.pmap
rename to files/libreoffice/4/user/extensions/tmp/extensions.pmap

diff --git a/files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/extensions/tmp/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/gallery/sg30.sdv b/files/libreoffice/4/user/gallery/sg30.sdv
similarity index 100%
rename from files/0/010/libreoffice/4/user/gallery/sg30.sdv
rename to files/libreoffice/4/user/gallery/sg30.sdv

diff --git a/files/0/010/libreoffice/4/user/gallery/sg30.thm b/files/libreoffice/4/user/gallery/sg30.thm
similarity index 100%
rename from files/0/010/libreoffice/4/user/gallery/sg30.thm
rename to files/libreoffice/4/user/gallery/sg30.thm

diff --git a/files/0/010/libreoffice/4/user/pack/ExtensionInfo.pack b/files/libreoffice/4/user/pack/ExtensionInfo.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/ExtensionInfo.pack
rename to files/libreoffice/4/user/pack/ExtensionInfo.pack

diff --git a/files/0/010/libreoffice/4/user/pack/autotext/mytexts.pack b/files/libreoffice/4/user/pack/autotext/mytexts.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/autotext/mytexts.pack
rename to files/libreoffice/4/user/pack/autotext/mytexts.pack

diff --git a/files/0/010/libreoffice/4/user/pack/basic/Standard/Module1.pack b/files/libreoffice/4/user/pack/basic/Standard/Module1.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/basic/Standard/Module1.pack
rename to files/libreoffice/4/user/pack/basic/Standard/Module1.pack

diff --git a/files/0/010/libreoffice/4/user/pack/basic/Standard/dialog.pack b/files/libreoffice/4/user/pack/basic/Standard/dialog.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/basic/Standard/dialog.pack
rename to files/libreoffice/4/user/pack/basic/Standard/dialog.pack

diff --git a/files/0/010/libreoffice/4/user/pack/basic/Standard/script.pack b/files/libreoffice/4/user/pack/basic/Standard/script.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/basic/Standard/script.pack
rename to files/libreoffice/4/user/pack/basic/Standard/script.pack

diff --git a/files/0/010/libreoffice/4/user/pack/basic/dialog.pack b/files/libreoffice/4/user/pack/basic/dialog.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/basic/dialog.pack
rename to files/libreoffice/4/user/pack/basic/dialog.pack

diff --git a/files/0/010/libreoffice/4/user/pack/basic/script.pack b/files/libreoffice/4/user/pack/basic/script.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/basic/script.pack
rename to files/libreoffice/4/user/pack/basic/script.pack

diff --git a/files/0/010/libreoffice/4/user/pack/config/autotbl.pack b/files/libreoffice/4/user/pack/config/autotbl.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/config/autotbl.pack
rename to files/libreoffice/4/user/pack/config/autotbl.pack

diff --git a/files/0/010/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack b/files/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack
rename to files/libreoffice/4/user/pack/config/javasettings_Linux_X86_64.pack

diff --git a/files/0/010/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack b/files/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack
rename to files/libreoffice/4/user/pack/config/soffice.cfg/modules/scalc/ui/notebookbar.pack

diff --git a/files/0/010/libreoffice/4/user/pack/database/biblio.pack b/files/libreoffice/4/user/pack/database/biblio.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/database/biblio.pack
rename to files/libreoffice/4/user/pack/database/biblio.pack

diff --git a/files/0/010/libreoffice/4/user/pack/database/biblio/biblio.pack b/files/libreoffice/4/user/pack/database/biblio/biblio.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/database/biblio/biblio.pack
rename to files/libreoffice/4/user/pack/database/biblio/biblio.pack

diff --git a/files/0/010/libreoffice/4/user/pack/registrymodifications.pack b/files/libreoffice/4/user/pack/registrymodifications.pack
similarity index 100%
rename from files/0/010/libreoffice/4/user/pack/registrymodifications.pack
rename to files/libreoffice/4/user/pack/registrymodifications.pack

diff --git a/files/0/010/libreoffice/4/user/registrymodifications.xcu b/files/libreoffice/4/user/registrymodifications.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/registrymodifications.xcu
rename to files/libreoffice/4/user/registrymodifications.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu1770ujjesq.tmp/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29198uixzcp.tmp/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu29644ujb0o9.tmp/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml b/files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
rename to files/libreoffice/4/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages.pmap b/files/libreoffice/4/user/uno_packages/cache/uno_packages.pmap
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages.pmap
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages.pmap

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/META-INF/manifest.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/description.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/icons/Hicontrast-Theme.png

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/iconsets/images_hicontrast.zip

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/pkg-desc/pkg-description.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxt/registration/license.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu1770ujjesp.tmp_/hicontrast.oxtproperties

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/META-INF/manifest.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/description.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/icons/Oxygen-Theme.png

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/iconsets/images_oxygen.zip

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/pkg-desc/pkg-description.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxt/registration/license.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29198uixzco.tmp_/oxygen-theme.oxtproperties

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/META-INF/manifest.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/config.xcu

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/description.xml

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/icons/Tango-Theme.png

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/iconsets/images_tango.zip

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/pkg-desc/pkg-description.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxt/registration/license.txt

diff --git a/files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties b/files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties
similarity index 100%
rename from files/0/010/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties
rename to files/libreoffice/4/user/uno_packages/cache/uno_packages/lu29644ujb0o8.tmp_/tango-iconset.oxtproperties

diff --git a/files/104/librewolf.desktop b/files/librewolf.desktop
similarity index 100%
rename from files/104/librewolf.desktop
rename to files/librewolf.desktop

diff --git a/files/100/mozilla.tgz b/files/librewolf.tgz
old mode 100644 (file)
new mode 100755 (executable)
similarity index 53%
rename from files/100/mozilla.tgz
rename to files/librewolf.tgz
index 7f9194d..7db1ba0
Binary files a/files/100/mozilla.tgz and b/files/librewolf.tgz differ

diff --git a/files/local_user.tar b/files/local_user.tar
deleted file mode 100644 (file)
index 3b29f5b..0000000
Binary files a/files/local_user.tar and /dev/null differ

diff --git a/files/local_xf0r3m.tar b/files/local_xf0r3m.tar
deleted file mode 100644 (file)
index cc717f9..0000000
Binary files a/files/local_xf0r3m.tar and /dev/null differ

diff --git a/files/mimeapps.list b/files/mimeapps.list
new file mode 100644 (file)
index 0000000..0865853
--- /dev/null
+++ b/files/mimeapps.list
@@ -0,0 +1,109 @@
+[Default Applications]
+image/png=org.xfce.ristretto.desktop
+image/jpeg=org.xfce.ristretto.desktop
+image/avif=org.xfce.ristretto.desktop
+image/bmp=org.xfce.ristretto.desktop
+image/gif=org.xfce.ristretto.desktop
+image/svg+xml=org.xfce.ristretto.desktop
+image/tiff=org.xfce.ristretto.desktop
+image/heif=org.xfce.ristretto.desktop
+image/webp=org.xfce.ristretto.desktop
+inode/directory=thunar.desktop
+inode/symlink=thunar.desktop
+audio/ac3=vlc.desktop
+audio/flac=qmmp-1.desktop
+audio/amr-wb=mpv.desktop
+audio/aac=qmmp-1.desktop
+audio/midi=qmmp-1.desktop
+audio/mp2=qmmp-1.desktop
+audio/mp4=vlc.desktop
+audio/mpeg=qmmp-1.desktop
+audio/ogg=qmmp-1.desktop
+audio/x-flac+ogg=qmmp-1.desktop
+audio/x-mod=qmmp-1.desktop
+audio/x-ms-wma=qmmp-1.desktop
+audio/x-musepack=qmmp-1.desktop
+audio/x-s3m=qmmp-1.desktop
+audio/x-vorbis+ogg=qmmp-1.desktop
+x-content/audio-cdda=vlc.desktop
+audio/x-xm=qmmp-1.desktop
+video/3gpp=vlc.desktop
+video/3gpp2=vlc.desktop
+video/dv=vlc.desktop
+video/mp2t=vlc.desktop
+video/mp4=vlc.desktop
+video/mpeg=vlc.desktop
+video/ogg=vlc.desktop
+video/quicktime=vlc.desktop
+video/vnd.mpegurl=vlc.desktop
+video/vnd.rn-realvideo=vlc.desktop
+video/webm=vlc.desktop
+video/x-anim=vlc.desktop
+video/x-flic=vlc.desktop
+video/x-flv=vlc.desktop
+video/x-matroska=vlc.desktop
+video/x-matroska-3d=vlc.desktop
+video/x-ms-wmv=vlc.desktop
+video/x-msvideo=vlc.desktop
+video/x-ogm+ogg=vlc.desktop
+video/x-nsv=vlc.desktop
+video/x-theora+ogg=vlc.desktop
+x-content/video-dvd=vlc.desktop
+x-content/video-svcd=vlc.desktop
+x-content/video-vcd=vlc.desktop
+audio/x-aiff=vlc.desktop
+
+[Added Associations]
+image/png=org.xfce.ristretto.desktop;
+image/jpeg=org.xfce.ristretto.desktop;
+image/avif=org.xfce.ristretto.desktop;
+image/bmp=org.xfce.ristretto.desktop;
+image/gif=org.xfce.ristretto.desktop;
+image/svg+xml=org.xfce.ristretto.desktop;
+image/tiff=org.xfce.ristretto.desktop;
+image/heif=org.xfce.ristretto.desktop;
+image/webp=org.xfce.ristretto.desktop;
+inode/directory=thunar.desktop;
+inode/symlink=thunar.desktop;
+audio/ac3=vlc.desktop;
+audio/flac=qmmp-1.desktop;
+audio/amr-wb=mpv.desktop;
+audio/aac=qmmp-1.desktop;
+audio/midi=qmmp-1.desktop;
+audio/mp2=qmmp-1.desktop;
+audio/mp4=vlc.desktop;
+audio/mpeg=qmmp-1.desktop;
+audio/ogg=qmmp-1.desktop;
+audio/x-flac+ogg=qmmp-1.desktop;
+audio/x-mod=qmmp-1.desktop;
+audio/x-ms-wma=qmmp-1.desktop;
+audio/x-musepack=qmmp-1.desktop;
+audio/x-s3m=qmmp-1.desktop;
+audio/x-vorbis+ogg=qmmp-1.desktop;
+x-content/audio-cdda=vlc.desktop;
+audio/x-xm=qmmp-1.desktop;
+video/3gpp=vlc.desktop;
+video/3gpp2=vlc.desktop;
+video/dv=vlc.desktop;
+video/mp2t=vlc.desktop;
+video/mp4=vlc.desktop;
+video/mpeg=vlc.desktop;
+video/ogg=vlc.desktop;
+video/quicktime=vlc.desktop;
+video/vnd.mpegurl=vlc.desktop;
+video/vnd.rn-realvideo=vlc.desktop;
+video/webm=vlc.desktop;
+video/x-anim=vlc.desktop;
+video/x-flic=vlc.desktop;
+video/x-flv=vlc.desktop;
+video/x-matroska=vlc.desktop;
+video/x-matroska-3d=vlc.desktop;
+video/x-ms-wmv=vlc.desktop;
+video/x-msvideo=vlc.desktop;
+video/x-ogm+ogg=vlc.desktop;
+video/x-nsv=vlc.desktop;
+video/x-theora+ogg=vlc.desktop;
+x-content/video-dvd=vlc.desktop;
+x-content/video-svcd=vlc.desktop;
+x-content/video-vcd=vlc.desktop;
+audio/x-aiff=vlc.desktop;

diff --git a/files/mimeinfo.cache b/files/mimeinfo.cache
index 6e2bfb923e874111ff76f1dfe107a00ce45f4661..f94bde15cda379f0f7168f62c559f799b092a488 100644 (file)
--- a/files/mimeinfo.cache
+++ b/files/mimeinfo.cache
@@ -323,7 +323,7 @@ image/tiff=org.xfce.ristretto.desktop;
 image/vnd.djvu=atril.desktop;
 image/vnd.djvu+multipage=atril.desktop;
 image/vnd.rn-realpix=org.xfce.Parole.desktop;vlc.desktop;
-image/webp=firefox-esr.desktop;
+image/webp=org.xfce.ristretto.desktop;
 image/x-bzeps=atril.desktop;
 image/x-compressed-xcf=gimp.desktop;
 image/x-emf=libreoffice-draw.desktop;

diff --git a/files/0/011/mozilla.tgz b/files/mozilla.tgz
similarity index 59%
rename from files/0/011/mozilla.tgz
rename to files/mozilla.tgz
index 7f9194d350eb62aba9101a4144d46c1d0b01b24f..451af931777e7d0b7fc93c808af2327a16dcfe79 100644 (file)
Binary files a/files/0/011/mozilla.tgz and b/files/mozilla.tgz differ

diff --git a/files/0/004/redshift.conf b/files/redshift.conf
similarity index 100%
rename from files/0/004/redshift.conf
rename to files/redshift.conf

diff --git a/files/0/004/redshift.desktop b/files/redshift.desktop
similarity index 100%
rename from files/0/004/redshift.desktop
rename to files/redshift.desktop

diff --git a/files/sync.sh/sync.conf b/files/sync.sh/sync.conf
new file mode 100644 (file)
index 0000000..15861c1
--- /dev/null
+++ b/files/sync.sh/sync.conf
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#Config file:
+LDIR="";
+RDIR="";
+RUSER="";
+RSERVER="";
+KEYFILE="";
+SSHOPTS="-i ${KEYFILE}";
+export GIT_SSH_COMMAND="ssh ${SSHOPTS}";
+

diff --git a/files/104/terminalrc b/files/terminalrc
similarity index 100%
rename from files/104/terminalrc
rename to files/terminalrc

diff --git a/files/102/whiskermenu-1.rc b/files/whiskermenu-1.rc
similarity index 89%
rename from files/102/whiskermenu-1.rc
rename to files/whiskermenu-1.rc
index 40e008d8c140b47db526a6ca727477a66925d274..2de1f1178a6486400ef0ca883b386eb50ba39bf6 100644 (file)
--- a/files/102/whiskermenu-1.rc
+++ b/files/whiskermenu-1.rc
@@ -1,5 +1,5 @@
-favorites=xfce4-web-browser.desktop,xfce4-file-manager.desktop
-recent=xfce4-terminal-emulator.desktop,xfce4-terminal.desktop
+favorites=xfce4-web-browser.desktop,xfce4-file-manager.desktop,xfce4-terminal-emulator.desktop,qmmp-1.desktop,gvim.desktop,vlc.desktop,virt-manager.desktop
+recent=vlc.desktop,xfce4-terminal-emulator.desktop,xfce4-terminal.desktop
 button-title=Start
 button-icon=debian-logo
 button-single-row=false
@@ -13,7 +13,7 @@ hover-switch-category=false
 category-show-name=true
 category-icon-size=1
 sort-categories=true
-view-mode=0
+view-mode=1
 default-category=0
 recent-items-max=10
 favorites-in-recent=true

diff --git a/files/103/xfce4-keyboard-shortcuts.xml b/files/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from files/103/xfce4-keyboard-shortcuts.xml
rename to files/xfce4-keyboard-shortcuts.xml

diff --git a/files/103/xfwm4.xml b/files/xfwm4.xml
similarity index 100%
rename from files/103/xfwm4.xml
rename to files/xfwm4.xml

diff --git a/grub/0/amd64/font.pf2 b/grub/0/amd64/font.pf2
deleted file mode 100644 (file)
index 48be6f2..0000000
Binary files a/grub/0/amd64/font.pf2 and /dev/null differ

diff --git a/grub/0/amd64/grub.cfg b/grub/0/amd64/grub.cfg
deleted file mode 100644 (file)
index 3c32f84..0000000
--- a/grub/0/amd64/grub.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-if loadfont $prefix/font.pf2 ; then
-       set gfxmode=800x600
-       set gfxpayload=keep
-       insmod efi_gop
-       insmod efi_uga
-       insmod video_bochs
-       insmod video_cirrcus
-       insmod gfxterm
-       terminal_output gfxterm
-fi
-
-search --set=root --file /DEBIAN
-
-set default="0"
-set timeout=30
-set color_highlight=black/white
-set color_normal=white/black
-menuentry "immudex [EFI/GRUB]" {
-       linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-       initrd ($root)/live/initrd
-}
-
-menuentry "immudex [EFI/GRUB] (nomodeset)" {
-       linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-       initrd ($root)/live/initrd
-}

diff --git a/grub/0/i386/font.pf2 b/grub/0/i386/font.pf2
deleted file mode 100644 (file)
index 48be6f2..0000000
Binary files a/grub/0/i386/font.pf2 and /dev/null differ

diff --git a/grub/0/i386/grub.cfg b/grub/0/i386/grub.cfg
deleted file mode 100644 (file)
index a9a4edc..0000000
--- a/grub/0/i386/grub.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-if loadfont $prefix/font.pf2 ; then
-       set gfxmode=800x600
-       set gfxpayload=keep
-       insmod efi_gop
-       insmod efi_uga
-       insmod video_bochs
-       insmod video_cirrcus
-       insmod gfxterm
-       terminal_output gfxterm
-fi
-
-search --set=root --file /DEBIAN
-
-set default="0"
-set timeout=30
-set color_highlight=black/white
-set color_normal=white/black
-menuentry "immudex i386 [EFI/GRUB]" {
-       linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-       initrd ($root)/live/initrd
-}
-
-menuentry "immudex i386 [EFI/GRUB] (nomodeset)" {
-       linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-       initrd ($root)/live/initrd
-}

diff --git a/grub/amd64/grub.cfg b/grub/amd64/grub.cfg
index 3c32f843a60bb6dc7019abb0b19d30ccdf94ccf9..9cf4cb405acd076fef4d76e15469bc8a8adb62b4 100644 (file)
--- a/grub/amd64/grub.cfg
+++ b/grub/amd64/grub.cfg
@@ -15,12 +15,12 @@ set default="0"
 set timeout=30
 set color_highlight=black/white
 set color_normal=white/black
-menuentry "immudex [EFI/GRUB]" {
+menuentry "immudex (Debian 13) [EFI/GRUB]" {
        linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
        initrd ($root)/live/initrd
 }
 
-menuentry "immudex [EFI/GRUB] (nomodeset)" {
+menuentry "immudex (Debian 13) [EFI/GRUB] (nomodeset)" {
        linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
        initrd ($root)/live/initrd
 }

diff --git a/grub/i386/grub.cfg b/grub/i386/grub.cfg
index a9a4edc7b89fdb9157c113b1fb4c645e8f73b20a..026c28fec3eb929c6f47fcb40d4fa30f64195a34 100644 (file)
--- a/grub/i386/grub.cfg
+++ b/grub/i386/grub.cfg
@@ -15,12 +15,12 @@ set default="0"
 set timeout=30
 set color_highlight=black/white
 set color_normal=white/black
-menuentry "immudex i386 [EFI/GRUB]" {
+menuentry "immudex (Debian 13) i386 [EFI/GRUB]" {
        linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
        initrd ($root)/live/initrd
 }
 
-menuentry "immudex i386 [EFI/GRUB] (nomodeset)" {
+menuentry "immudex (Debian 13) i386 [EFI/GRUB] (nomodeset)" {
        linux ($root)/live/vmlinuz quiet boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
        initrd ($root)/live/initrd
 }

diff --git a/images/0/001/padlock.png b/images/0/001/padlock.png
deleted file mode 100644 (file)
index ea3508a..0000000
Binary files a/images/0/001/padlock.png and /dev/null differ

diff --git a/images/0/001/unlocked.png b/images/0/001/unlocked.png
deleted file mode 100644 (file)
index 96c8833..0000000
Binary files a/images/0/001/unlocked.png and /dev/null differ

diff --git a/images/100/apply.png b/images/100/apply.png
deleted file mode 100644 (file)
index db1244a..0000000
Binary files a/images/100/apply.png and /dev/null differ

diff --git a/images/100/notes-background.jpg b/images/100/notes-background.jpg
deleted file mode 100644 (file)
index 79239b5..0000000
Binary files a/images/100/notes-background.jpg and /dev/null differ

diff --git a/images/100/rss.png b/images/100/rss.png
deleted file mode 100644 (file)
index e8a119e..0000000
Binary files a/images/100/rss.png and /dev/null differ

diff --git a/images/104/lightdm_wallpaper.jpg b/images/104/lightdm_wallpaper.jpg
deleted file mode 100755 (executable)
index 6f7c3fe..0000000
Binary files a/images/104/lightdm_wallpaper.jpg and /dev/null differ

diff --git a/images/0/011/apply.png b/images/apply.png
similarity index 100%
rename from images/0/011/apply.png
rename to images/apply.png

diff --git a/images/0/006/rss.png b/images/rss.png
similarity index 100%
rename from images/0/006/rss.png
rename to images/rss.png

diff --git a/immudex-build b/immudex-build
new file mode 100755 (executable)
index 0000000..6612d02
--- /dev/null
+++ b/immudex-build
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+GREEN="\e[32m";
+ENDCOLOR="\e[0m";
+
+set -e
+
+echo "-== Starting immudex_build: $(date) ==-" >> immudex_build.log;
+
+function help() {
+  echo "-== Help printed: $(date) ==-" >> immudex_build.log;
+  echo "immudex-build - script for building immudex LiveCD.";
+  echo "@ 2023 morketsmerke.org";
+  echo "Usage:";
+  echo " ./immudex-build  --<amd64/i386>";
+}
+
+function create_enviroment() {
+  echo -n "Installation of packages needed to build immudex...";
+  sudo apt update >> immudex_build.log 2>&1;
+  sudo apt install -y debootstrap squashfs-tools xorriso isolinux syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools >> immudex_build.log 2>&1;
+  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+}
+
+#Distributing immudex-testing as meta-distribution there is no such thing like
+#updates. For every new commit in Git service you build new iso image.
+
+#Determing requested architecture and
+if [ "$1" ] && [ "$1" = "--amd64" ]; then arch="64";
+elif [ "$1" ] && [ "$1" = "--i386" ]; then arch="32";
+else
+  help;
+  exit 1;
+fi
+
+if [ ! -f /sbin/debootstrap ]; then
+  create_enviroment 
+fi
+
+#Creating root directory sturcture for immudex build:
+if [ ! -d ${HOME}/build/immudex-testing/${arch} ]; then
+  echo -n "Creating root directory structure for immudex build...";
+  mkdir -pv ${HOME}/build/immudex-testing/${arch} >> immudex_build.log 2>&1;
+  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+fi
+
+#Fetching testing vanilla Debian base system files:
+echo -n "Fetching testing vanilla Debian base system files...";
+sudo /sbin/debootstrap --arch=$(echo $1 | sed 's/-//g') oldstable ${HOME}/build/immudex-testing/${arch}/chroot http://deb.debian.org/debian >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Copying chroot script to chroot directory:
+echo -n "Copying chroot script to chroot directory...";
+sudo cp -vv ${HOME}/immudex-testing/versions/base.sh ${HOME}/build/immudex-testing/${arch}/chroot >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Executing chroot script, at least i trying:
+sudo chroot ${HOME}/build/immudex-testing/${arch}/chroot /bin/bash /base.sh $arch;
+
+#Removing chroot script.
+echo -n "Remove chroot script...";
+sudo rm -vf ${HOME}/build/immudex-testing/${arch}/chroot/base.sh >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Creating LiveCD directory structure:
+echo -n "Creating LiveCD directory structure...";
+mkdir -pv ${HOME}/build/immudex-testing/${arch}/{staging/{EFI/boot,boot/grub/x86_64-efi,isolinux,live},tmp} >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Creating squasfs archive:
+echo -n "Creating squashfs archive...";
+sudo mksquashfs ${HOME}/build/immudex-testing/${arch}/chroot ${HOME}/build/immudex-testing/${arch}/staging/live/filesystem.squashfs -e boot >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Copying kernel and initrd (core files) from chroot:
+echo -n "Copying kernel and initrd (core files) from chroot...";
+cp -v $(ls -v ${HOME}/build/immudex-testing/${arch}/chroot/boot/vmlinuz-* | tail -1) ${HOME}/build/immudex-testing/${arch}/staging/live/vmlinuz >> immudex_build.log 2>&1;
+cp -v $(ls -v ${HOME}/build/immudex-testing/${arch}/chroot/boot/initrd.img-* | tail -1) ${HOME}/build/immudex-testing/${arch}/staging/live/initrd >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Setting version for this image:
+echo "-==Setting version for immudex image: $(date)==-" >> immudex_build.log;
+echo -n "Setting version for this immudex image...";
+git log --pretty=oneline | head -1 | awk '{printf $1}' | tee ${HOME}/build/immudex-testing/${arch}/staging/live/version >> immudex_build.log 2>&1;
+versionShort=$(cut -c 1-7 ${HOME}/build/immudex-testing/${arch}/staging/live/version);
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Getting and copying bootloader files
+echo -n "Copying bootloader files...";
+arch2=$(echo $1 | sed 's/-//g');
+cp -v ${HOME}/immudex-testing/isolinux/${arch2}/* ${HOME}/build/immudex-testing/${arch}/staging/isolinux >> immudex_build.log 2>&1;
+cp -v ${HOME}/immudex-testing/grub/${arch2}/* ${HOME}/build/immudex-testing/${arch}/staging/boot/grub >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Create grubstandalone config:
+echo "-==Create grub-standalone config: $(date)==-" >> immudex_build.log;
+echo -n "Create grub-standalone config...";
+cat >> ${HOME}/build/immudex-testing/${arch}/tmp/grub-standalone.cfg <<EOF
+search --set=root --file /DEBIAN
+set prefix=(\$root)/boot/grub
+configfile /boot/grub/grub.cfg
+EOF
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+
+#Create an empty file, which will be used to set root directory for GRUB:
+echo "-==Create empty file for setting root directory for GRUB: $(date)==-" >> immudex_build.log;
+echo -n "Create empty file for GRUB...";
+touch ${HOME}/build/immudex-testing/${arch}/staging/DEBIAN;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Copying isolinux files:
+echo -n "Copiying isolinux files...";
+cp -v /usr/lib/ISOLINUX/isolinux.bin ${HOME}/build/immudex-testing/${arch}/staging/isolinux >> immudex_build.log 2>&1;
+cp -v /usr/lib/syslinux/modules/bios/* ${HOME}/build/immudex-testing/${arch}/staging/isolinux >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Copying grub files:
+echo -n "Copying isolinux files...";
+cp -rv /usr/lib/grub/x86_64-efi/* ${HOME}/build/immudex-testing/${arch}/staging/boot/grub/x86_64-efi >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Creating grub-efi bootloader file:
+echo "-==Creating grub-efi bootloader file: $(date)==-" >> immudex_build.log;
+echo -n "Creating grub-efi bootloader file...";
+grub-mkstandalone --format=x86_64-efi --output=${HOME}/build/immudex-testing/${arch}/staging/EFI/boot/bootx64.efi --locales="" --fonts="" "boot/grub/grub.cfg=${HOME}/build/immudex-testing/${arch}/tmp/grub-standalone.cfg";
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Creating additional EFI partition:
+oldcwd=$(pwd);
+cd ${HOME}/build/immudex-testing/${arch}/staging/boot/grub;
+echo -n "Creating addtitional EFI partition...";
+dd if=/dev/zero bs=1M of=efiboot.img count=20 >> ${oldcwd}/immudex_build.log 2>&1;
+sudo mkfs.vfat efiboot.img >> immudex_build.log 2>&1;
+echo "-==Creating MS-DOS directory: $(date)==-" >> ${oldcwd}/immudex_build.log;
+sudo mmd -i efiboot.img efi efi/boot >> ${oldcwd}/immudex_build.log 2>&1;
+sudo mcopy -vi efiboot.img ${HOME}/build/immudex-testing/${arch}/staging/EFI/boot/bootx64.efi ::efi/boot >> ${oldcwd}/immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+
+#Create iso image:
+cd $oldcwd;
+echo -n "Creating iso image...";
+xorriso as mkisofs -iso-level 3 -o "immudex-testing${arch}_${versionShort}.iso" -full-iso9660-filenames -volid "immudex-testing${arch}_${versionShort}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -eltorito-boot isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog isolinux/isolinux.cat -eltorito-alt-boot -e /boot/grub/efiboot.img -no-emul-boot -isohybrid-gpt-basdat -append_partition 2 0xef ${HOME}/build/immudex-testing/${arch}/staging/boot/grub/efiboot.img ${HOME}/build/immudex-testing/${arch}/staging >> immudex_build.log 2>&1;
+if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi

diff --git a/immudex_build b/immudex_build
deleted file mode 100755 (executable)
index 214635c..0000000
--- a/immudex_build
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-set -e
-
-echo "-== Starting immudex_build: $(date) ==-" >> immudex_build.log;
-
-function help() {
-  echo "-== Help printed: $(date) ==-" >> immudex_build.log;
-  echo "immudex_build - script for building immudex LiveCD.";
-  echo "morketsmerke.net @ 2022";
-  echo "Options:";
-  echo " --update --<amd64/i386> - scripts doing only three activities, which";
-  echo "  commonly used when upgrading LiveCD image";
-  echo "Usage:";
-  echo " ./immudex_build [--update] --<amd64/i386>";
-}
-
-function create_enviroment() {
-  echo -n "Installation of packages needed to build immudex...";
-  sudo apt update >> ~/immudex_build.log 2>&1;
-  sudo apt install -y debootstrap squashfs-tools xorriso isolinux syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools >> immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-}
-
-#Under this condition i put three activities, which are taking
-#place after updates in chroot environment.
-if [ "$1" ] && [ "$1" = "--update" ]; then
-  if [ "$2" ] && [ "$2" = "--amd64" ]; then arch="64";
-  elif [ "$2" ] && [ "$2" = "--i386" ]; then arch="32";
-  else help; exit 1;
-  fi
-
-  #Creating enviroment:
-  if [ ! -f /sbin/debootstrap ]; then
-    create_enviroment
-  fi
-
-  #Purging staging/live catalog:
-  echo -n "Purging staging/live catalog...";
-  sudo rm -vf ~/immudex/${arch}/staging/live/* >> ~/immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-  #Removing old iso files:
-  echo -n "Removing old iso image...";
-  sudo rm -vf ~/immudex/${arch}/immudex${arch}.iso >> ~/immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-  
-  #Creating squashfs archive:
-  echo -n "Creating squashfs archive...";
-  sudo mksquashfs ~/immudex/${arch}/chroot ~/immudex/${arch}/staging/live/filesystem.squashfs -e boot >> ~/immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-  #Copying kernel and initrd (core files) from chroot:
-  echo -n "Copying kernel and initrd (core files) from chroot...";
-  cp -v $(ls -v ~/immudex/${arch}/chroot/boot/vmlinuz-* | tail -1) ~/immudex/${arch}/staging/live/vmlinuz >> ~/immudex_build.log 2>&1;
-  cp -v $(ls -v ~/immudex/${arch}/chroot/boot/initrd.img-* | tail -1) ~/immudex/${arch}/staging/live/initrd >> ~/immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-  if [ "$3" ]; then
-         echo -n "Creating version file...";
-         echo $3 > ~/immudex/${arch}/staging/live/version;
-         if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-  fi
-
-  #Create iso image:
-  echo -n "Creating iso image...";
-  cd ~/immudex/${arch};
-  xorriso as mkisofs -iso-level 3 -o "immudex${arch}.iso" -full-iso9660-filenames -volid "immudex${arch}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -eltorito-boot isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog isolinux/isolinux.cat -eltorito-alt-boot -e /boot/grub/efiboot.img -no-emul-boot -isohybrid-gpt-basdat -append_partition 2 0xef ~/immudex/${arch}/staging/boot/grub/efiboot.img ~/immudex/${arch}/staging >> ~/immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-  exit 0;
-fi
-
-#Determing requested architecture and
-if [ "$1" ] && [ "$1" = "--amd64" ]; then arch="64";
-elif [ "$1" ] && [ "$1" = "--i386" ]; then arch="32";
-else
-  help;
-  exit 1;
-fi
-
-if [ ! -f /sbin/debootstrap ]; then
-  #Creating enviroment:
-  create_enviroment
-  #echo -n "Installation of packages needed to build immudex...";
-  #sudo apt update >> immudex_build.log 2>&1;
-  #sudo apt install -y debootstrap squashfs-tools xorriso isolinux syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools >> immudex_build.log 2>&1;
-  #if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi
-
-#Creating root directory sturcture for immudex build:
-if [ ! -d ~/immudex/${arch} ]; then
-  echo -n "Creating root directory structure for immudex build...";
-  mkdir -pv ~/immudex/${arch} >> immudex_build.log 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi
-
-#Fetching stable vanilla Debian base system files:
-echo -n "Fetching stable vanilla Debian base system files...";
-sudo /sbin/debootstrap --arch=$(echo $1 | sed 's/-//g') bullseye ~/immudex/${arch}/chroot http://ftp.icm.edu.pl/debian >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Getting project files:
-echo -n "Getting project files:";
-mkdir -v ~/Pobrane >> immudex_build.log 2>&1;
-cd ~/Pobrane;
-git clone https://github.com/xf0r3m/immudex.git >> ~/immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-
-#Copying chroot script to chroot directory:
-echo -n "Copying chroot script to chroot directory...";
-sudo cp -vv ~/Pobrane/immudex/versions/base.sh ~/immudex/${arch}/chroot >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Executing chroot script, at least i trying:
-sudo chroot ~/immudex/${arch}/chroot /bin/bash /base.sh $arch;
-
-#Removing chroot script.
-echo -n "Remove chroot script...";
-sudo rm -vf ~/immudex/${arch}/chroot/base.sh >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-versionsList=$(ls -v ~/Pobrane/immudex/versions --hide=base.sh --hide=100.sh | awk '{printf $1" "}');
-for i in $versionsList; do
-       echo -n "Executing version script: $i ...";
-       sudo cp -v ~/Pobrane/immudex/versions/${i} ~/immudex/${arch}/chroot >> ~/immudex_build.log 2>&1;
-       sudo chroot ~/immudex/${arch}/chroot /bin/bash $i;
-       sudo rm -vf ~/immudex/${arch}/chroot/${i} >> ~/immudex_build.log 2>&1;
-       if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-done
-
-#Creating LiveCD directory structure:
-echo -n "Creating LiveCD directory structure...";
-mkdir -pv ~/immudex/${arch}/{staging/{EFI/boot,boot/grub/x86_64-efi,isolinux,live},tmp} >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Creating squasfs archive:
-echo -n "Creating squashfs archive...";
-sudo mksquashfs ~/immudex/${arch}/chroot ~/immudex/${arch}/staging/live/filesystem.squashfs -e boot >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Copying kernel and initrd (core files) from chroot:
-echo -n "Copying kernel and initrd (core files) from chroot...";
-cp -v $(ls -v ~/immudex/${arch}/chroot/boot/vmlinuz-* | tail -1) ~/immudex/${arch}/staging/live/vmlinuz >> immudex_build.log 2>&1;
-cp -v $(ls -v ~/immudex/${arch}/chroot/boot/initrd.img-* | tail -1) ~/immudex/${arch}/staging/live/initrd >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Getting and copying bootloader files
-echo -n "Copying bootloader files...";
-arch2=$(echo $1 | sed 's/-//g');
-cp -v immudex/isolinux/${arch2}/* ~/immudex/${arch}/staging/isolinux >> ~/immudex_build.log 2>&1;
-cp -v immudex/grub/${arch2}/* ~/immudex/${arch}/staging/boot/grub >> ~/immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Removing Pobrane dir
-echo -n "Removing Pobrane directory...";
-cd ~;
-rm -rvf ~/Pobrane >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Create grubstandalone config:
-echo "-==Create grub-standalone config: $(date)==-" >> immudex_build.log;
-echo -n "Create grub-standalone config...";
-cat >> ~/immudex/${arch}/tmp/grub-standalone.cfg <<EOF
-search --set=root --file /DEBIAN
-set prefix=(\$root)/boot/grub
-configfile /boot/grub/grub.cfg
-EOF
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-
-#Create an empty file, which will be used to set root directory for GRUB:
-echo "-==Create empty file for setting root directory for GRUB: $(date)==-" >> immudex_build.log;
-echo -n "Create empty file for GRUB...";
-touch ~/immudex/${arch}/staging/DEBIAN;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Copying isolinux files:
-echo -n "Copiying isolinux files...";
-cp -v /usr/lib/ISOLINUX/isolinux.bin ~/immudex/${arch}/staging/isolinux >> immudex_build.log 2>&1;
-cp -v /usr/lib/syslinux/modules/bios/* ~/immudex/${arch}/staging/isolinux >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Copying grub files:
-echo -n "Copying isolinux files...";
-cp -rv /usr/lib/grub/x86_64-efi/* ~/immudex/${arch}/staging/boot/grub/x86_64-efi >> immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Creating grub-efi bootloader file:
-echo "-==Creating grub-efi bootloader file: $(date)==-" >> immudex_build.log;
-echo -n "Creating grub-efi bootloader file...";
-myHOME=$(pwd);
-grub-mkstandalone --format=x86_64-efi --output=${myHOME}/immudex/${arch}/staging/EFI/boot/bootx64.efi --locales="" --fonts="" "boot/grub/grub.cfg=${myHOME}/immudex/${arch}/tmp/grub-standalone.cfg";
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Creating additional EFI partition:
-cd ~/immudex/${arch}/staging/boot/grub;
-echo -n "Creating addtitional EFI partition...";
-dd if=/dev/zero bs=1M of=efiboot.img count=20 >> ~/immudex_build.log 2>&1;
-sudo mkfs.vfat efiboot.img >> ~/immudex_build.log 2>&1;
-echo "-==Creating MS-DOS directory: $(date)==-" >> ~/immudex_build.log;
-sudo mmd -i efiboot.img efi efi/boot >> ~/immudex_build.log 2>&1;
-sudo mcopy -vi efiboot.img ~/immudex/${arch}/staging/EFI/boot/bootx64.efi ::efi/boot >> ~/immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-#Create iso image:
-echo -n "Creating iso image...";
-cd ~/immudex/${arch};
-xorriso as mkisofs -iso-level 3 -o "immudex${arch}.iso" -full-iso9660-filenames -volid "immudex${arch}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -eltorito-boot isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog isolinux/isolinux.cat -eltorito-alt-boot -e /boot/grub/efiboot.img -no-emul-boot -isohybrid-gpt-basdat -append_partition 2 0xef ~/immudex/${arch}/staging/boot/grub/efiboot.img ~/immudex/${arch}/staging >> ~/immudex_build.log 2>&1;
-if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi

diff --git a/immudex_upload b/immudex_upload
deleted file mode 100755 (executable)
index 7b30bc1..0000000
--- a/immudex_upload
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SERVER="";
-RUSER="";
-LDIR=$1;
-RDIR=$2;
-SSH_OPT="";
-
-export RSYNC_RSH="ssh ${SSH_OPT}";
-
-rsync -avu --progress ${LDIR} ${RUSER}@${SERVER}:${RDIR};
-
-if echo $RDIR | grep -q 'upgrades'; then
-  VERSION=$(basename ${LDIR});
-  ssh ${SSH_OPT} ${RUSER}@${SERVER} "if [ -a ${RDIR}/latest ]; then rm ${RDIR}/latest; fi";
-  ssh ${SSH_OPT} ${RUSER}@${SERVER} "ln -s ${RDIR}/${VERSION} ${RDIR}/latest";
-fi

diff --git a/improvements.txt b/improvements.txt
deleted file mode 100644 (file)
index 56911db..0000000
--- a/improvements.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-1. Skrypt do otwierania, wyświetlania i zamykania partycji LUKS.
--= Done =-
-===========================================================================
-2. Skrypt to importowania kluczy SSH
--= Done =-
-===========================================================================
-3. Skrypt do importowania kluczy GPG (Wskazówka: https://stackoverflow.com/questions/13116457/how-to-make-auto-trust-gpg-public-key)
--= Done =-
-==========================================================================
-3,5. Skrypt aktualizacji immudex
--= Done =-
-==========================================================================
-4. Zastąpienie firefox, LibreWolf.
--= Canceled =- Nie ma wersji 32-bitowej, więc albo obie wersje albo żadna.
-Mógłbym użyć GNU IceCat albo Tor Browser, ale chce aby immudex dalej
-pozostawał normalnie funkcjonującym systemem na zasadzie LiveCD, nie chce
-również dodawać kolejnych dodatkowych megabajtów, 1.4GB na to dużo jak na
-moje standardy a z kolejnym aktualizacjami pewnie będzie jeszcze więcej.
-==========================================================================
-5. MOTD, podczas uruchomiania terminala. Bardzo proste, napis immudex
-stworzony przez figlet a pod nim informacja czy są dostępne aktualizacje.
--= Done =-
-==========================================================================
-6. Skrypt buildu immudex.
--= Done =-
-==========================================================================
-7. Padlock.
-Aktywator XFCE, który uruchomi skrypt w terminalu, w którym to do wyboru
-będą dostępne zaszyfrowane partycje (za pomocą pętli select). Wybrana
-partycja zostanie otworzona i zamontowana. Na koniec skrypt otworzy
-terminal w punkcie montowania.
--= Done =-
-==========================================================================
-8. shoutcasts.
-Skrypt odszukujący stacji shoutcastowych na podstawie słowa kluczowego.
-Skrypt przeszukuje katalog projektu xiph.org, zwracając listę dostępnych
-stacji (streamów), następnie użytkownik wybiera jedną. Jej adres zostaje
-skopiowany do schowka i może zostać użyty w QMMP do podłączenia się do
-streamu. (Opcja playlisty "Dodaj URL").
--= Done =-
-==========================================================================
-9. Aplety XFCE.
-Skrypt uruchamiający się w plikach startowych powłoki, konfigurujący zegary 
-na górnym pasku, głównie usunięcie swapu, ustawienie interfejsu sieciowego, 
-oraz wskaźnik zużycia przestrzenii wybranej partycji.
--= Cancelled =- Tego typu zmiany dokonywane są tylko i wyłącznie z poziomu
-rewindingu.
-==========================================================================
-10. Wyłączenie komunikatów jądra podczas bootwania oraz zmniejszenie
-wielkości rootfs (overlay) do 25% pamięci.
--= Done =-
-==========================================================================
-11. immudex_crypt powinien tworzyć punkty montowania oraz automatycznie
-montować odblokowywane LUKS-y.
--= Done =-
-==========================================================================
-12. Ukrycie outputu nie których poleceń w skrypcie ytaudio, wyswietlenie
-help-a jeśli nie podano argumentu.
--= Done =-
-==========================================================================
-13. Automatyczne zerowanie pierwszego megabajta wybranego dysku do
-instalacji immudex (immudex_install).
--= Done =-
-==========================================================================
-14. ytaudio. Zamiana pliku binarnego youtube-dl z yt-dlp. Możliwość 
-podania linku jako argumentu oraz odtwarzania filmów 
-(--audio(-a) lub --video(-v)). Przekszatałcenie ytaudio w ytplay
--= Done =-
-==========================================================================
-15. Alias chhome ustawiający katalog domowy na CWD.
--= Done =-
-==========================================================================
-16. Zmiana mousepad na gVim.
--= Done =-
-==========================================================================
-17. Instalacja oraz konfiguracja programu Redshift.
--= Done =-
-==========================================================================
-18. Instalacja transmission-gtk
--= Done =-
-==========================================================================
-19. Dodanie możliwości podania opcji --ytdl-format do yt-play.
--= Done =- Dodanie również możliwości odtwarzania treści na żywo z poziomu 
-wyszukiwarki.
-==========================================================================
-20. Zmiana domyślnego TIMEOUT w menu GRUB w trybie EFI z 30 sekund na 5.
--= Done =-
-==========================================================================
-21. Ustawienie strony głównej firefox na 
-https://searx.morketsmerke.net/searxng
--= Done =-
-==========================================================================
-22. Utworznie dodatku do firefox-a, na podstawie: 
-https://gitlab.com/jjustra/search-searx, 
-który umożliwi dodanie https://searx.morketsmerke.net/searxng jako search 
-engine-u.
-https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension
--= Done =-
-==========================================================================
-23. Dodanie wsparcia dla 32-bitowego EFI do immudex_install
--= BETA =-
-==========================================================================
-24. Utworzenie narzędzia pozwalającego utworzyć nośnik instalacyjny na USB
-dla systemów opartych na 32-bitowym EFI.
--= BETA =-
-==========================================================================
-25. Zmiana domyślnego zestawu ikon dla LibreOffice, domyślne ikony niebyły
-widoczne w przypadku ciemnego schematu kolorów (adwaita (dark)).
--= BETA =-
-==========================================================================
-26. Dodanie irssi do autostartu użytkownika xf0r3m.
--= BETA =-
-==========================================================================
-27. Dodanie pakietów nmap nfs-common oraz remmina (z pakietami rekomendowanymi)
--= Done =-
-==========================================================================
-28. Dodanie opcji RELOAD przy wynikach wyszukiwania ytplay, aby odpytać
-YT jeszcze raz o te same "keywords".
--= BETA =- (Zamiast numer filmu podaje się 'r' lub 'R')
-==========================================================================
-29. Wyświetlenie obok urządzeń w immudex_crypt ich rozmiaru. Sprawdzenie i 
-ewentualne otwierania cryptfs przez UUID.

diff --git a/install_morketsmerke b/install_morketsmerke
deleted file mode 100755 (executable)
index e64fdd7..0000000
--- a/install_morketsmerke
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-if [ -d morketsmerke.github.io ]; then rm -rf morketsmerke.github.io; fi
-if [ ! -d morketsmerke.github.io ]; then
-  git clone https://github.com/morketsmerke/morketsmerke.github.io;
-else
-  exit 1;
-fi
-
-function R() {
-  
-  if [ "$path" ]; then path=${path}/${1};
-  else path=$1;
-  fi
-  
-  fileList=$(ls $path);
-  for file in $fileList; do
-    if [ -d ${path}/${file} ]; then R ${file};
-    else
-      sed -i 's@https://morketsmerke.github.io/@/usr/share/doc/morketsmerke/index.html@' ${path}/${file};
-      sed -i 's@https://morketsmerke.github.io@/usr/share/doc/morketsmerke/index.html@'  ${path}/${file};
-      sed -i 's@/style.css@/usr/share/doc/morketsmerke/style.css@' ${path}/${file};
-    fi
-  done
-  path=$(echo $path | sed "s@/$1@@")
-
-}
-
-R morketsmerke.github.io
-
-sudo mv morketsmerke.github.io /usr/share/doc/morketsmerke

diff --git a/isolinux/0/amd64/black_screen.png b/isolinux/0/amd64/black_screen.png
deleted file mode 100644 (file)
index f66ec3d..0000000
Binary files a/isolinux/0/amd64/black_screen.png and /dev/null differ

diff --git a/isolinux/0/amd64/isolinux.cfg b/isolinux/0/amd64/isolinux.cfg
deleted file mode 100644 (file)
index 792e33c..0000000
--- a/isolinux/0/amd64/isolinux.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-UI vesamenu.c32
-
-MENU TITLE immudex (Debian 11) LiveCD amd64
-DEFAULT linux
-TIMEOUT 300
-MENU RESOLUTION 640 480
-MENU BACKGROUND black_screen.png
-MENU COLOR TITLE 1;37;40 #a0ffffff #00000000 std
-MENU COLOR BORDER 37;40        #a0ffffff #00000000 std
-MENU COLOR UNSEL 37;40 #a0ffffff #00000000 std
-MENU COLOR SEL 7;34;32 #ff0000ff #a0ffffff none
-MENU COLOR TABMSG 37;40 #a0ffffff #00000000 std
-MENU COLOR TIMEOUT_MSG 37;40 #a0ffffff #00000000 std
-MENU COLOR TIMEOUT 1;32;40 #a000fa00 #00000000 std
-
-LABEL linux
-       MENU LABEL immudex [BIOS/ISOLINUX]
-       MENU DEFAULT
-       KERNEL /live/vmlinuz
-       APPEND quiet initrd=/live/initrd boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-
-LABEL linux
-       MENU LABEL immudex [BIOS/ISOLINUX] (nomodeset)
-       MENU DEFAULT
-       KERNEL /live/vmlinuz
-       APPEND quiet initrd=/live/initrd boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor nomodeset
-

diff --git a/isolinux/0/i386/black_screen.png b/isolinux/0/i386/black_screen.png
deleted file mode 100644 (file)
index f66ec3d..0000000
Binary files a/isolinux/0/i386/black_screen.png and /dev/null differ

diff --git a/isolinux/0/i386/isolinux.cfg b/isolinux/0/i386/isolinux.cfg
deleted file mode 100644 (file)
index 2230e1e..0000000
--- a/isolinux/0/i386/isolinux.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-UI vesamenu.c32
-
-MENU TITLE immudex (Debian 11) LiveCD i386
-DEFAULT linux
-TIMEOUT 300
-MENU RESOLUTION 640 480
-MENU BACKGROUND black_screen.png
-MENU COLOR TITLE 1;37;40 #a0ffffff #00000000 std
-MENU COLOR BORDER 37;40        #a0ffffff #00000000 std
-MENU COLOR UNSEL 37;40 #a0ffffff #00000000 std
-MENU COLOR SEL 7;34;32 #ff0000ff #a0ffffff none
-MENU COLOR TABMSG 37;40 #a0ffffff #00000000 std
-MENU COLOR TIMEOUT_MSG 37;40 #a0ffffff #00000000 std
-MENU COLOR TIMEOUT 1;32;40 #a000fa00 #00000000 std
-
-LABEL linux
-       MENU LABEL immudex [BIOS/ISOLINUX]
-       MENU DEFAULT
-       KERNEL /live/vmlinuz
-       APPEND quiet initrd=/live/initrd boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor
-
-LABEL linux
-       MENU LABEL immudex [BIOS/ISOLINUX] (nomodeset)
-       MENU DEFAULT
-       KERNEL /live/vmlinuz
-       APPEND quiet initrd=/live/initrd boot=live bootfrom=removable overlay-size=25% apparmor=1 security=apparmor nomodeset
-

diff --git a/isolinux/amd64/isolinux.cfg b/isolinux/amd64/isolinux.cfg
index 170f252e61a95fbf774b7b27ef4516210e72fc0a..1e876e3ac68f5638507396f2bc83ea1e3c563066 100644 (file)
--- a/isolinux/amd64/isolinux.cfg
+++ b/isolinux/amd64/isolinux.cfg
@@ -1,6 +1,6 @@
 UI vesamenu.c32
 
-MENU TITLE immudex (Debian 12) LiveCD amd64
+MENU TITLE immudex (Debian 13) LiveCD amd64
 DEFAULT linux
 TIMEOUT 300
 MENU RESOLUTION 640 480

diff --git a/isolinux/i386/isolinux.cfg b/isolinux/i386/isolinux.cfg
index 09eacfe219d88c6ab68caa5e6d796cb956172d0b..9f81063cea67b4c61cb07db67474551aa871554f 100644 (file)
--- a/isolinux/i386/isolinux.cfg
+++ b/isolinux/i386/isolinux.cfg
@@ -1,6 +1,6 @@
 UI vesamenu.c32
 
-MENU TITLE immudex (Debian 12) LiveCD i386
+MENU TITLE immudex (Debian 13) LiveCD i386
 DEFAULT linux
 TIMEOUT 300
 MENU RESOLUTION 640 480

diff --git a/issues.txt b/issues.txt
deleted file mode 100644 (file)
index 961f0da..0000000
--- a/issues.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-1. Protected nie działa jeśli jest więcej niż jeden otwarty LUKS w systemie:
-       Jeśli w systemie jest otwarty (zamontowany) nie używany LUKS, to
-       protected zamknie go i utworzy żądany proces. Nie sprawdza czy w
-       systemie jest więcej otwartych (zamontowanych) partycji LUKS.
-
-  --= Fixed =--
-===========================================================================
-2. Wbudowani użytkownicy nie znajdują się w grupach libvirt oraz 
-libvirt-qemu.
-  --= Fixed =--
-===========================================================================
-3. Plik odpowiadający za polecenie ping nie ma ustawionego bitu SETUID,
-przez co polecenie wymaga podniesienia uprawnień.
-  --= Fixed =--
-===========================================================================
-4. Padlock. Brak powiadomienia o tym, że nie można odmontować zaszyfowanej
-partycji, kiedy wewnątrz niej zamontowany jest inny system plików.
-  --= Fixed =--
-===========================================================================
-5. Błąd w poleceniach sed w skrypcie wersji 002.sh
-  --= Fixed =--
-===========================================================================
-6. Zawieszenie się systemu po załadowaniu środowiska graficznego przy
-uruchomieniu w trybie UEFI.
-  --= Fixed =--
-===========================================================================
-7. Czasami podczas wyświetlania motd pojawia się taki komunikat:
-  df: /run/user/1001/doc: Operacja niedozwolona
-komunikat pojawia się podczas wyświetlania informacji o szyfrowanych
-dyskach.
-  --= Fixed =--
-==========================================================================
-8. Domyślna sieć KVM nie startuje automatycznie.
-  --= Fixed =-- Patrz: autostart_domyślnej_sieci_kvm.txt
-==========================================================================
-9. Po wylogowaniu i ponownym zalogowaniu protected nie działa jak powinno.
-  --= Misunderstanding =-- Skrypt protected działa prawidło, nie zmieniona
-  pozostaje jedynie ikona launchera padlock.
-==========================================================================
-10. Index w immudex_crypt nie jest jednoznaczny dla indeksów przy
-urządzeniach /dev/dm-X. Jeśli z trzech zamontowanych cryptfs-ów odmontujemy
-środkowy (nr. 1), to kolejnym indeksem w immudex_crypt będzie 3. Natomiast
-system przypisze dysk pod /dev/dm-1, przez co skrypt nie może prawidłowo 
-określić istnienia systemu plików (np. ext4) na odblokowanym cryptfs.
-  --= Fixed =--
-==========================================================================
-11. Poprawić funkcję pomocy dla immudex_crypt. Zamiast "crypt" zapisano 
-  poszczególne opcje.
-  --= Fixed =--
-==========================================================================
-12. Funkcja tidy szblonu plików wersji nie usuwa pobranego z GH katalogu
-projektu.
-  --= Fixed =--
-==========================================================================
-13. Może być tak, że narzędzie immudex_upgrade nie uzyska informacji o wersji.
-To jeśli plik /tmp/ltver istnieje to powinno się kontrolować czy jego rozmiar
-jest większy od 0. Jeśli nie to wówczas funkcja powinna spróbować pobrać ten
-plik ponownie. Oczywiście przy następnym uruchomieniu polecenia.

diff --git a/launchers/0/001/launcher-29/16633324331.desktop b/launchers/0/001/launcher-29/16633324331.desktop
deleted file mode 100755 (executable)
index 36620d4..0000000
--- a/launchers/0/001/launcher-29/16633324331.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Padlock
-Comment=Unlock and lock LUKS partitions
-Exec=/usr/local/bin/padlock --unlock
-Icon=/usr/share/images/desktop-base/padlock.png
-Path=
-Terminal=true
-StartupNotify=false

diff --git a/launchers/0/004/16674118881.desktop b/launchers/0/004/16674118881.desktop
deleted file mode 100644 (file)
index 35142f7..0000000
--- a/launchers/0/004/16674118881.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=GVim
-GenericName=Text Editor
-Comment=Edit text files
-GenericName[pl]=Edytor tekstu
-Comment[pl]=Edytuj pliki tekstowe
-TryExec=gvim
-Exec=gvim -f %F
-Terminal=false
-Type=Application
-Keywords=Text;editor;
-Icon=gvim
-Categories=Utility;TextEditor;
-StartupNotify=true
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-X-XFCE-Source=file:///usr/share/applications/gvim.desktop

diff --git a/launchers/0/16608166085.desktop b/launchers/0/16608166085.desktop
deleted file mode 100644 (file)
index 0adf8d7..0000000
--- a/launchers/0/16608166085.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=(Protected) Firefox ESR
-Name[pl]=(Protected) Firefox ESR
-Comment=Browse the World Wide Web
-Comment[pl]=Przeglądanie stron WWW 
-GenericName=Web Browser
-GenericName[pl]=Przeglądarka WWW
-X-GNOME-FullName=Firefox ESR Web Browser
-X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
-Exec=/usr/local/bin/protected firefox
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=firefox-esr
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Firefox-esr
-StartupNotify=true
-X-XFCE-Source=file:///usr/share/applications/firefox-esr.desktop

diff --git a/launchers/16844254192.desktop b/launchers/16844254192.desktop
new file mode 100644 (file)
index 0000000..7ef05a7
--- /dev/null
+++ b/launchers/16844254192.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Name=LibreWolf (Firejailed)
+Name[pl]=LibreWolf (Firejailed)
+Comment=Secure the World Wide Web browsing
+Comment[pl]=Bezpieczne przeglądanie stron WWW
+GenericName=Web Browser
+GenericName[pl]=Przeglądarka WWW
+X-GNOME-FullName=LibreWolf Web Browser
+X-GNOME-FullName[pl]=Przeglądarka WWW LibreWolf
+Exec=/usr/local/bin/immudex-secured-firefox
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=/usr/lib/librewolf/browser/chrome/icons/default/default128.png
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Firefox-esr
+StartupNotify=true
+X-XFCE-Source=file:///usr/share/applications/librewolf.desktop
+Path=

diff --git a/mozilla.tgz b/mozilla.tgz
deleted file mode 100644 (file)
index d7cb2f6..0000000
Binary files a/mozilla.tgz and /dev/null differ

diff --git a/rewinding.txt b/rewinding.txt
deleted file mode 100644 (file)
index d3e5d75..0000000
--- a/rewinding.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Możliwe jest dokonanie zmian w archiwum .squashfs. Wymaga to trochę zachodu
-i nieco więcej zasobów. 
-
-Na początku należy zainstalować pakiet squashfs-tools. Chcąc rozpakować
-archiwum należy dysponować ilością wolnej pamięci operacyjnej powyżej 500MB.
-
-Rozpakowanie archiwum należy rozpocząć od utworzenienia katalogu docelowego.
-Na przykład katalogu chroot na dysku (dodatkowej partycji, poza instalacją
-immudex). Następnie możemy wydać poniższe polecenie:
-
-sudo unsquashfs -f -d chroot/ /run/live/medium/live/filesystem.squashfs
-
-Za pomocą tego polecenie całe archiwum zostanie wypakowane do tego katalogu,
-w którym możemy dowolnie zmieniać. Po zakończeniu wprowadzania zmian,
-pliki z katalogu należy spakować do archiwum .squashfs.
-
-sudo mksquashfs chroot filesystem.squashfs -e boot
-
-Tak utworzone archiwum należy skopiować na dysk, poprzedzając to zmianą
-opcji montowania dysku w systemie. Po skopiowaniu archium system należy
-niezwłocznie uruchomić ponownie.
-
-sudo mount /dev/vda1 /run/live/medium -o remount,rw
-
-Zapobiegawczo usuwam stare archiwum, aby nie powodowało potencjalnego
-konfliktu podczas kopiowania nowego. O wiele lepszym rozwiązaniem jest
-pozostawienie starego archiwum w ramach kopii. W momencie gdy coś nie
-zadziała nie zostaniemy uziemieni na czas pobrania nowego archiwum z
-sourceforge.net
-
-sudo rm /run/live/medium/live/filesystem.squashfs
-
-sudo cp filesystem.squashfs /run/live/medium/live
-
-sudo reboot

diff --git a/tools/0/001/immudex_crypt b/tools/0/001/immudex_crypt
deleted file mode 100755 (executable)
index 8854fa5..0000000
--- a/tools/0/001/immudex_crypt
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_open <crypt_LUKS device>";
-  echo "$ immudex_close immudex_crypt[0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if sudo cryptsetup status /dev/mapper/$1 > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/$1 | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close $1;
-      else
-        sudo cryptsetup close $1;
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/001/immudex_upgrade b/tools/0/001/immudex_upgrade
deleted file mode 100755 (executable)
index 371124d..0000000
--- a/tools/0/001/immudex_upgrade
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-set -e
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.net @ 2022";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-}
-
-function main_upgrade() {
-  set -e
-  if [ "$(uname -m)" = "x86_64" ]; then arch="64";
-  else arch="32";
-  fi
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q https://sourceforge.net/projects/immudex/files/upgrades/${2}/${arch}/filesystem.squashfs/download -O ${1}/live/filesystem.squashfs;
-  sudo wget -q https://sourceforge.net/projects/immudex/files/upgrades/${2}/${arch}/initrd/download -O ${1}/live/initrd;
-  sudo wget -q https://sourceforge.net/projects/immudex/files/upgrades/${2}/${arch}/vmlinuz/download -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-function check(){
-  set -e
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    if [ ! -f /tmp/feed.xml ]; then
-      wget -q https://sourceforge.net/p/immudex/activity/feed -O /tmp/feed.xml
-    fi
-         if [ ! -s /tmp/feed.xml ]; then sudo rm /tmp/feed.xml; return 255; fi;
-    newVersionTxt=$(grep -o "[0-9]\.[0-9]\.[0-9]" /tmp/feed.xml | head -1);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check --print);
-    if check; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/001/motd b/tools/0/001/motd
deleted file mode 100755 (executable)
index f046d47..0000000
--- a/tools/0/001/motd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "-= Today is: $(date) =-";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "-=\tCPU: ${cpuUsage}%\t\t\t=-";
-echo -e "-=\tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free\t\t\t=-"; 
-diskSize=$(df -h | grep '/dev/mapper' | head -1 | awk '{printf $2}');
-diskFree=$(df -h | grep '/dev/mapper' | head -1 | awk '{printf $4}');
-diskUsage_perc=$(df -h | grep '/dev/mapper' | head -1 | sed 's/%//' | awk '{printf $5}');
-#FCP = First Crypt Partition
-echo -e "-=\tFCP: ${diskFree}/${diskSize} (${diskUsage_perc}%)\t\t=-";
-echo -e "-=\tPROCESSES: $(grep 'proces' /proc/stat | awk '{printf $2}')\t\t\t=-";
-echo -e "-=\tUPTIME: $(uptime | awk '{printf $3}' | sed 's/,//')\t\t\t=-";
-echo -e "-=\t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])\t=-";
-echo -e "-= morketsmerke.net @ 2022 https://github.com/xf0r3m/immudex =-";
-echo;
-/usr/local/bin/immudex_upgrade --check --print
-echo "====================================================================";

diff --git a/tools/0/001/motd2 b/tools/0/001/motd2
deleted file mode 100755 (executable)
index 9cd8d10..0000000
--- a/tools/0/001/motd2
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.net @ 2022 https://github.com/xf0r3m/immudex";
-echo;
-/usr/local/bin/immudex_upgrade --check --print;
-if [ $? -ne 0 ]; then
-       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-    rm -f /tmp/feed.xml;
-  fi
-fi       
-echo "====================================================================";

diff --git a/tools/0/001/padlock b/tools/0/001/padlock
deleted file mode 100755 (executable)
index f7c4778..0000000
--- a/tools/0/001/padlock
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-launcher="/home/${USER}/.config/xfce4/panel/launcher-29/16633324331.desktop";
-
-function main_unlock() {
-  /usr/local/bin/immudex_crypt open $1;
-  devName=$(basename $(/usr/local/bin/immudex_crypt list | grep "$1" | head -1 | awk '{printf $2}'));
-  sudo mkdir -p /media/${USER}/$devName;
-  sudo mount /dev/mapper/$devName /media/${USER}/$devName;
-  xfce4-terminal --default-working-directory=/media/${USER}/$devName;
-  sed -i 's/--unlock/--lock/' ${launcher};
-  sed -i 's/padlock.png/unlocked.png/' ${launcher};
-}
-
-function unlock() {
-
-  cryptParts=$(sudo blkid | grep 'LUKS' | sed 's/://g' | awk '{printf $1" "}');
-  if [ "$cryptParts" ]; then
-    if [ $(echo $cryptParts | wc -w) -gt 1 ]; then
-      select cryptPart in $cryptParts; do
-        main_unlock $cryptPart;
-        break;
-      done
-    else
-      main_unlock $cryptParts;
-    fi
-  else
-    echo -e "\e[31mThere is no LUKS partition to open.\e[0m";
-    sleep 3;
-  fi
-}
-
-function lock() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                 if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                         mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-                         if [ "$mountPoint" ]; then
-                                 if $(sudo lsof $mountPoint > /dev/null 2>&1); then
-                                         notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are opened file or running proceses." --icon=dialog-error;
-                                 else
-                                         sudo umount $mountPoint;
-                                         sudo cryptsetup close /dev/mapper/${dmDevice};
-                                 fi
-                         else
-          sudo cryptsetup close /dev/mapper/${dmDevice};
-                         fi
-                 fi
-         done
-  fi
-  if ! $(df -h | grep -q '/dev/mapper'); then
-    sed -i 's/--lock/--unlock/' ${launcher};
-    sed -i 's/unlocked.png/padlock.png/' ${launcher};
-  fi 
-}
-
-if [ "$1" ] && [ "$1" = "--unlock" ]; then unlock;
-elif [ "$1" ] && [ "$1" = "--lock" ]; then lock;
-fi

diff --git a/tools/0/002/import_gpgkeys b/tools/0/002/import_gpgkeys
deleted file mode 100755 (executable)
index dfb9ff9..0000000
--- a/tools/0/002/import_gpgkeys
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [ -f ~/public.gpg ] && [ -f ~/private.gpg ]; then
-  gpg --import ~/public.gpg
-  gpg --import ~/private.gpg
-  userId=$(gpg --list-keys | sed -nr 's/.+<(.*)>$/\1/p');
-  gpg --edit-key $userId;
-fi

diff --git a/tools/0/002/motd2 b/tools/0/002/motd2
deleted file mode 100755 (executable)
index f8eb1a6..0000000
--- a/tools/0/002/motd2
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.net @ 2022 https://github.com/xf0r3m/immudex";
-echo;
-/usr/local/bin/immudex_upgrade --check --print;
-if [ $? -ne 0 ]; then
-       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-    rm -f /tmp/feed.xml;
-  fi
-else
-  if [ "$USER" = "xf0r3m" ]; then
-    sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;
-  fi
-fi       
-echo "====================================================================";

diff --git a/tools/0/002/padlock b/tools/0/002/padlock
deleted file mode 100755 (executable)
index 7d660da..0000000
--- a/tools/0/002/padlock
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-launcher="/home/${USER}/.config/xfce4/panel/launcher-29/16633324331.desktop";
-
-function main_unlock() {
-  /usr/local/bin/immudex_crypt open $1;
-  devName=$(basename $(/usr/local/bin/immudex_crypt list | grep "$1" | head -1 | awk '{printf $2}'));
-  sudo mkdir -p /media/${USER}/$devName;
-  sudo mount /dev/mapper/$devName /media/${USER}/$devName;
-  xfce4-terminal --default-working-directory=/media/${USER}/$devName;
-  sed -i 's/--unlock/--lock/' ${launcher};
-  sed -i 's/padlock.png/unlocked.png/' ${launcher};
-}
-
-function unlock() {
-
-  cryptParts=$(sudo blkid | grep 'LUKS' | sed 's/://g' | awk '{printf $1" "}');
-  if [ "$cryptParts" ]; then
-    if [ $(echo $cryptParts | wc -w) -gt 1 ]; then
-      select cryptPart in $cryptParts; do
-        main_unlock $cryptPart;
-        break;
-      done
-    else
-      main_unlock $cryptParts;
-    fi
-  else
-    echo -e "\e[31mThere is no LUKS partition to open.\e[0m";
-    sleep 3;
-  fi
-}
-
-function lock() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                 if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                         mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-                         if [ "$mountPoint" ]; then
-                                 if $(sudo lsof $mountPoint > /dev/null 2>&1); then
-                                         notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are opened file or running proceses." --icon=dialog-error;
-                                 else
-                                         sudo umount $mountPoint;
-            if [ $? -ne 0 ]; then
-              notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are other filesystem is mounted in." --icon=dialog-error;
-            fi
-                                         sudo cryptsetup close /dev/mapper/${dmDevice};
-                                 fi
-                         else
-          sudo cryptsetup close /dev/mapper/${dmDevice};
-                         fi
-                 fi
-         done
-  fi
-  if ! $(df -h | grep -q '/dev/mapper'); then
-    sed -i 's/--lock/--unlock/' ${launcher};
-    sed -i 's/unlocked.png/padlock.png/' ${launcher};
-  fi 
-}
-
-if [ "$1" ] && [ "$1" = "--unlock" ]; then unlock;
-elif [ "$1" ] && [ "$1" = "--lock" ]; then lock;
-fi

diff --git a/tools/0/002/ytaudio b/tools/0/002/ytaudio
deleted file mode 100755 (executable)
index b90688f..0000000
--- a/tools/0/002/ytaudio
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-BLUE="\e[34m";
-ENDCOLOR="\e[0m";
-
-if [ -f /tmp/yt.html ]; then rm /tmp/yt.html; fi
-if [ -f /tmp/yt.csv ]; then rm /tmp/yt.csv; fi
-
-query=$(echo $* | sed 's/ /+/g');
-
-wget https://youtube.com/results?search_query=$query -O /tmp/yt.html;
-
-sed -i 's/,/\n/g' /tmp/yt.html;
-
-listOfVideos=$(grep -n '^{\"url' /tmp/yt.html | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-numberOfListElements=$(echo $listOfVideos | wc -w);
-i=1;
-lp=1;
-while [ $i -le $numberOfListElements ]; do
-  if [ $i -eq $numberOfListElements ]; then
-    ln1=$(echo $listOfVideos | cut -d " " -f $i);
-    ln2='$';
-  else
-    j=$((i + 1));
-    ln1=$(echo $listOfVideos | cut -d " " -f $i);
-    ln2=$(echo $listOfVideos | cut -d " " -f $j);
-  fi
-  if sed -n "${ln1},${ln2}p" /tmp/yt.html | grep -q '"iconType":"LIVE"'; then
-    i=$((i + 1)); continue;
-  else
-    title=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'title' | head -1 | cut -d '"' -f 8);
-    channel=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'ownerText' | head -1 | cut -d '"' -f 8);
-    duration=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'simpleText' | sed -n '2p' | cut -d '"' -f 4);
-    videoid=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'videoId' | sed -n '2p' | cut -d '"' -f 4);
-    if [ "$title" ] && [ "$channel" ] && [ "$duration" ] && [ "$videoid" ] && [ "$duration" != "SHORTS" ];  then
-      echo -e "${lp}. ${GREEN}${title}${ENDCOLOR}";
-      echo -e "   Channel: ${YELLOW}${channel}${ENDCOLOR}  Duration: ${BLUE}${duration}${ENDCOLOR}";
-      echo "${lp},${videoid},${title},${channel},${duration}" >> /tmp/yt.csv;
-    else
-      i=$((i + 1)); continue;
-    fi
-  fi
-  i=$((i + 1));
-  lp=$((lp + 1));
-done
-echo -n "Put number of which video you want to hear: ";
-read numberOfVideo;
-title=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 3);
-channel=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 4);
-duration=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 5);
-videoId=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 2);
-clear;
-echo -e "Title: ${GREEN}${title}${ENDCOLOR}";
-echo -e "Channel: ${YELLOW}${channel}${ENDCOLOR} Duration: ${BLUE}${duration}${ENDCOLOR}";
-echo "====================================================================";
-mpv --ytdl-format=bestaudio ytdl://${videoId};

diff --git a/tools/0/003/immudex_crypt b/tools/0/003/immudex_crypt
deleted file mode 100755 (executable)
index eacdfb2..0000000
--- a/tools/0/003/immudex_crypt
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_open <crypt_LUKS device>";
-  echo "$ immudex_close immudex_crypt[0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    if ! $(sudo file -s /dev/dm-${index} | grep -q 'ext4'); then
-      echo "Could not determine filesystem of unlocked device.";
-      echo -n "Format this device to ext4? (y/n): "
-      read format;
-      if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
-      else
-        echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
-        exit 1;
-      fi
-    fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if sudo cryptsetup status /dev/mapper/$1 > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/$1 | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close $1;
-      else
-        sudo cryptsetup close $1;
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/003/immudex_install b/tools/0/003/immudex_install
deleted file mode 100755 (executable)
index 405c4c9..0000000
--- a/tools/0/003/immudex_install
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-RED="\e[31m";
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-while [ true ]; do
-  echo -e "${RED}This script will install immudex on first disk on your machine.${ENDCOLOR}";
-  echo -e "${RED}It could be destructive for data placed on this disk${ENDCOLR}";
-  echo -en "${RED}Are you sure that you want contiune? (y/n): ${ENDCOLOR}";
-  read ans;
-  if [ "$ans" = "y" ]; then break; fi
-done
-
-set -e
-
-function selectDisk() {
-  disks=$(lsblk | grep 'disk' | awk '{printf $1" "}');
-  if [ $(echo $disks | wc -w) -gt 1 ]; then
-    select drive in $disks; do
-      echo $drive;
-      break;
-    done 
-  else
-         echo $disks | awk '{printf $1}';
-  fi
-}
-
-if $(sudo efibootmgr > /dev/null 2>&1); then
-#uefi installation
-       #partitioning
-  echo -n "Installation immudex in EFI mode ... ";
-  disk=$(selectDisk);
-  originDisk=$disk;   
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-       sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 101M 4G > /dev/null 2>&1;
-
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-       
-       #formatting
-       sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1;
-       sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1;
-
-  #Setting label for partition
-       sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1;
-
-       #mount root partition
-       sudo mount /dev/${disk}2 /media > /dev/null 2>&1;
-       
-       #creating directories for efi partition
-       sudo mkdir -p /media/boot/efi > /dev/null 2>&1;
-
-       #mount efi partition
-       sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying whole iso image to the second partition
-       sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1;
-
-       #removing unnecessary directories from second partition
-       sudo rm -rf /media/isolinux > /dev/null 2>&1;
-       sudo rm -rf /media/EFI > /dev/null 2>&1;
-
-       #GRUB Installation
-       sudo grub-install --target=x86_64-efi --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1;
-
-       #Adding entry to EFI Firmware
-       sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1;
-
-  #Umount all mounted filesystems
-  sudo umount -R /media > /dev/null 2>&1;
-
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-else
-#mbr installation
-  echo -n "Installation immudex in BIOS mode ... ";
-
-       #partitioning
-       disk=$(selectDisk);
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-  sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 4G > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-
-       #formatting
-       sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1;
-
-       #Setting label for partition is necessary for extlinux bootloader
-       sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1;
-
-       #mount partition in /media directory
-       sudo mount /dev/${disk}1 /media > /dev/null 2>&1;
-
-       #Creating directory for extlinux
-       sudo mkdir /media/extlinux > /dev/null 2>&1;
-       
-       #Instalation extlinux files in abovementioned directory
-       sudo extlinux --install /media/extlinux > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying live directory from iso image to partition
-       sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1;
-
-       #installation extlinux MBR on first sector of hard drive (whole device)
-       sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1;
-
-       #creating extlinux configuration file
-       cat > extlinux.conf <<EOF
-default immudex
-label immudex
-kernel /live/vmlinuz
-append quiet initrd=/live/initrd boot=live overlay-size=25% apparmor=1 security=apparmor
-EOF
-       sudo cp extlinux.conf /media/extlinux > /dev/null 2>&1;
-
-  #Unmounting filesystems
-  sudo umount /media > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi

diff --git a/tools/0/003/ytplay b/tools/0/003/ytplay
deleted file mode 100755 (executable)
index 1b9491c..0000000
--- a/tools/0/003/ytplay
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-BLUE="\e[34m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "ytplay - script which could play a video or audio track from youtube";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  -s - search given keyword on youtube.";
-  echo "  -v - play youtube video."
-  echo "  -a - play only youtube video audiotrack";
-  echo "Ommiting -s option, assume you are give a yt video link.";
-  echo "You have to put -v or -a before you paste a yt video link";
-  echo "When you put keywords in -s option, you need to choose";
-  echo "that you want listening an audiotrack (-a) oraz watch video (-v)";
-  echo "Usage:";
-  echo "  $ ytplay -s -a 'lofi'";
-  echo "  $ ytplay -v https://youtube.com/watch?v=...";
-  echo "  $ ytplay -a https://youtube.com/watch?v=...";
-}
-
-if [ "$1" ]; then
-  if [ "$1" = "-a" ] || [ "$1" = "-v" ]; then
-    mode=$1;
-    shift;
-    link=$(echo $1 | sed 's@https://@@');
-  elif [ "$1" = "-s" ]; then
-    if [ -f /tmp/yt.html ]; then rm /tmp/yt.html; fi
-    if [ -f /tmp/yt.csv ]; then rm /tmp/yt.csv; fi
-
-    shift;
-    mode=$1;
-    if ! ([ "$mode" = "-v" ] || [ "$mode" = "-a" ]); then help; exit 1; fi
-    shift;
-    query=$(echo $* | sed 's/ /+/g');
-    echo -n "Getting youtube site with search results...";
-    wget https://youtube.com/results?search_query=$query -O /tmp/yt.html 2> /dev/null
-    if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-    sed -i 's/,/\n/g' /tmp/yt.html;
-
-    listOfVideos=$(grep -n '^{\"url' /tmp/yt.html | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-    numberOfListElements=$(echo $listOfVideos | wc -w);
-    i=1;
-    lp=1;
-    while [ $i -le $numberOfListElements ]; do
-      if [ $i -eq $numberOfListElements ]; then
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2='$';
-      else
-        j=$((i + 1));
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2=$(echo $listOfVideos | cut -d " " -f $j);
-      fi
-      if sed -n "${ln1},${ln2}p" /tmp/yt.html | grep -q '"iconType":"LIVE"'; then
-        i=$((i + 1)); continue;
-      else
-        title=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'title' | head -1 | cut -d '"' -f 8);
-        channel=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'ownerText' | head -1 | cut -d '"' -f 8);
-        duration=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'simpleText' | sed -n '2p' | cut -d '"' -f 4);
-        videoid=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'videoId' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$title" ] && [ "$channel" ] && [ "$duration" ] && [ "$videoid" ] && [ "$duration" != "SHORTS" ];  then
-          echo -e "${lp}. ${GREEN}${title}${ENDCOLOR}";
-          echo -e "   Channel: ${YELLOW}${channel}${ENDCOLOR}  Duration: ${BLUE}${duration}${ENDCOLOR}";
-          echo "${lp},${videoid},${title},${channel},${duration}" >> /tmp/yt.csv;
-        else
-          i=$((i + 1)); continue;
-        fi
-      fi
-      i=$((i + 1));
-      lp=$((lp + 1));
-    done
-    echo -n "Put number of which video you want to hear/watch: ";
-    read numberOfVideo;
-    title=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 3);
-    channel=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 4);
-    duration=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 5);
-    videoId=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 2);
-    clear;
-    echo -e "Title: ${GREEN}${title}${ENDCOLOR}";
-    echo -e "Channel: ${YELLOW}${channel}${ENDCOLOR} Duration: ${BLUE}${duration}${ENDCOLOR}";
-    echo "====================================================================";
-    link=${videoId}; 
-   else
-    help;
-    exit 1;
-  fi
-  
-  if [ "$mode" = "-a" ]; then mpv --ytdl-format=bestaudio ytdl://${link};
-  elif [ "$mode" = "-v" ]; then mpv ytdl://${link}; fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/004/motd2 b/tools/0/004/motd2
deleted file mode 100755 (executable)
index 239b016..0000000
--- a/tools/0/004/motd2
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h 2> /dev/null | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h 2> /dev/null | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.net @ 2022 https://github.com/xf0r3m/immudex";
-echo;
-/usr/local/bin/immudex_upgrade --check --print;
-if [ $? -ne 0 ]; then
-       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-    rm -f /tmp/feed.xml;
-  fi
-else
-  if [ "$USER" = "xf0r3m" ]; then
-    sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;
-  fi
-fi       
-echo "====================================================================";

diff --git a/tools/0/005/protected b/tools/0/005/protected
deleted file mode 100755 (executable)
index 12d7414..0000000
--- a/tools/0/005/protected
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-
-if [ "$mapperDeviceList" ]; then
-
-       for dmDevice in $mapperDeviceList; do
-               if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                       mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-                       if [ "$mountPoint" ]; then
-                               if $(sudo lsof $mountPoint > /dev/null 2>&1); then
-                                       notify-send "Protected" "The $1 cannot be run, because your LUKS partition is open." --icon=dialog-error;
-                                       exit 1;
-                               else
-                                       sudo umount $mountPoint;
-                                       sudo cryptsetup close /dev/mapper/${dmDevice};
-          #zmiana na launcherze padlock
-          launcher="/home/${USER}/.config/xfce4/panel/launcher-29/16633324331.desktop";
-          sed -i 's/--lock/--unlock/' ${launcher};
-          sed -i 's/unlocked.png/padlock.png/' ${launcher};
-                               fi
-                       fi
-               fi
-       done
-  $1;
-else
-       $1;
-
-fi

diff --git a/tools/0/006/immudex_crypt b/tools/0/006/immudex_crypt
deleted file mode 100755 (executable)
index f686522..0000000
--- a/tools/0/006/immudex_crypt
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_open <crypt_LUKS device>";
-  echo "$ immudex_close immudex_crypt[0-9] | ic[0-9] | [0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    if ! $(sudo file -s /dev/dm-${index} | grep -q 'ext4'); then
-      echo "Could not determine filesystem of unlocked device.";
-      echo -n "Format this device to ext4? (y/n): "
-      read format;
-      if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
-      else
-        echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
-        exit 1;
-      fi
-    fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
-    if [ ! -e /ic${index} ]; then
-      sudo ln -s /media/${USER}/immudex_crypt${index} /ic${index};
-    fi
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if [ $1 -ge 0 ] 2> /dev/null; then
-        cryptfsName="immudex_crypt${1}";
-    elif echo $1 | grep -q 'ic'; then
-        cryptfsName="immudex_crypt$(echo $1 | grep -o '[0-9]')";
-    else
-        cryptfsName=$1;
-    fi
-    if sudo cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/${cryptfsName} | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close ${cryptfsName};
-      else
-        sudo cryptsetup close ${cryptfsName};
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/006/newsfeed b/tools/0/006/newsfeed
deleted file mode 100755 (executable)
index a3a426a..0000000
--- a/tools/0/006/newsfeed
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-function help() {
-  echo "newsfeed - fetch and browse news feed from rss and atom channels";
-  echo "morketsmerke.net; COPYLEFT @ 2022";
-  echo;
-  echo "Options:";
-  echo "  --list - shows numbered list of names, saved in ~/.newsfeed names and";
-  echo "    URL of rss channels";
-  echo "  --check - fetching new rss channel file from source";
-  echo "  --show <number_of_channel> - shows numbered list of news titles.";
-  echo "    Number of channel you can get from --list option.";
-  echo "  --open <number_of_title> - open web browser on link, which are under";
-  echo "    titles of news on rss channel. Number of title you can get";
-  echo "    from --show option. This option based on the last showed rss";
-  echo "    channel feed.";
-  echo;
-  echo "The ~/.newsfeed file:";
-  echo "  This file is simple csv (semicolon separated values) file which";
-  echo "  store rss channels in one line. One by one. The one line";
-  echo "  contains: name and URL of rss feed. For example:";
-  echo;
-  echo "    News Feed;https://newsfeed.example.org/rss";
-} 
-if [ ! -s ~/.newsfeed ]; then
-  help;
-  exit 1;
-else
-  if [ ! "$1" ] || ([ "$1" != "--list" ] && \
-    [ "$1" != "--check" ] && \
-    [ "$1" != "--show" ] && \
-    [ "$1" != "--open" ]); then
-      help;
-      exit 1;
-  fi
-  amountOfSubscriptions=$(cat ~/.newsfeed | wc -l);
-  i=1;
-  while [ $i -le $amountOfSubscriptions ]; do
-    newsfeedLine=$(sed -n "${i}p" ~/.newsfeed);
-    nameOfSubscription=$(echo $newsfeedLine | cut -d ";" -f 1);
-    rssLink=$(echo $newsfeedLine | cut -d ";" -f 2);
-    if [ "$1" ] && [ "$1" = "--list" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-    elif [ "$1" ] && [ "$1" = "--check" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-      echo -n "Getting news feed...";
-      wget $rssLink -O /tmp/new_newsfeed_${i}.xml 2>/dev/null;
-      if [ $? -eq 0 ]; then echo "[ OK ]";
-      else echo -e "\nThere is no Internet connection"; exit 1; fi
-        if [ -s /tmp/newsfeed_${i}.xml ]; then
-        amountOfNewNewses=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | grep '<title>' | wc -l);
-        if [ $amountOfNewNewses -gt 0 ]; then 
-          notify-send "$nameOfSubscription" "New $amountOfNewNewses newses" --icon=/usr/share/icons/rss.png;
-          j=1;
-          sleep 1;
-          while [ $j -le $amountOfNewNewses ]; do
-            news=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | \
-                     grep '<title>' | sed -n "${j}p" | sed 's/<title>//' | \
-                      sed 's/<\/title>//' | sed 's/[<>]//' | \
-                      sed 's/^[[:space:]]*//g');
-            notify-send "newsfeed" "${nameOfSubscription}: ${news}" -t 10000 --icon=/usr/share/icons/rss.png;
-            sleep 1;
-            j=$((j + 1));
-          done
-        fi
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-      else
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-        amountOfNews=$(grep '<title>' /tmp/newsfeed_${i}.xml | sed -n '2,$p' | wc -l);
-        if [ $amountOfNews -eq 0 ]; then
-          compressed=1;
-          amountOfNews=$(sed 's/<\/title>/\n/g' /tmp/newsfeed_${i}.xml | sed 's/<item>/\n/g' | grep '<title>' | wc -l)
-        fi
-        notify-send "$nameOfSubscription" "New $amountOfNews newses" --icon=/usr/share/icons/rss.png;
-      fi
-    fi
-    i=$((i + 1));
-  done
-  if [ "$1" ] && [ "$1" = "--show" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    
-    #Parsing
-    #Thanks to the linuxhint.com for command:
-    #sed 's/^[[:space]]*//g'
-    #https://linuxhint.com/trim_string_bash
-
-      if grep -q 'CDATA' /tmp/newsfeed_${2}.xml; then
-        sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        sed 's/<!\[CDATA\[//g' | sed 's/\]\]>//g' | \
-        sed 's/^[[:space:]]*//g' | nl | less;
-      else 
-        sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        sed 's/^[[:space:]]*//g' | nl | less;
-      fi
-      echo $2 > /tmp/lastShowedNewsFeed;
-  elif [ "$1" ] && [ "$1" = "--open" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    subscriptionNumber=$(cat /tmp/lastShowedNewsFeed);
-    if ! grep -q 'CDATA' /tmp/newsfeed_${subscriptionNumber}.xml; then
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/title>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    else
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/description>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    fi
-    exo-open --launch WebBrowser "$link";
-  fi
-fi

diff --git a/tools/0/006/padlock b/tools/0/006/padlock
deleted file mode 100755 (executable)
index 1b4b14f..0000000
--- a/tools/0/006/padlock
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-launcher="/home/${USER}/.config/xfce4/panel/launcher-29/16633324331.desktop";
-
-function main_unlock() {
-  /usr/local/bin/immudex_crypt open $1;
-  index=$(basename $(/usr/local/bin/immudex_crypt list | grep "$1" | head -1 | awk '{printf $2}' | grep -o '[0-9]'));
-  #sudo mkdir -p /media/${USER}/$devName;
-  #sudo mount /dev/mapper/$devName /media/${USER}/$devName;
-  
-  xfce4-terminal --default-working-directory=/ic${index};
-  sed -i 's/--unlock/--lock/' ${launcher};
-  sed -i 's/padlock.png/unlocked.png/' ${launcher};
-}
-
-function unlock() {
-
-  cryptParts=$(sudo blkid | grep 'LUKS' | sed 's/://g' | awk '{printf $1" "}');
-  if [ "$cryptParts" ]; then
-    if [ $(echo $cryptParts | wc -w) -gt 1 ]; then
-      select cryptPart in $cryptParts; do
-        main_unlock $cryptPart;
-        break;
-      done
-    else
-      main_unlock $cryptParts;
-    fi
-  else
-    echo -e "\e[31mThere is no LUKS partition to open.\e[0m";
-    sleep 3;
-  fi
-}
-
-function lock() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                 if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                         mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-                         if [ "$mountPoint" ]; then
-                                 if $(sudo lsof $mountPoint > /dev/null 2>&1); then
-                                         notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are opened file or running proceses." --icon=dialog-error;
-                                 else
-                                         sudo umount $mountPoint;
-            if [ $? -ne 0 ]; then
-              notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are other filesystem is mounted in." --icon=dialog-error;
-            fi
-                                         sudo cryptsetup close /dev/mapper/${dmDevice};
-                                 fi
-                         else
-          sudo cryptsetup close /dev/mapper/${dmDevice};
-                         fi
-                 fi
-         done
-  fi
-  if ! $(df -h | grep -q '/dev/mapper'); then
-    sed -i 's/--lock/--unlock/' ${launcher};
-    sed -i 's/unlocked.png/padlock.png/' ${launcher};
-  fi 
-}
-
-if [ "$1" ] && [ "$1" = "--unlock" ]; then unlock;
-elif [ "$1" ] && [ "$1" = "--lock" ]; then lock;
-fi

diff --git a/tools/0/007/immudex_crypt b/tools/0/007/immudex_crypt
deleted file mode 100755 (executable)
index 8b1645e..0000000
--- a/tools/0/007/immudex_crypt
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_open <crypt_LUKS device>";
-  echo "$ immudex_close immudex_crypt[0-9] | ic[0-9] | [0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    dmDevice=$(ls -l /dev/mapper/immudex_crypt${index} | awk '{printf $10}' | cut -d "/" -f 2);
-    if ! $(sudo file -s /dev/${dmDevice} | grep -q 'ext4'); then
-      echo "Could not determine filesystem of unlocked device.";
-      echo -n "Format this device to ext4? (y/n): "
-      read format;
-      if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
-      else
-        echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
-        exit 1;
-      fi
-    fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
-    if [ ! -e /ic${index} ]; then
-      sudo ln -s /media/${USER}/immudex_crypt${index} /ic${index};
-    fi
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if [ $1 -ge 0 ] 2> /dev/null; then
-        cryptfsName="immudex_crypt${1}";
-    elif echo $1 | grep -q 'ic'; then
-        cryptfsName="immudex_crypt$(echo $1 | grep -o '[0-9]')";
-    else
-        cryptfsName=$1;
-    fi
-    if sudo cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/${cryptfsName} | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close ${cryptfsName};
-      else
-        sudo cryptsetup close ${cryptfsName};
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/007/ytplay b/tools/0/007/ytplay
deleted file mode 100755 (executable)
index 142ba4b..0000000
--- a/tools/0/007/ytplay
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-BLUE="\e[34m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "ytplay - script which could play a video or audio track from youtube";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  -s - search given keyword on youtube.";
-  echo "  -v - play youtube video."
-  echo "  -a - play only youtube video audiotrack";
-  echo "Ommiting -s option, assume you are give a yt video link.";
-  echo "You have to put -v or -a before you paste a yt video link";
-  echo "When you put keywords in -s option, you need to choose";
-  echo "that you want listening an audiotrack (-a) oraz watch video (-v)";
-  echo "Usage:";
-  echo "  $ ytplay -s -a [-f ytdl-format] 'lofi'";
-  echo "  $ ytplay -v https://youtube.com/watch?v=... [-f ytdl-format]";
-  echo "  $ ytplay -a https://youtube.com/watch?v=... [-f ytdl-format]";
-}
-
-if [ "$1" ]; then
-  if [ "$1" = "-a" ] || [ "$1" = "-v" ]; then
-    mode=$1;
-    shift;
-    link=$(echo $1 | sed 's@https://@@');
-    if [ $# -gt 1 ]; then
-      shift;
-      if [ "$1" = "-f" ]; then
-        shift;
-        if [ "$mode" = "-a" ]; then 
-          format="--ytdl-format=bestaudio";
-        else
-          format="--ytdl-format=${1}";
-        fi
-      fi
-    fi
-  elif [ "$1" = "-s" ]; then
-    if [ -f /tmp/yt.html ]; then rm /tmp/yt.html; fi
-    if [ -f /tmp/yt.csv ]; then rm /tmp/yt.csv; fi
-
-    shift;
-    mode=$1;
-    if ! ([ "$mode" = "-v" ] || [ "$mode" = "-a" ]); then help; exit 1; fi
-    shift;
-    if [ "$1" = "-f" ]; then
-      shift;
-      if [ "$mode" = "-a" ]; then 
-        format="--ytdl-format=bestaudio";
-      else
-        format="--ytdl-format=${1}";
-      fi
-    fi
-    query=$(echo $* | sed 's/ /+/g');
-    echo -n "Getting youtube site with search results...";
-    wget https://youtube.com/results?search_query=$query -O /tmp/yt.html 2> /dev/null
-    if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-    sed -i 's/,/\n/g' /tmp/yt.html;
-
-    listOfVideos=$(grep -n '^{\"url' /tmp/yt.html | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-    numberOfListElements=$(echo $listOfVideos | wc -w);
-    i=1;
-    lp=1;
-    while [ $i -le $numberOfListElements ]; do
-      if [ $i -eq $numberOfListElements ]; then
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2='$';
-      else
-        j=$((i + 1));
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2=$(echo $listOfVideos | cut -d " " -f $j);
-      fi
-      #if sed -n "${ln1},${ln2}p" /tmp/yt.html | grep -q '"iconType":"LIVE"'; then
-       # i=$((i + 1)); continue;
-      #else
-        title=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'title' | head -1 | cut -d '"' -f 8);
-        channel=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'ownerText' | head -1 | cut -d '"' -f 8);
-        duration=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'simpleText' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$duration" = "simpleText" ]; then duration="\e[31mLive\e[0m"; fi
-        videoid=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'videoId' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$title" ] && [ "$channel" ] && [ "$duration" ] && [ "$videoid" ] && [ "$duration" != "SHORTS" ];  then
-          echo -e "${lp}. ${GREEN}${title}${ENDCOLOR}";
-          echo -e "   Channel: ${YELLOW}${channel}${ENDCOLOR}  Duration: ${BLUE}${duration}${ENDCOLOR}";
-          echo "${lp},${videoid},${title},${channel},${duration}" >> /tmp/yt.csv;
-        else
-          i=$((i + 1)); continue;
-        fi
-      #fi
-      i=$((i + 1));
-      lp=$((lp + 1));
-    done
-    echo -n "Put number of which video you want to hear/watch: ";
-    read numberOfVideo;
-    title=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 3);
-    channel=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 4);
-    duration=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 5);
-    videoId=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 2);
-    clear;
-    echo -e "Title: ${GREEN}${title}${ENDCOLOR}";
-    echo -e "Channel: ${YELLOW}${channel}${ENDCOLOR} Duration: ${BLUE}${duration}${ENDCOLOR}";
-    echo "====================================================================";
-    link=${videoId}; 
-   else
-    help;
-    exit 1;
-  fi
-  
-  if [ "$mode" = "-a" ]; then 
-      if [ ! "$format" ]; then format="--ytdl-format=bestaudio"; fi
-      mpv ${format} ytdl://${link};
-  elif [ "$mode" = "-v" ]; then mpv ${format} ytdl://${link}; fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/008/immudex_crypt b/tools/0/008/immudex_crypt
deleted file mode 100755 (executable)
index dfae10e..0000000
--- a/tools/0/008/immudex_crypt
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_crypt open <crypt_LUKS device>";
-  echo "$ immudex_crypt close immudex_crypt[0-9] | ic[0-9] | [0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    dmDevice=$(ls -l /dev/mapper/immudex_crypt${index} | awk '{printf $10}' | cut -d "/" -f 2);
-    if ! $(sudo file -s /dev/${dmDevice} | grep -q 'ext4'); then
-      echo "Could not determine filesystem of unlocked device.";
-      echo -n "Format this device to ext4? (y/n): "
-      read format;
-      if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
-      else
-        echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
-        exit 1;
-      fi
-    fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
-    if [ ! -e /ic${index} ]; then
-      sudo ln -s /media/${USER}/immudex_crypt${index} /ic${index};
-    fi
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if [ $1 -ge 0 ] 2> /dev/null; then
-        cryptfsName="immudex_crypt${1}";
-    elif echo $1 | grep -q 'ic'; then
-        cryptfsName="immudex_crypt$(echo $1 | grep -o '[0-9]')";
-    else
-        cryptfsName=$1;
-    fi
-    if sudo cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/${cryptfsName} | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close ${cryptfsName};
-      else
-        sudo cryptsetup close ${cryptfsName};
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/010/create_media b/tools/0/010/create_media
deleted file mode 100755 (executable)
index ea78a90..0000000
--- a/tools/0/010/create_media
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "create_media - script used for write iso image to usb drive(mainly)";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  --i386-efi - creating 32-bit EFI usb drive with iso image";
-  echo "  (comapatible with immudex only iso images)";
-  echo "Usage:";
-  echo "  $ create_media [--i386-efi] <usb_disk> <iso_image>";
-}
-
-if [ "$1" ] && [ "$1" = "--i386-efi" ]; then target="i386-efi"; shift; fi
-if [ "$1" ] && echo $1 | grep -Eq '/dev/(sd[a-z]|vd[a-z]|mmcblk[0-9])'; then
-  disk=$1; shift;
-else
-  help;
-  exit 1;
-fi
-if [ "$1" ] && file $1 | grep -q 'ISO 9660'; then 
-  iso=$1;
-else
-  help;
-  exit 1;
-fi
-
-if [ "$target" ]; then
-  echo -n "Writing zeros to 1st megabyte on disk..."; 
-  sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating MS-DOS partitionig scheme on disk..."; 
-  sudo parted $disk mklabel msdos > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating FAT-32 partition...";
-  sudo parted $disk mkpart primary fat32 1 100%Free > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating VFAT filesystem on partition...";
-  sudo mkfs.vfat ${disk}1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/usb directory...";
-  sudo mkdir /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-  
-  echo -n "Mounting VFAT partition on /mnt/usb...";
-  sudo mount ${disk}1 /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Instalation GRUB on disk...";
-  sudo grub-install --target=i386-efi --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --bootloader-id=boot --removable > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/iso directory...";
-  sudo mkdir /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-
-  echo -n "Mounting iso file on /mnt/iso...";
-  sudo mount $iso /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying grub config files to the disk...";
-  sudo cp /mnt/iso/boot/grub/font.pf2 /mnt/usb/boot/grub > /dev/null 2>&1;
-  sudo cp /mnt/iso/boot/grub/grub.cfg /mnt/usb/boot/grub > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying immudex files to the disk..."; 
-  sudo cp -r /mnt/iso/live /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating empty DEBIAN file...";
-  sudo touch /mnt/usb/DEBIAN > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Umounting all mounted filesystems...";
-  sudo umount /mnt/* > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-else
-  echo -n "Writing iso image to the disk..."
-  sudo dd if=$iso bs=1M of=$disk > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-fi 

diff --git a/tools/0/010/immudex_install b/tools/0/010/immudex_install
deleted file mode 100755 (executable)
index 5d3363f..0000000
--- a/tools/0/010/immudex_install
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-RED="\e[31m";
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-while [ true ]; do
-  echo -e "${RED}This script will install immudex on first disk on your machine.${ENDCOLOR}";
-  echo -e "${RED}It could be destructive for data placed on this disk${ENDCOLR}";
-  echo -en "${RED}Are you sure that you want contiune? (y/n): ${ENDCOLOR}";
-  read ans;
-  if [ "$ans" = "y" ]; then break; fi
-done
-
-set -e
-
-function selectDisk() {
-  disks=$(lsblk | grep 'disk' | awk '{printf $1" "}');
-  if [ $(echo $disks | wc -w) -gt 1 ]; then
-    select drive in $disks; do
-      echo $drive;
-      break;
-    done 
-  else
-         echo $disks | awk '{printf $1}';
-  fi
-}
-
-if $(sudo efibootmgr > /dev/null 2>&1); then
-#uefi installation
-       #partitioning
-  echo -n "Installation immudex in EFI mode ... ";
-  disk=$(selectDisk);
-  originDisk=$disk;   
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-       sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 101M 4G > /dev/null 2>&1;
-
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-       
-       #formatting
-       sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1;
-       sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1;
-
-  #Setting label for partition
-       sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1;
-
-       #mount root partition
-       sudo mount /dev/${disk}2 /media > /dev/null 2>&1;
-       
-       #creating directories for efi partition
-       sudo mkdir -p /media/boot/efi > /dev/null 2>&1;
-
-       #mount efi partition
-       sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying whole iso image to the second partition
-       sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1;
-
-       #removing unnecessary directories from second partition
-       sudo rm -rf /media/isolinux > /dev/null 2>&1;
-       sudo rm -rf /media/EFI > /dev/null 2>&1;
-
-       #GRUB Installation
-  if [ -f /usr/lib/live/mount/medium/EFI/BOOT/BOOTIA32.EFI ]; then
-    target="i386-efi";
-  else
-    target="x86_64-efi";
-  fi
-       sudo grub-install --target=${target} --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1;
-
-       #Adding entry to EFI Firmware
-       sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1;
-
-  #Umount all mounted filesystems
-  sudo umount -R /media > /dev/null 2>&1;
-
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-else
-#mbr installation
-  echo -n "Installation immudex in BIOS mode ... ";
-
-       #partitioning
-       disk=$(selectDisk);
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-  sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 4G > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-
-       #formatting
-       sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1;
-
-       #Setting label for partition is necessary for extlinux bootloader
-       sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1;
-
-       #mount partition in /media directory
-       sudo mount /dev/${disk}1 /media > /dev/null 2>&1;
-
-       #Creating directory for extlinux
-       sudo mkdir /media/extlinux > /dev/null 2>&1;
-       
-       #Instalation extlinux files in abovementioned directory
-       sudo extlinux --install /media/extlinux > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying live directory from iso image to partition
-       sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1;
-
-       #installation extlinux MBR on first sector of hard drive (whole device)
-       sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1;
-
-       #creating extlinux configuration file
-       cat > extlinux.conf <<EOF
-default immudex
-label immudex
-kernel /live/vmlinuz
-append quiet initrd=/live/initrd boot=live overlay-size=25% apparmor=1 security=apparmor
-EOF
-       sudo cp extlinux.conf /media/extlinux > /dev/null 2>&1;
-
-  #Unmounting filesystems
-  sudo umount /media > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi

diff --git a/tools/0/010/immudex_upgrade b/tools/0/010/immudex_upgrade
deleted file mode 100755 (executable)
index 312c1b3..0000000
--- a/tools/0/010/immudex_upgrade
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-
-set -e
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.net @ 2022";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-}
-
-function get_debian_branch() {
-  if grep -q '\/sid' /etc/os-release; then
-    echo "testing";
-  else
-    echo "stable";
-  fi
-}
-
-function get_machine_arch() {
-  arch=$(uname -m);
-  if [ "$arch" = "i686" ]; then
-    echo "32";
-  else
-    echo "64";
-  fi
-}
-
-function main_upgrade() {
-  set -e
-  ARCH=$(get_machine_arch);
-  BRANCH=$(get_debian_branch);
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q https://ftp.morketsmerke.net/immudex/${BRANCH}/upgrades/${2}/${ARCH}/filesystem.squashfs/download -O ${1}/live/filesystem.squashfs;
-  sudo wget -q https://ftp.morketsmerke.net/immudex/${BRANCH}/upgrades/${2}/${ARCH}/initrd/download -O ${1}/live/initrd;
-  sudo wget -q https://ftp.morketsmerke.net/immudex/${BRANCH}/upgrades/${2}/${ARCH}/vmlinuz/download -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-#function check(){
-#  set -e
-#  if [ -d ${root}/live ]; then
-#    if [ -f ${root}/live/version ]; then 
-#      version=$(cat ${root}/live/version | sed 's/\.//g');
-#    else version="000";
-#    fi
-#    if [ ! -f /tmp/feed.xml ]; then
-#      wget -q https://sourceforge.net/p/immudex/activity/feed -O /tmp/feed.xml
-#    fi
-#        if [ ! -s /tmp/feed.xml ]; then sudo rm /tmp/feed.xml; return 255; fi;
-#    newVersionTxt=$(grep -o "[0-9]\.[0-9]\.[0-9]" /tmp/feed.xml | head -1);
-#    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-#    if [ $version -lt $newVersionInt ]; then
-#     exitcode=0;
-#    else
-#     exitcode=1;
-#    fi
-#  else
-#    exitcode=255;
-#  fi
-#  if [ "$1" ] && [ "$1" = "--print" ]; then
-#    echo $newVersionTxt;
-#    return 0;
-#  fi
-#  return $exitcode;
-#}
-
-function check() {
-  set -e
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.net/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
-    fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check --print);
-    if check; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/010/motd2 b/tools/0/010/motd2
deleted file mode 100755 (executable)
index 48337a1..0000000
--- a/tools/0/010/motd2
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h 2> /dev/null | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h 2> /dev/null | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.net @ 2023 https://github.com/xf0r3m/immudex";
-echo;
-/usr/local/bin/immudex_upgrade --check --print;
-if [ $? -ne 0 ]; then
-       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-    rm -f /tmp/feed.xml;
-  fi
-else
-  if [ "$USER" = "xf0r3m" ]; then
-    sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;
-  fi
-fi       
-echo "====================================================================";

diff --git a/tools/0/010/ytplay b/tools/0/010/ytplay
deleted file mode 100755 (executable)
index 41ea516..0000000
--- a/tools/0/010/ytplay
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-BLUE="\e[34m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "ytplay - script which could play a video or audio track from youtube";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  -s - search given keyword on youtube.";
-  echo "  -v - play youtube video."
-  echo "  -a - play only youtube video audiotrack";
-  echo "Ommiting -s option, assume you are give a yt video link.";
-  echo "You have to put -v or -a before you paste a yt video link";
-  echo "When you put keywords in -s option, you need to choose";
-  echo "that you want listening an audiotrack (-a) oraz watch video (-v)";
-  echo "Usage:";
-  echo "  $ ytplay -s -a [-f ytdl-format] 'lofi'";
-  echo "  $ ytplay -v https://youtube.com/watch?v=... [-f ytdl-format]";
-  echo "  $ ytplay -a https://youtube.com/watch?v=... [-f ytdl-format]";
-  echo "You can search again the same keywords puting 'r' or 'R' instead";
-  echo "of video numer";
-}
-
-function yt_search() {
-    query=$(echo $* | sed 's/ /+/g');
-    echo -n "Getting youtube site with search results...";
-    wget https://youtube.com/results?search_query=$query -O /tmp/yt.html 2> /dev/null
-    if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-    sed -i 's/,/\n/g' /tmp/yt.html;
-
-    listOfVideos=$(grep -n '^{\"url' /tmp/yt.html | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-    numberOfListElements=$(echo $listOfVideos | wc -w);
-    i=1;
-    lp=1;
-    while [ $i -le $numberOfListElements ]; do
-      if [ $i -eq $numberOfListElements ]; then
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2='$';
-      else
-        j=$((i + 1));
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2=$(echo $listOfVideos | cut -d " " -f $j);
-      fi
-      #if sed -n "${ln1},${ln2}p" /tmp/yt.html | grep -q '"iconType":"LIVE"'; then
-       # i=$((i + 1)); continue;
-      #else
-        title=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'title' | head -1 | cut -d '"' -f 8);
-        channel=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'ownerText' | head -1 | cut -d '"' -f 8);
-        duration=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'simpleText' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$duration" = "simpleText" ]; then duration="\e[31mLive\e[0m"; fi
-        videoid=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'videoId' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$title" ] && [ "$channel" ] && [ "$duration" ] && [ "$videoid" ] && [ "$duration" != "SHORTS" ];  then
-          echo -e "${lp}. ${GREEN}${title}${ENDCOLOR}";
-          echo -e "   Channel: ${YELLOW}${channel}${ENDCOLOR}  Duration: ${BLUE}${duration}${ENDCOLOR}";
-          echo "${lp},${videoid},${title},${channel},${duration}" >> /tmp/yt.csv;
-        else
-          i=$((i + 1)); continue;
-        fi
-      #fi
-      i=$((i + 1));
-      lp=$((lp + 1));
-    done
-}
-
-if [ "$1" ]; then
-  if [ "$1" = "-a" ] || [ "$1" = "-v" ]; then
-    mode=$1;
-    shift;
-    link=$(echo $1 | sed 's@https://@@');
-    if [ $# -gt 1 ]; then
-      shift;
-      if [ "$1" = "-f" ]; then
-        shift;
-        if [ "$mode" = "-a" ]; then 
-          format="--ytdl-format=bestaudio";
-        else
-          format="--ytdl-format=${1}";
-        fi
-      fi
-    fi
-  elif [ "$1" = "-s" ]; then
-    if [ -f /tmp/yt.html ]; then rm /tmp/yt.html; fi
-    if [ -f /tmp/yt.csv ]; then rm /tmp/yt.csv; fi
-
-    shift;
-    mode=$1;
-    if ! ([ "$mode" = "-v" ] || [ "$mode" = "-a" ]); then help; exit 1; fi
-    shift;
-    if [ "$1" = "-f" ]; then
-      shift;
-      if [ "$mode" = "-a" ]; then 
-        format="--ytdl-format=bestaudio";
-      else
-        format="--ytdl-format=${1}";
-      fi
-    fi
-    while [ true ]; do
-      yt_search $*;
-      echo -n "Put number of which video you want to hear/watch: ";
-      read numberOfVideo;
-      if [[ $numberOfVideo -gt 0 ]]; then break;
-      elif [ "$numberOfVideo" = "r" ] || [ "$numberOfVideo" = "R" ]; then
-        continue;
-      else
-        help;
-        exit 1;
-      fi
-    done
-    title=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 3);
-    channel=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 4);
-    duration=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 5);
-    videoId=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 2);
-    clear;
-    echo -e "Title: ${GREEN}${title}${ENDCOLOR}";
-    echo -e "Channel: ${YELLOW}${channel}${ENDCOLOR} Duration: ${BLUE}${duration}${ENDCOLOR}";
-    echo "====================================================================";
-    link=${videoId}; 
-   else
-    help;
-    exit 1;
-  fi
-  
-  if [ "$mode" = "-a" ]; then 
-      if [ ! "$format" ]; then format="--ytdl-format=bestaudio"; fi
-        mpv ${format} ytdl://${link};
-  elif [ "$mode" = "-v" ]; then mpv ${format} ytdl://${link}; fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/011/immudex_upgrade b/tools/0/011/immudex_upgrade
deleted file mode 100755 (executable)
index 7b1b3b0..0000000
--- a/tools/0/011/immudex_upgrade
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source library.sh
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.net @ 2022";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-}
-
-function main_upgrade() {
-  set -e
-  ARCH=$(get_machine_arch);
-  BRANCH=$(get_debian_branch);
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/filesystem.squashfs -O ${1}/live/filesystem.squashfs;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/initrd -O ${1}/live/initrd;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/vmlinuz -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check_distro_version --print);
-    if check_distro_version; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check_distro_version --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check_distro_version; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/011/library.sh b/tools/0/011/library.sh
deleted file mode 100755 (executable)
index 599c023..0000000
--- a/tools/0/011/library.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-function get_debian_branch() {
-  if grep -q '\/sid' /etc/os-release; then
-    echo "testing";
-  else
-    echo "stable";
-  fi
-}
-
-function get_machine_arch() {
-  arch=$(uname -m);
-  if [ "$arch" = "i686" ]; then
-    echo "32";
-  else
-    echo "64";
-  fi
-}
-
-function check_distro_version() {
-  set -e
-  root="/run/live/medium";
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
-    fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}

diff --git a/tools/0/011/motd2 b/tools/0/011/motd2
deleted file mode 100755 (executable)
index da11dcc..0000000
--- a/tools/0/011/motd2
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h 2> /dev/null | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h 2> /dev/null | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.org @ 2023 https://github.com/xf0r3m/immudex";
-echo;
-#/usr/local/bin/immudex_upgrade --check --print;
-#if [ $? -ne 0 ]; then
-#       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-#  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-#    rm -f /tmp/feed.xml;
-#  fi
-#else
-#  if [ "$USER" = "xf0r3m" ]; then
-#    sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;
-#  fi
-#fi       
-echo "====================================================================";

diff --git a/tools/0/012/immudex_crypt b/tools/0/012/immudex_crypt
deleted file mode 100755 (executable)
index 51f5e59..0000000
--- a/tools/0/012/immudex_crypt
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-function help() {
-
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.org COPYLEFT @ 2023";
-  echo "Options:";
-  echo "  list - displaing list of opened and available crypt_LUKS devices";
-  echo "  create - formatting device for crypt_LUKS";
-  echo "  open - opening crypt_LUKS device, after this device is ready to mount";
-  echo "  close - unmount and closing crypt_LUKS devices";
-  echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_crypt create <disk partition>";
-  echo "$ immudex_crypt open <crypt_LUKS device>";
-  echo "$ immudex_crypt close immudex_crypt[0-9] | ic[0-9] | [0-9]";
-}
-
-function list() {
-
-  mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-  
-  echo "==============================================================";
-  echo -e "Opened devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$mapperDeviceList" ]; then
-         for dmDevice in $mapperDeviceList; do
-                   if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                           mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-          device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}');
-                 if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-            echo -e "$device\t /dev/mapper/${dmDevice}\t$mountPoint"; 
-          else
-            echo -e "$device\t /dev/mapper/${dmDevice}\tNot mounted";
-                           fi
-                   fi
-           done 
-  else
-    echo -e "No opened crypt devices was found";
-  fi
-  echo "==============================================================";
-
-  luksDevicesList=$(sudo blkid | grep 'LUKS' | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-  echo "==============================================================";
-  echo -e "crypt_LUKS devices:";
-  echo "==============================================================";
-  echo -e "Device:\t\tMapper name:\t\tMount point:";
-
-  if [ "$luksDevicesList" ]; then
-    for lDevice in $luksDevicesList; do
-      echo -e "$lDevice";
-    done
-  else
-    echo "No crypt device was found";
-  fi
-  echo "==============================================================";
-}
-
-function open() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
-    if [ "$index" ]; then
-      index=$((index + 1));
-    else
-      index=0;
-    fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    dmDevice=$(ls -l /dev/mapper/immudex_crypt${index} | awk '{printf $10}' | cut -d "/" -f 2);
-    if ! $(sudo file -s /dev/${dmDevice} | grep -q 'ext4'); then
-      echo "Could not determine filesystem of unlocked device.";
-      echo -n "Format this device to ext4? (y/n): "
-      read format;
-      if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
-      else
-        echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
-        exit 1;
-      fi
-    fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
-    if [ ! -e /ic${index} ]; then
-      sudo ln -s /media/${USER}/immudex_crypt${index} /ic${index};
-    fi
-  fi
-
-}
-
-function close() {
-
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    if [ $1 -ge 0 ] 2> /dev/null; then
-        cryptfsName="immudex_crypt${1}";
-    elif echo $1 | grep -q 'ic'; then
-        cryptfsName="immudex_crypt$(echo $1 | grep -o '[0-9]')";
-    else
-        cryptfsName=$1;
-    fi
-    if sudo cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then
-      mountPoint=$(df --output=source,target /dev/mapper/${cryptfsName} | tail -1 | awk '{printf $2}');
-      if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then
-        sudo umount -R $mountPoint;
-        sudo cryptsetup close ${cryptfsName};
-      else
-        sudo cryptsetup close ${cryptfsName};
-      fi
-    else
-      echo "Given devices isn't opened crypt device or it was closed before";
-    fi
-  fi
-}
-
-function create() {
-  if [ $# -lt 1 ]; then help; exit 1;
-  else
-    sudo cryptsetup -y -v luksFormat $1;
-  fi
-}
-
-if [ "$1" ]; then
-
-  case $1 in
-    "list") list;;
-    "open") if [ "$2" ]; then open $2;
-            else help; exit 1;
-            fi;;
-    "close") if [ "$2" ]; then close $2;
-            else help; exit 1;
-            fi;;
-    "create") if [ "$2" ]; then create $2 && open $2;
-              else help; exit 1;
-              fi;;
-          *) help;;
-  esac
-else
-  help; exit 1;
-fi  

diff --git a/tools/0/012/immudex_install b/tools/0/012/immudex_install
deleted file mode 100755 (executable)
index 7d10bd1..0000000
--- a/tools/0/012/immudex_install
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-
-RED="\e[31m";
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-while [ true ]; do
-  echo -e "${RED}This script will install immudex on first disk on your machine.${ENDCOLOR}";
-  echo -e "${RED}It could be destructive for data placed on this disk${ENDCOLR}";
-  echo -en "${RED}Are you sure that you want contiune? (y/n): ${ENDCOLOR}";
-  read ans;
-  if [ "$ans" = "y" ]; then break;
-  elif [ "$ans" = "n" ]; then exit 1;
-  fi
-done
-
-set -e
-
-function selectDisk() {
-  disks=$(lsblk | grep 'disk' | awk '{printf $1" "}');
-  if [ $(echo $disks | wc -w) -gt 1 ]; then
-    select drive in $disks; do
-      echo $drive;
-      break;
-    done 
-  else
-         echo $disks | awk '{printf $1}';
-  fi
-}
-
-if $(sudo efibootmgr > /dev/null 2>&1); then
-#uefi installation
-       #partitioning
-  echo -n "Installation immudex in EFI mode ... ";
-  disk=$(selectDisk);
-  originDisk=$disk;   
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-       sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 101M 4G > /dev/null 2>&1;
-
-  if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi
-       
-       #formatting
-       sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1;
-       sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1;
-
-  #Setting label for partition
-       sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1;
-
-       #mount root partition
-       sudo mount /dev/${disk}2 /media > /dev/null 2>&1;
-       
-       #creating directories for efi partition
-       sudo mkdir -p /media/boot/efi > /dev/null 2>&1;
-
-       #mount efi partition
-       sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying whole iso image to the second partition
-       sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1;
-  
-  sudo sed -i 's/bootfrom=removable //g' /media/boot/grub/grub.cfg; 
-
-       #removing unnecessary directories from second partition
-       sudo rm -rf /media/isolinux > /dev/null 2>&1;
-       sudo rm -rf /media/EFI > /dev/null 2>&1;
-
-       #GRUB Installation
-  if [ -f /usr/lib/live/mount/medium/EFI/BOOT/BOOTIA32.EFI ]; then
-    target="i386-efi";
-  else
-    target="x86_64-efi";
-  fi
-       sudo grub-install --target=${target} --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1;
-
-       #Adding entry to EFI Firmware
-       sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1;
-
-  #Umount all mounted filesystems
-  sudo umount -R /media > /dev/null 2>&1;
-
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-else
-#mbr installation
-  echo -n "Installation immudex in BIOS mode ... ";
-
-       #partitioning
-       disk=$(selectDisk);
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-  sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 4G > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       
-  if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi
-
-       #formatting
-       sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1;
-
-       #Setting label for partition is necessary for extlinux bootloader
-       sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1;
-
-       #mount partition in /media directory
-       sudo mount /dev/${disk}1 /media > /dev/null 2>&1;
-
-       #Creating directory for extlinux
-       sudo mkdir /media/extlinux > /dev/null 2>&1;
-       
-       #Instalation extlinux files in abovementioned directory
-       sudo extlinux --install /media/extlinux > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying live directory from iso image to partition
-       sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1;
-
-       #installation extlinux MBR on first sector of hard drive (whole device)
-       sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1;
-
-       #creating extlinux configuration file
-       cat > extlinux.conf <<EOF
-default immudex
-label immudex
-kernel /live/vmlinuz
-append quiet initrd=/live/initrd boot=live overlay-size=25% apparmor=1 security=apparmor
-EOF
-       sudo cp extlinux.conf /media/extlinux > /dev/null 2>&1;
-  rm extlinux.conf;
-
-  #Unmounting filesystems
-  sudo umount /media > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi

diff --git a/tools/0/012/immudex_upgrade b/tools/0/012/immudex_upgrade
deleted file mode 100755 (executable)
index 42f157f..0000000
--- a/tools/0/012/immudex_upgrade
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source library.sh
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.org @ 2023";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-  echo " --version - getting latest version of immudex";
-  echo " --branch <stable/testing> - change immudex branch";
-  echo "  Switch between stable or testing version and vice versa"
-}
-
-function main_upgrade() {
-  set -e
-  ARCH=$(get_machine_arch);
-  if [ ! "$BRANCH" ]; then
-    BRANCH=$(get_debian_branch);
-  fi
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/filesystem.squashfs -O ${1}/live/filesystem.squashfs;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/initrd -O ${1}/live/initrd;
-  sudo wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/${2}/${ARCH}/vmlinuz -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check_distro_version --print);
-    if check_distro_version; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check_distro_version --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check_distro_version; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-elif [ "$1" ] && [ "$1" = "--version" ]; then
-  stable64=$(curl https://ftp.morketsmerke.org/immudex/stable/upgrades/latest/64/version 2>/dev/null)
-  stable32=$(curl https://ftp.morketsmerke.org/immudex/stable/upgrades/latest/32/version 2>/dev/null)
-  testing64=$(curl https://ftp.morketsmerke.org/immudex/testing/upgrades/latest/64/version 2>/dev/null)
-  testing32=$(curl https://ftp.morketsmerke.org/immudex/testing/upgrades/latest/32/version 2>/dev/null)
-  branch=$(get_debian_branch);
-  localVer=$(cat /run/live/medium/live/version);
-  if [ "$(uname -m)" = "x86_64" ]; then
-    arch="amd64";
-    stable=$stable64;
-    testing=$testing64;
-  else
-    arch="i386";
-    stable=$stable32;
-    testing=$testing32;
-  fi
-  echo "Arch: $arch";
-  echo "Local: ${localVer} (${branch})";
-  echo "Stable: $stable";
-  echo "Testing: $testing";
-elif [ "$1" ] && [ "$1" = "--branch" ]; then
-  if [ "$2" ] && ([ "$2" = "stable" ] || [ "$2" = "testing" ]); then
-    BRANCH=$2;
-    ARCH=$(get_machine_arch);
-    export $BRANCH;
-    echo -en "${YELLOW}Do you really want change immudex branch (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo -n "Changing immudex branch to ${BRANCH}...";
-      newVersionTxt=$(curl https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version 2>/dev/null);
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    help; exit 1;
-  fi 
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/012/library.sh b/tools/0/012/library.sh
deleted file mode 100755 (executable)
index b2400f5..0000000
--- a/tools/0/012/library.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-function get_debian_branch() {
-  if grep -q 'bookworm' /etc/os-release; then
-    echo "testing";
-  else
-    echo "stable";
-  fi
-}
-
-function get_machine_arch() {
-  arch=$(uname -m);
-  if [ "$arch" = "i686" ]; then
-    echo "32";
-  else
-    echo "64";
-  fi
-}
-
-function check_distro_version() {
-  set -e
-  root="/run/live/medium";
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
-    fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}

diff --git a/tools/0/012/run-thunderbird b/tools/0/012/run-thunderbird
deleted file mode 100755 (executable)
index c08389a..0000000
--- a/tools/0/012/run-thunderbird
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export HOME=/ic0;
-thunderbird;

diff --git a/tools/0/012/ytplay b/tools/0/012/ytplay
deleted file mode 100755 (executable)
index 0bb0c14..0000000
--- a/tools/0/012/ytplay
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-BLUE="\e[34m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "ytplay - script which could play a video or audio track from youtube";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  -s - search given keyword on youtube.";
-  echo "  -v - play youtube video."
-  echo "  -a - play only youtube video audiotrack";
-  echo "Ommiting -s option, assume you are give a yt video link.";
-  echo "You have to put -v or -a before you paste a yt video link";
-  echo "When you put keywords in -s option, you need to choose";
-  echo "that you want listening an audiotrack (-a) oraz watch video (-v)";
-  echo "Usage:";
-  echo "  $ ytplay -s -a [-f ytdl-format] 'lofi'";
-  echo "  $ ytplay -v https://youtube.com/watch?v=... [-f ytdl-format]";
-  echo "  $ ytplay -a https://youtube.com/watch?v=... [-f ytdl-format]";
-  echo "You can search again the same keywords puting 'r' or 'R' instead";
-  echo "of video numer";
-}
-
-function yt_search() {
-    query=$(echo $* | sed 's/ /+/g');
-    echo -n "Getting youtube site with search results...";
-    wget https://youtube.com/results?search_query=$query -O /tmp/yt.html 2> /dev/null
-    if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-    sed -i 's/,/\n/g' /tmp/yt.html;
-
-    listOfVideos=$(grep -n '^{\"url' /tmp/yt.html | cut -d ":" -f 1 | awk '{printf $1" "}');
-
-    numberOfListElements=$(echo $listOfVideos | wc -w);
-    i=1;
-    lp=1;
-    while [ $i -le $numberOfListElements ]; do
-      if [ $i -eq $numberOfListElements ]; then
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2='$';
-      else
-        j=$((i + 1));
-        ln1=$(echo $listOfVideos | cut -d " " -f $i);
-        ln2=$(echo $listOfVideos | cut -d " " -f $j);
-      fi
-      #if sed -n "${ln1},${ln2}p" /tmp/yt.html | grep -q '"iconType":"LIVE"'; then
-       # i=$((i + 1)); continue;
-      #else
-        title=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'title' | head -1 | cut -d '"' -f 8);
-        channel=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'ownerText' | head -1 | cut -d '"' -f 8);
-        duration=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'simpleText' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$duration" = "simpleText" ]; then duration="\e[31mLive\e[0m"; fi
-        videoid=$(sed -n "${ln1},${ln2}p" /tmp/yt.html | grep 'videoId' | sed -n '2p' | cut -d '"' -f 4);
-        if [ "$title" ] && [ "$channel" ] && [ "$duration" ] && [ "$videoid" ] && [ "$duration" != "SHORTS" ];  then
-          echo -e "${lp}. ${GREEN}${title}${ENDCOLOR}";
-          echo -e "   Channel: ${YELLOW}${channel}${ENDCOLOR}  Duration: ${BLUE}${duration}${ENDCOLOR}";
-          echo "${lp},${videoid},${title},${channel},${duration}" >> /tmp/yt.csv;
-        else
-          i=$((i + 1)); continue;
-        fi
-      #fi
-      i=$((i + 1));
-      lp=$((lp + 1));
-    done
-}
-
-if [ "$1" ]; then
-  if [ "$1" = "-a" ] || [ "$1" = "-v" ]; then
-    mode=$1;
-    shift;
-    link=$(echo $1 | sed 's@https://@@');
-    if [ $# -gt 1 ]; then
-      shift;
-      if [ "$1" = "-f" ]; then
-        shift;
-        if [ "$mode" = "-a" ]; then 
-          format="--no-video --ytdl-format=${1}";
-        else
-          format="--ytdl-format=${1}";
-        fi
-      fi
-    fi
-  elif [ "$1" = "-s" ]; then
-    if [ -f /tmp/yt.html ]; then rm /tmp/yt.html; fi
-    if [ -f /tmp/yt.csv ]; then rm /tmp/yt.csv; fi
-
-    shift;
-    mode=$1;
-    if ! ([ "$mode" = "-v" ] || [ "$mode" = "-a" ]); then help; exit 1; fi
-    shift;
-    if [ "$1" = "-f" ]; then
-      shift;
-      if [ "$mode" = "-a" ]; then 
-        format="--no-video --ytdl-format=${1}";
-      else
-        format="--ytdl-format=${1}";
-      fi
-    fi
-    while [ true ]; do
-      yt_search $*;
-      echo -n "Put number of which video you want to hear/watch: ";
-      read numberOfVideo;
-      if [[ $numberOfVideo -gt 0 ]]; then break;
-      elif [ "$numberOfVideo" = "r" ] || [ "$numberOfVideo" = "R" ]; then
-        continue;
-      else
-        help;
-        exit 1;
-      fi
-    done
-    title=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 3);
-    channel=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 4);
-    duration=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 5);
-    videoId=$(sed -n "${numberOfVideo}p" /tmp/yt.csv | cut -d "," -f 2);
-    clear;
-    echo -e "Title: ${GREEN}${title}${ENDCOLOR}";
-    echo -e "Channel: ${YELLOW}${channel}${ENDCOLOR} Duration: ${BLUE}${duration}${ENDCOLOR}";
-    echo "====================================================================";
-    link=${videoId}; 
-   else
-    help;
-    exit 1;
-  fi
-  
-  if [ "$mode" = "-a" ]; then 
-      if [ ! "$format" ]; then format="--ytdl-format=bestaudio"; fi
-        mpv ${format} ytdl://${link};
-  elif [ "$mode" = "-v" ]; then mpv ${format} ytdl://${link}; fi
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/013/create_media b/tools/0/013/create_media
deleted file mode 100755 (executable)
index 9471ff1..0000000
--- a/tools/0/013/create_media
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "create_media - script used for write iso image to usb drive(mainly)";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  --i386-efi - creating 32-bit EFI usb drive with iso image";
-  echo "  (comapatible with immudex only iso images)";
-  echo "Usage:";
-  echo "  $ create_media [--i386-efi] <usb_disk> <iso_image>";
-}
-
-if [ "$1" ] && [ "$1" = "--i386-efi" ]; then target="i386-efi"; shift; fi
-if [ "$1" ] && echo $1 | grep -Eq '/dev/(sd[a-z]|vd[a-z]|mmcblk[0-9])'; then
-  disk=$1; shift;
-else
-  help;
-  exit 1;
-fi
-if [ "$1" ] && file $1 | grep -q 'ISO 9660'; then 
-  iso=$1;
-else
-  help;
-  exit 1;
-fi
-
-if [ "$target" ]; then
-  echo -n "Writing zeros to 1st megabyte on disk..."; 
-  sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating MS-DOS partitionig scheme on disk..."; 
-  sudo parted $disk mklabel msdos > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating FAT-32 partition...";
-  sudo parted $disk mkpart primary fat32 1 100%Free > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating VFAT filesystem on partition...";
-  sudo mkfs.vfat ${disk}1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/usb directory...";
-  sudo mkdir /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-  
-  echo -n "Mounting VFAT partition on /mnt/usb...";
-  sudo mount ${disk}1 /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Instalation GRUB on disk...";
-  sudo grub-install --target=i386-efi --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --bootloader-id=boot --removable > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/iso directory...";
-  sudo mkdir /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-
-  echo -n "Mounting iso file on /mnt/iso...";
-  sudo mount $iso /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying grub config files to the disk...";
-  sudo cp /mnt/iso/boot/grub/font.pf2 /mnt/usb/boot/grub > /dev/null 2>&1;
-  sudo cp /mnt/iso/boot/grub/grub.cfg /mnt/usb/boot/grub > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying immudex files to the disk..."; 
-  sudo cp -r /mnt/iso/live /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating empty DEBIAN file...";
-  sudo touch /mnt/usb/DEBIAN > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Umounting all mounted filesystems...";
-  sudo umount /mnt/* > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-else
-  echo -n "Writing zeros to 1st megabyte on disk..."; 
-  sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Writing iso image to the disk..."
-  sudo dd if=$iso bs=1M of=$disk > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-fi 

diff --git a/tools/0/013/immudex_install b/tools/0/013/immudex_install
deleted file mode 100755 (executable)
index 1994533..0000000
--- a/tools/0/013/immudex_install
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-RED="\e[31m";
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-while [ true ]; do
-  echo -e "${RED}This script will install immudex on first disk on your machine.${ENDCOLOR}";
-  echo -e "${RED}It could be destructive for data placed on this disk${ENDCOLR}";
-  echo -en "${RED}Are you sure that you want contiune? (y/n): ${ENDCOLOR}";
-  read ans;
-  if [ "$ans" = "y" ]; then break;
-  elif [ "$ans" = "n" ]; then exit 1;
-  fi
-done
-
-set -e
-
-function selectDisk() {
-  disks=$(lsblk | grep 'disk' | awk '{printf $1" "}');
-  if [ $(echo $disks | wc -w) -gt 1 ]; then
-    select drive in $disks; do
-      echo $drive;
-      break;
-    done 
-  else
-         echo $disks | awk '{printf $1}';
-  fi
-}
-
-if $(sudo efibootmgr > /dev/null 2>&1); then
-#uefi installation
-       #partitioning
-  echo -n "Installation immudex in EFI mode ... ";
-  disk=$(selectDisk);
-  originDisk=$disk;   
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-       sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 101M 4G > /dev/null 2>&1;
-
-  if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi
-       
-       #formatting
-       sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1;
-       sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1;
-
-  #Setting label for partition
-       sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1;
-
-       #mount root partition
-       sudo mount /dev/${disk}2 /media > /dev/null 2>&1;
-       
-       #creating directories for efi partition
-       sudo mkdir -p /media/boot/efi > /dev/null 2>&1;
-
-       #mount efi partition
-       sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying whole iso image to the second partition
-       sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1;
-  
-  sudo sed -i '/set\ timeout=/ s/30/5/' /media/boot/grub/grub.cfg;  
-  sudo sed -i 's/bootfrom=removable //g' /media/boot/grub/grub.cfg; 
-
-       #removing unnecessary directories from second partition
-       sudo rm -rf /media/isolinux > /dev/null 2>&1;
-       sudo rm -rf /media/EFI > /dev/null 2>&1;
-
-       #GRUB Installation
-  if [ -f /usr/lib/live/mount/medium/EFI/BOOT/BOOTIA32.EFI ]; then
-    target="i386-efi";
-  else
-    target="x86_64-efi";
-  fi
-       sudo grub-install --target=${target} --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1;
-
-       #Adding entry to EFI Firmware
-       sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1;
-
-  #Umount all mounted filesystems
-  sudo umount -R /media > /dev/null 2>&1;
-
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-else
-#mbr installation
-  echo -n "Installation immudex in BIOS mode ... ";
-
-       #partitioning
-       disk=$(selectDisk);
-  if [ ! "$disk" ]; then exit 1; fi
-
-  sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null
-
-  sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 4G > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       
-  if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi
-
-       #formatting
-       sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1;
-
-       #Setting label for partition is necessary for extlinux bootloader
-       sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1;
-
-       #mount partition in /media directory
-       sudo mount /dev/${disk}1 /media > /dev/null 2>&1;
-
-       #Creating directory for extlinux
-       sudo mkdir /media/extlinux > /dev/null 2>&1;
-       
-       #Instalation extlinux files in abovementioned directory
-       sudo extlinux --install /media/extlinux > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying live directory from iso image to partition
-       sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1;
-
-       #installation extlinux MBR on first sector of hard drive (whole device)
-       sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1;
-
-       #creating extlinux configuration file
-       cat > extlinux.conf <<EOF
-default immudex
-label immudex
-kernel /live/vmlinuz
-append quiet initrd=/live/initrd boot=live overlay-size=25% apparmor=1 security=apparmor
-EOF
-       sudo cp extlinux.conf /media/extlinux > /dev/null 2>&1;
-  rm extlinux.conf;
-
-  #Unmounting filesystems
-  sudo umount /media > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi

diff --git a/tools/0/013/immudex_upgrade b/tools/0/013/immudex_upgrade
deleted file mode 100755 (executable)
index 3bf1ca0..0000000
--- a/tools/0/013/immudex_upgrade
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source library.sh
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.org @ 2023";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-  echo " --version - getting latest version of immudex";
-  echo " --branch <stable/testing> - change immudex branch";
-  echo "  Switch between stable or testing version and vice versa"
-}
-
-function main_upgrade() {
-  set -e
-  ARCH=$(get_machine_arch);
-  if [ ! "$BRANCH" ]; then
-    BRANCH=$(get_debian_branch);
-  fi
-  MIRROR=$(check_mirror);
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/filesystem.squashfs -O ${1}/live/filesystem.squashfs;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/initrd -O ${1}/live/initrd;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/vmlinuz -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-function check_mirror() {
-  mirrorList=("sourceforge.net=https://sourceforge.net/projects/immudex/files", "plikownia.zsgronowo.edu.pl=https://plikownia.zsgronowo.edu.pl/pliki/Nauczyciele/Administrator/files", "ftp.morketsmerke.org=https://ftp.morketsmerke.org");
-  for i in ${mirrorList[@]}; do
-    name=$(echo $i | cut -d "=" -f 1);
-    address=$(echo $i | cut -d "=" -f 2 | sed 's/,//');
-    echo -en "Checking is ${YELLOW}${name}${ENDCOLOR} available..." 1>&2;
-    curl ${address}/immudex/stable/upgrades/latest/64/version > /dev/null 2>&1;
-    if [ $? -eq 0 ]; then 
-      echo -e "[ ${GREEN}OK${ENDCOLOR} ]" 1>&2;
-      mirror=$address;
-      mirror_name=$name;
-    else
-      echo -e "[ ${RED}FAIL${ENDCOLOR} ]" 1>&2;
-    fi
-  done
-  if [ "$mirror" ]; then 
-    echo "Choosing $mirror_name" 1>&2;
-    echo $mirror;
-  else exit 1; fi
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check_distro_version --print);
-    if check_distro_version; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  elif [ "$2" = "--mirror" ]; then
-    mirror=$(check_mirror);
-    echo $mirror; 
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check_distro_version --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check_distro_version; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Upgrading immudex to the newest version...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Refreshing immudex to the latest iso image...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-elif [ "$1" ] && [ "$1" = "--version" ]; then
-  MIRROR=$(check_mirror);
-  stable64=$(curl ${MIRROR}/immudex/stable/upgrades/latest/64/version 2>/dev/null)
-  stable32=$(curl ${MIRROR}/immudex/stable/upgrades/latest/32/version 2>/dev/null)
-  testing64=$(curl ${MIRROR}/immudex/testing/upgrades/latest/64/version 2>/dev/null)
-  testing32=$(curl ${MIRROR}/immudex/testing/upgrades/latest/32/version 2>/dev/null)
-  branch=$(get_debian_branch);
-  localVer=$(cat /run/live/medium/live/version);
-  if [ "$(uname -m)" = "x86_64" ]; then
-    arch="amd64";
-    stable=$stable64;
-    testing=$testing64;
-  else
-    arch="i386";
-    stable=$stable32;
-    testing=$testing32;
-  fi
-  echo "Arch: $arch";
-  echo "Local: ${localVer} (${branch})";
-  echo "Stable: $stable";
-  echo "Testing: $testing";
-elif [ "$1" ] && [ "$1" = "--branch" ]; then
-  if [ "$2" ] && ([ "$2" = "stable" ] || [ "$2" = "testing" ]); then
-    BRANCH=$2;
-    ARCH=$(get_machine_arch);
-    export $BRANCH;
-    echo -en "${YELLOW}Do you really want change immudex branch (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Changing immudex branch to ${BRANCH}...";
-      newVersionTxt=$(curl https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version 2>/dev/null);
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Changing immudex branch to ${BRANCH}...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    help; exit 1;
-  fi 
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/013/meteo b/tools/0/013/meteo
deleted file mode 100755 (executable)
index e447a1e..0000000
--- a/tools/0/013/meteo
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-function help() {
-  echo "meteo - prognoza pogody z meteo.icm.edu.pl"
-  echo "morketsmerke.org @ 2023";
-  echo "Opcje:";
-  echo "  -h - legenda, pozwalająca na odczytanie prognozy";
-  echo "Użycie:";
-  echo "$ meteo <miasto>";
-}
-
-rm /tmp/meteo*;
-
-if [ "$1" ] && [ "$1" = "-h" ]; then
-  xdg-open /usr/share/meteo/leg60.png;
-elif [ "$1" ]; then
-  if [ ! "$2" ]; then prognoza=60;
-  else prognoza=$2; fi
-
-  miasto=$(echo "$1" | sed -e 's/ą/a/g' -e 's/ę/e/g' -e 's/ć/c/g' -e 's/ż/z/g' -e 's/ś/s/g' -e 's/ź/z/g' -e 's/ń/n/g' -e 's/ó/o/g' -e 's/ł/l/g');
-  #miasto=${miasto^};
-
-  wget m.meteo.pl/${miasto}/${prognoza} -O /tmp/meteo 2>/dev/null;
-  link=$(grep "image_${prognoza}" /tmp/meteo | cut -d '"' -f 2);
-  wget $link -O /tmp/meteo_${miasto}.png 2>/dev/null;
-  xdg-open /tmp/meteo_${miasto}.png;
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/0/013/sync.sh b/tools/0/013/sync.sh
deleted file mode 100755 (executable)
index 9d7c64a..0000000
--- a/tools/0/013/sync.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-source ~/.sync.d/sync.conf;
-
-if [ ! -d "${HOME}/${ldirectory}" ]; then mkdir "${HOME}/${ldirectory}"; fi
-
-function printhelp {
-
-       echo "Skrypt szybkiej synchronizacji katalogu zdalnego";
-       echo "morketsmerke.org";
-       echo "2023; COPYLEFT; ALL RIGHTS REVERSED";
-       echo "";
-       echo "push - Przesłanie danych z katalogu lokalnego na katalog zdalny";
-       echo "pull - Pobranie zawartości katalogu zdalnego do katalogu lokalnego";
-  echo "Plik konfiguracyjny musi znajdować się na ścieżce: ~/.sync.d/sync.conf";
-  echo "Przykładowy plik konfiguracyjny znajduje się na ścieżce: /usr/share/sync.sh/sync.conf";
-}
-if [ ! "$1" ]; then 
-
-       printhelp;
-       exit 1;
-
-else
-       if [ "$1" = "push" ]; then 
-       
-               echo "[*] Synchronizacja: local -> remote";
-               rsync -avu ${HOME}/${ldirectory}/* ${ruser}@${server}:${rdirectory};
-
-       elif [ "$1" = "pull" ]; then 
-
-               echo "[*] Synchronizacja remote -> local";
-               rsync -avu ${ruser}@${server}:${rdirectory}/* ${HOME}/${ldirectory};
-
-       else 
-               printhelp;
-               exit 1;
-       fi
-
-fi

diff --git a/tools/0/immudex_install b/tools/0/immudex_install
deleted file mode 100755 (executable)
index 4fe15b6..0000000
--- a/tools/0/immudex_install
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-RED="\e[31m";
-GREEN="\e[32m";
-ENDCOLOR="\e[0m";
-
-while [ true ]; do
-  echo -e "${RED}This script will install immudex on first disk on your machine.${ENDCOLOR}";
-  echo -e "${RED}It could be destructive for data placed on this disk${ENDCOLR}";
-  echo -en "${RED}Are you sure that you want contiune? (y/n): ${ENDCOLOR}";
-  read ans;
-  if [ "$ans" = "y" ]; then break; fi
-done
-
-set -e
-
-function selectDisk() {
-  disks=$(lsblk | grep 'disk' | awk '{printf $1" "}');
-  if [ $(echo $disks | wc -w) -gt 1 ]; then
-    select drive in $disks; do
-      echo $drive;
-      break;
-    done 
-  else
-         echo $disks | awk '{printf $1}';
-  fi
-}
-
-if $(sudo efibootmgr > /dev/null 2>&1); then
-#uefi installation
-       #partitioning
-  echo -n "Installation immudex in EFI mode ... ";
-  disk=$(selectDisk);
-  originDisk=$disk;   
-  if [ ! "$disk" ]; then exit 1; fi
-
-       sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 101M 4G > /dev/null 2>&1;
-
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-       
-       #formatting
-       sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1;
-       sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1;
-
-  #Setting label for partition
-       sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1;
-
-       #mount root partition
-       sudo mount /dev/${disk}2 /media > /dev/null 2>&1;
-       
-       #creating directories for efi partition
-       sudo mkdir -p /media/boot/efi > /dev/null 2>&1;
-
-       #mount efi partition
-       sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying whole iso image to the second partition
-       sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1;
-
-       #removing unnecessary directories from second partition
-       sudo rm -rf /media/isolinux > /dev/null 2>&1;
-       sudo rm -rf /media/EFI > /dev/null 2>&1;
-
-       #GRUB Installation
-       sudo grub-install --target=x86_64-efi --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1;
-
-       #Adding entry to EFI Firmware
-       sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1;
-
-  #Umount all mounted filesystems
-  sudo umount -R /media > /dev/null 2>&1;
-
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-
-else
-#mbr installation
-  echo -n "Installation immudex in BIOS mode ... ";
-
-       #partitioning
-       disk=$(selectDisk);
-  if [ ! "$disk" ]; then exit 1; fi
-  sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1;
-       sudo parted /dev/$disk mkpart primary 1 4G > /dev/null 2>&1;
-       sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1;
-       
-  if $(echo $disk | egrep -qo "mmc|nve"); then disk="${disk}p"; fi
-
-       #formatting
-       sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1;
-
-       #Setting label for partition is necessary for extlinux bootloader
-       sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1;
-
-       #mount partition in /media directory
-       sudo mount /dev/${disk}1 /media > /dev/null 2>&1;
-
-       #Creating directory for extlinux
-       sudo mkdir /media/extlinux > /dev/null 2>&1;
-       
-       #Instalation extlinux files in abovementioned directory
-       sudo extlinux --install /media/extlinux > /dev/null 2>&1;
-
-       #mount iso image in /mnt directory
-       #sudo mount /dev/sr0 /mnt > /dev/null 2>&1;
-
-       #copying live directory from iso image to partition
-       sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1;
-
-       #installation extlinux MBR on first sector of hard drive (whole device)
-       sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1;
-
-       #creating extlinux configuration file
-       cat > extlinux.conf <<EOF
-default immudex
-label immudex
-kernel /live/vmlinuz
-append quiet initrd=/live/initrd boot=live overlay-size=25% apparmor=1 security=apparmor
-EOF
-       sudo cp extlinux.conf /media/extlinux > /dev/null 2>&1;
-
-  #Unmounting filesystems
-  sudo umount /media > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
-fi

diff --git a/tools/0/protected b/tools/0/protected
deleted file mode 100755 (executable)
index bfb0804..0000000
--- a/tools/0/protected
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-mapperDeviceList=$(ls /dev/mapper --hide=control | awk '{printf $1" "}');
-
-if [ "$mapperDeviceList" ]; then
-
-       for dmDevice in $mapperDeviceList; do
-               if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
-                       mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
-                       if [ "$mountPoint" ]; then
-                               if $(sudo lsof $mountPoint > /dev/null 2>&1); then
-                                       notify-send "Protected" "The $1 cannot be run, because your LUKS partition is open." --icon=dialog-error;
-                                       exit 1;
-                               else
-                                       sudo umount $mountPoint;
-                                       sudo cryptsetup close /dev/mapper/${dmDevice};
-                               fi
-                       fi
-               fi
-       done
-  $1;
-else
-       $1;
-
-fi

diff --git a/tools/100/autostart-x4notes b/tools/100/autostart-x4notes
deleted file mode 100755 (executable)
index a41856d..0000000
--- a/tools/100/autostart-x4notes
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-while [ ! -h /dev/mapper/immudex_crypt0 ]; do sleep 1; done
-HOME=/ic0 xfce4-notes > /dev/null 2>&1 &

diff --git a/tools/100/create_media b/tools/100/create_media
deleted file mode 100755 (executable)
index 9471ff1..0000000
--- a/tools/100/create_media
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-
-function help() {
-  echo "create_media - script used for write iso image to usb drive(mainly)";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo "Options:";
-  echo "  --i386-efi - creating 32-bit EFI usb drive with iso image";
-  echo "  (comapatible with immudex only iso images)";
-  echo "Usage:";
-  echo "  $ create_media [--i386-efi] <usb_disk> <iso_image>";
-}
-
-if [ "$1" ] && [ "$1" = "--i386-efi" ]; then target="i386-efi"; shift; fi
-if [ "$1" ] && echo $1 | grep -Eq '/dev/(sd[a-z]|vd[a-z]|mmcblk[0-9])'; then
-  disk=$1; shift;
-else
-  help;
-  exit 1;
-fi
-if [ "$1" ] && file $1 | grep -q 'ISO 9660'; then 
-  iso=$1;
-else
-  help;
-  exit 1;
-fi
-
-if [ "$target" ]; then
-  echo -n "Writing zeros to 1st megabyte on disk..."; 
-  sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating MS-DOS partitionig scheme on disk..."; 
-  sudo parted $disk mklabel msdos > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating FAT-32 partition...";
-  sudo parted $disk mkpart primary fat32 1 100%Free > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating VFAT filesystem on partition...";
-  sudo mkfs.vfat ${disk}1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/usb directory...";
-  sudo mkdir /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-  
-  echo -n "Mounting VFAT partition on /mnt/usb...";
-  sudo mount ${disk}1 /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Instalation GRUB on disk...";
-  sudo grub-install --target=i386-efi --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --bootloader-id=boot --removable > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Creating /mnt/iso directory...";
-  sudo mkdir /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]";
-  else echo -e "[${YELLOW}Directory exist!${ENDCOLOR}]"; fi
-
-  echo -n "Mounting iso file on /mnt/iso...";
-  sudo mount $iso /mnt/iso > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying grub config files to the disk...";
-  sudo cp /mnt/iso/boot/grub/font.pf2 /mnt/usb/boot/grub > /dev/null 2>&1;
-  sudo cp /mnt/iso/boot/grub/grub.cfg /mnt/usb/boot/grub > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Copying immudex files to the disk..."; 
-  sudo cp -r /mnt/iso/live /mnt/usb > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Creating empty DEBIAN file...";
-  sudo touch /mnt/usb/DEBIAN > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-  
-  echo -n "Umounting all mounted filesystems...";
-  sudo umount /mnt/* > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-else
-  echo -n "Writing zeros to 1st megabyte on disk..."; 
-  sudo dd if=/dev/zero bs=1M of=$disk count=1 > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-
-  echo -n "Writing iso image to the disk..."
-  sudo dd if=$iso bs=1M of=$disk > /dev/null 2>&1;
-  if [ $? -eq 0 ]; then echo -e "[${GREEN}OK${ENDCOLOR}]"; fi
-fi 

diff --git a/tools/100/immudex_hostname b/tools/100/immudex_hostname
deleted file mode 100755 (executable)
index d147a2a..0000000
--- a/tools/100/immudex_hostname
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-vendor=$(hostnamectl | grep 'Vendor' | awk '{printf $3}')
-modelLine=$(hostnamectl | grep 'Model' | awk '{printf $3}')
-model=$(hostnamectl | grep 'Model' | awk '{printf $4}')
-
-case $vendor in
-  "Lenovo") vendorShort="l";;
-  "Dell") vendorShort="d";;
-  *) hName="immudex";;
-esac
-
-case $modelLine in
-  "ThinkPad") mLShort="TP";;
-  "Latitude") mLShort="Lat";;
-  *) hName="immudex";;
-esac
-
-if [ ! "$hName" ]; then
-  hName="${vendorShort}-${mLShort}-$model"
-  sudo hostnamectl set-hostname $hName;
-  sudo sed -i "s/immudex/${hName}/" /etc/hosts;
-  echo $hName | sudo tee /etc/hostname > /dev/null;
-fi
-

diff --git a/tools/100/immudex_upgrade b/tools/100/immudex_upgrade
deleted file mode 100755 (executable)
index 3bf1ca0..0000000
--- a/tools/100/immudex_upgrade
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source library.sh
-
-RED="\e[31m";
-GREEN="\e[32m";
-YELLOW="\e[33m";
-ENDCOLOR="\e[0m";
-root="/run/live/medium";
-
-function help() {
-  echo "immudex_upgrade - script for searching upgrades and upgrade immudex";
-  echo "morketsmerke.org @ 2023";
-  echo "Options:";
-  echo " --check --print - check there are upgrades for immudex";
-  echo " --upgrade - check there are upgrades for immudex and install them.";
-  echo "  If there is no new version, script will propose refreshing";
-  echo "  current immudex installation, its helpful when you tried";
-  echo "  remaster immudex and you get any trouble with this".
-  echo " --version - getting latest version of immudex";
-  echo " --branch <stable/testing> - change immudex branch";
-  echo "  Switch between stable or testing version and vice versa"
-}
-
-function main_upgrade() {
-  set -e
-  ARCH=$(get_machine_arch);
-  if [ ! "$BRANCH" ]; then
-    BRANCH=$(get_debian_branch);
-  fi
-  MIRROR=$(check_mirror);
-  rootPart=$(grep "${1}" /etc/mtab | head -1 | awk '{printf $1}');
-  sudo mount $rootPart $1 -o remount,rw;
-  sudo rm -f ${1}/live/*;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/filesystem.squashfs -O ${1}/live/filesystem.squashfs;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/initrd -O ${1}/live/initrd;
-  sudo wget -q ${MIRROR}/immudex/${BRANCH}/upgrades/${2}/${ARCH}/vmlinuz -O ${1}/live/vmlinuz;
-  echo "$2" > /tmp/version;
-  sudo cp /tmp/version ${1}/live;
-}
-
-function check_mirror() {
-  mirrorList=("sourceforge.net=https://sourceforge.net/projects/immudex/files", "plikownia.zsgronowo.edu.pl=https://plikownia.zsgronowo.edu.pl/pliki/Nauczyciele/Administrator/files", "ftp.morketsmerke.org=https://ftp.morketsmerke.org");
-  for i in ${mirrorList[@]}; do
-    name=$(echo $i | cut -d "=" -f 1);
-    address=$(echo $i | cut -d "=" -f 2 | sed 's/,//');
-    echo -en "Checking is ${YELLOW}${name}${ENDCOLOR} available..." 1>&2;
-    curl ${address}/immudex/stable/upgrades/latest/64/version > /dev/null 2>&1;
-    if [ $? -eq 0 ]; then 
-      echo -e "[ ${GREEN}OK${ENDCOLOR} ]" 1>&2;
-      mirror=$address;
-      mirror_name=$name;
-    else
-      echo -e "[ ${RED}FAIL${ENDCOLOR} ]" 1>&2;
-    fi
-  done
-  if [ "$mirror" ]; then 
-    echo "Choosing $mirror_name" 1>&2;
-    echo $mirror;
-  else exit 1; fi
-}
-
-if [ "$1" ] && [ "$1" = "--check" ]; then
-  if [ "$2" ] && [ "$2" = "--print" ]; then
-    newVersion=$(check_distro_version --print);
-    if check_distro_version; then
-      echo -e "${YELLOW}New version (${ENDCOLOR}${RED}$newVersion${ENDCOLOR}${YELLOW}) of immudex is available to upgrade.${ENDCOLOR}";
-    else
-       echo -e "${YELLOW}This (${ENDCOLOR}${GREEN}$newVersion${ENDCOLOR}${YELLOW}) is the latest version of immudex.${ENDCOLOR}";
-    fi
-  elif [ "$2" = "--mirror" ]; then
-    mirror=$(check_mirror);
-    echo $mirror; 
-  fi
-elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
-  newVersionTxt=$(check_distro_version --print);
-  newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-  if check_distro_version; then
-    echo -en "${YELLOW}New version "
-    echo -en "(${ENDCOLOR}${RED}${newVersionTxt}${ENDCOLOR}${YELLOW}) "
-    echo -e "of immudex is available.${ENDCOLOR}";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want upgrade this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Upgrading immudex to the newest version...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Upgrading immudex to the newest version...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    echo -e "${GREEN}There is no newer version of immudex,${ENDCOLOR}"; 
-    echo -e "${YELLOW}but you can copy fresh system files from latest iso image";
-    echo -e "${RED}Warning, reboot maybe necessary to continue work on this machine${ENDCOLOR}";
-    echo -en "${YELLOW}Do you want refresh this system? (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Refreshing immudex to the latest iso image...";
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Refreshing immudex to the latest iso image...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-    exit 0;
-  fi
-elif [ "$1" ] && [ "$1" = "--version" ]; then
-  MIRROR=$(check_mirror);
-  stable64=$(curl ${MIRROR}/immudex/stable/upgrades/latest/64/version 2>/dev/null)
-  stable32=$(curl ${MIRROR}/immudex/stable/upgrades/latest/32/version 2>/dev/null)
-  testing64=$(curl ${MIRROR}/immudex/testing/upgrades/latest/64/version 2>/dev/null)
-  testing32=$(curl ${MIRROR}/immudex/testing/upgrades/latest/32/version 2>/dev/null)
-  branch=$(get_debian_branch);
-  localVer=$(cat /run/live/medium/live/version);
-  if [ "$(uname -m)" = "x86_64" ]; then
-    arch="amd64";
-    stable=$stable64;
-    testing=$testing64;
-  else
-    arch="i386";
-    stable=$stable32;
-    testing=$testing32;
-  fi
-  echo "Arch: $arch";
-  echo "Local: ${localVer} (${branch})";
-  echo "Stable: $stable";
-  echo "Testing: $testing";
-elif [ "$1" ] && [ "$1" = "--branch" ]; then
-  if [ "$2" ] && ([ "$2" = "stable" ] || [ "$2" = "testing" ]); then
-    BRANCH=$2;
-    ARCH=$(get_machine_arch);
-    export $BRANCH;
-    echo -en "${YELLOW}Do you really want change immudex branch (y/n):${ENDCOLOR} ";
-    read commit;
-    if [ $commit = "y" ]; then
-      echo "Changing immudex branch to ${BRANCH}...";
-      newVersionTxt=$(curl https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version 2>/dev/null);
-      main_upgrade $root $newVersionTxt;
-      if [ $? -eq 0 ]; then echo -e "Changing immudex branch to ${BRANCH}...[ ${GREEN}OK${ENDCOLOR} ]"; fi
-    else
-      exit 1;
-    fi
-  else
-    help; exit 1;
-  fi 
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/100/import_gpgkeys b/tools/100/import_gpgkeys
deleted file mode 100755 (executable)
index dfb9ff9..0000000
--- a/tools/100/import_gpgkeys
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [ -f ~/public.gpg ] && [ -f ~/private.gpg ]; then
-  gpg --import ~/public.gpg
-  gpg --import ~/private.gpg
-  userId=$(gpg --list-keys | sed -nr 's/.+<(.*)>$/\1/p');
-  gpg --edit-key $userId;
-fi

diff --git a/tools/100/import_sshkeys b/tools/100/import_sshkeys
deleted file mode 100755 (executable)
index 3cb56ad..0000000
--- a/tools/100/import_sshkeys
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if $(ls $HOME | grep -q '.*_rsa.*'); then
-  if [ -d /home/$USER/.ssh ]; then
-   cp -v ~/*_rsa* /home/$USER/.ssh;
-  else
-    mkdir /home/$USER/.ssh;
-    chmod 700 /home/$USER/.ssh;
-    cp -v ~/*_rsa* /home/$USER/.ssh;
-  fi
-fi
-

diff --git a/tools/100/library.sh b/tools/100/library.sh
deleted file mode 100755 (executable)
index 1cb2454..0000000
--- a/tools/100/library.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-function get_debian_branch() {
-  if grep -q 'trixie' /etc/os-release; then
-    echo "testing";
-  else
-    echo "stable";
-  fi
-}
-
-function get_machine_arch() {
-  arch=$(uname -m);
-  if [ "$arch" = "i686" ]; then
-    echo "32";
-  else
-    echo "64";
-  fi
-}
-
-function check_distro_version() {
-  set -e
-  root="/run/live/medium";
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
-    fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}

diff --git a/tools/100/morketsmerke b/tools/100/morketsmerke
deleted file mode 100755 (executable)
index 7193473..0000000
--- a/tools/100/morketsmerke
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-function help() {
-  echo "======================================================================";
-  echo "morketsmerke - script for fetch and adjust morketsmerke.net site";
-  echo "as offline available source of information.";
-  echo "morketsmerke.net COPYLEFT @ 2022";
-  echo;
-  echo "Options:";
-  echo "  --browser - launching fetched site in default application for open"
-  echo "  html sites";
-  echo "  -[-]<any_other_chars_or_strings> - print this message";
-  echo "By default script open downloaded site in terminal via W3M browser with";
-  echo "monochrome mode";
-  echo;
-  echo "Usage:";
-  echo "  $ morketsmerke [--browser]";
-}
-
-function R() {
-  
-  if [ "$path" ]; then path=${path}/${1};
-  else path=$1;
-  fi
-
-  fileList=$(ls $path);
-  for file in $fileList; do
-    if [ -d ${path}/${file} ]; then R ${file};
-    else
-      sed -i 's@https://morketsmerke.github.io/@/usr/share/doc/morketsmerke/index.html@' ${path}/${file};
-      sed -i 's@https://morketsmerke.github.io@/usr/share/doc/morketsmerke/index.html@'  ${path}/${file};
-      sed -i 's@/style.css@/usr/share/doc/morketsmerke/style.css@' ${path}/${file};
-    fi
-  done
-  path=$(echo $path | sed "s@/$1@@")
-
-}
-
-function install_morketsmerke() {
-
-  if [ -d morketsmerke.github.io ]; then rm -rf morketsmerke.github.io; fi
-  if [ ! -d morketsmerke.github.io ]; then
-    git clone https://github.com/morketsmerke/morketsmerke.github.io;
-  else
-    exit 1;
-  fi
-
-  R morketsmerke.github.io
-
-  if [ -d /usr/share/doc/morketsmerke ]; then 
-    sudo rm -rf /usr/share/doc/morketsmerke;
-  fi
-
-  sudo mv morketsmerke.github.io /usr/share/doc/morketsmerke
-
-}
-
-/usr/bin/ping -c 1 wp.pl >> /dev/null 2>&1;
-if [ $? -eq 0 ]; then install_morketsmerke; fi
-
-morketsmerke_path=/usr/share/doc/morketsmerke;
-
-if [ "$1" ] && [ "$1" = "--browser" ]; then
-  xdg-open ${morketsmerke_path}/index.html;
-elif [ "$1" ]; then
-  help;
-  exit 1;
-else
-  w3m -M ${morketsmerke_path}/index.html;
-fi

diff --git a/tools/100/motd2 b/tools/100/motd2
deleted file mode 100755 (executable)
index da11dcc..0000000
--- a/tools/100/motd2
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-/usr/bin/figlet immudex;
-echo;
-echo "Today is: $(date)";
-echo;
-echo "System summary: ";
-cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
-cpuUsage=$((100 - $cpuIdle));
-echo -e "  \tCPU: ${cpuUsage}%";
-echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-if $(df -h 2> /dev/null | grep -q '/dev/mapper'); then
-  i=1;
-  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
-  amountOfDisks=$(df -h 2> /dev/null | grep '/dev/mapper' | wc -l | awk '{printf $1}');
-  while [ $i -le $amountOfDisks ]; do
-    diskSize=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
-    diskFree=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
-    diskUsage_perc=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
-  #FCP = First Crypt Partition
-    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
-    i=$((i + 1));
-  done
-else
-  echo -e "  \tCRYPT_PART: N/A";
-fi
-echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
-utime=$(uptime | awk '{printf $3}' | sed 's/,//');
-if $(echo $utime | grep -q ":"); then
-  echo -e "  \tUPTIME: ${utime}";
-else
-  echo -e "  \tUPTIME: 0:${utime}";
-fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
-echo;
-echo -e "morketsmerke.org @ 2023 https://github.com/xf0r3m/immudex";
-echo;
-#/usr/local/bin/immudex_upgrade --check --print;
-#if [ $? -ne 0 ]; then
-#       echo -e "\e[31mThere is no internet connection or internal error.\e[0m";
-#  if [ -f /tmp/feed.xml ] && [ ! -s /tmp/feed.xml ]; then
-#    rm -f /tmp/feed.xml;
-#  fi
-#else
-#  if [ "$USER" = "xf0r3m" ]; then
-#    sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;
-#  fi
-#fi       
-echo "====================================================================";

diff --git a/tools/100/newsfeed b/tools/100/newsfeed
deleted file mode 100755 (executable)
index a3a426a..0000000
--- a/tools/100/newsfeed
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-
-function help() {
-  echo "newsfeed - fetch and browse news feed from rss and atom channels";
-  echo "morketsmerke.net; COPYLEFT @ 2022";
-  echo;
-  echo "Options:";
-  echo "  --list - shows numbered list of names, saved in ~/.newsfeed names and";
-  echo "    URL of rss channels";
-  echo "  --check - fetching new rss channel file from source";
-  echo "  --show <number_of_channel> - shows numbered list of news titles.";
-  echo "    Number of channel you can get from --list option.";
-  echo "  --open <number_of_title> - open web browser on link, which are under";
-  echo "    titles of news on rss channel. Number of title you can get";
-  echo "    from --show option. This option based on the last showed rss";
-  echo "    channel feed.";
-  echo;
-  echo "The ~/.newsfeed file:";
-  echo "  This file is simple csv (semicolon separated values) file which";
-  echo "  store rss channels in one line. One by one. The one line";
-  echo "  contains: name and URL of rss feed. For example:";
-  echo;
-  echo "    News Feed;https://newsfeed.example.org/rss";
-} 
-if [ ! -s ~/.newsfeed ]; then
-  help;
-  exit 1;
-else
-  if [ ! "$1" ] || ([ "$1" != "--list" ] && \
-    [ "$1" != "--check" ] && \
-    [ "$1" != "--show" ] && \
-    [ "$1" != "--open" ]); then
-      help;
-      exit 1;
-  fi
-  amountOfSubscriptions=$(cat ~/.newsfeed | wc -l);
-  i=1;
-  while [ $i -le $amountOfSubscriptions ]; do
-    newsfeedLine=$(sed -n "${i}p" ~/.newsfeed);
-    nameOfSubscription=$(echo $newsfeedLine | cut -d ";" -f 1);
-    rssLink=$(echo $newsfeedLine | cut -d ";" -f 2);
-    if [ "$1" ] && [ "$1" = "--list" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-    elif [ "$1" ] && [ "$1" = "--check" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-      echo -n "Getting news feed...";
-      wget $rssLink -O /tmp/new_newsfeed_${i}.xml 2>/dev/null;
-      if [ $? -eq 0 ]; then echo "[ OK ]";
-      else echo -e "\nThere is no Internet connection"; exit 1; fi
-        if [ -s /tmp/newsfeed_${i}.xml ]; then
-        amountOfNewNewses=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | grep '<title>' | wc -l);
-        if [ $amountOfNewNewses -gt 0 ]; then 
-          notify-send "$nameOfSubscription" "New $amountOfNewNewses newses" --icon=/usr/share/icons/rss.png;
-          j=1;
-          sleep 1;
-          while [ $j -le $amountOfNewNewses ]; do
-            news=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | \
-                     grep '<title>' | sed -n "${j}p" | sed 's/<title>//' | \
-                      sed 's/<\/title>//' | sed 's/[<>]//' | \
-                      sed 's/^[[:space:]]*//g');
-            notify-send "newsfeed" "${nameOfSubscription}: ${news}" -t 10000 --icon=/usr/share/icons/rss.png;
-            sleep 1;
-            j=$((j + 1));
-          done
-        fi
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-      else
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-        amountOfNews=$(grep '<title>' /tmp/newsfeed_${i}.xml | sed -n '2,$p' | wc -l);
-        if [ $amountOfNews -eq 0 ]; then
-          compressed=1;
-          amountOfNews=$(sed 's/<\/title>/\n/g' /tmp/newsfeed_${i}.xml | sed 's/<item>/\n/g' | grep '<title>' | wc -l)
-        fi
-        notify-send "$nameOfSubscription" "New $amountOfNews newses" --icon=/usr/share/icons/rss.png;
-      fi
-    fi
-    i=$((i + 1));
-  done
-  if [ "$1" ] && [ "$1" = "--show" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    
-    #Parsing
-    #Thanks to the linuxhint.com for command:
-    #sed 's/^[[:space]]*//g'
-    #https://linuxhint.com/trim_string_bash
-
-      if grep -q 'CDATA' /tmp/newsfeed_${2}.xml; then
-        sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        sed 's/<!\[CDATA\[//g' | sed 's/\]\]>//g' | \
-        sed 's/^[[:space:]]*//g' | nl | less;
-      else 
-        sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        sed 's/^[[:space:]]*//g' | nl | less;
-      fi
-      echo $2 > /tmp/lastShowedNewsFeed;
-  elif [ "$1" ] && [ "$1" = "--open" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    subscriptionNumber=$(cat /tmp/lastShowedNewsFeed);
-    if ! grep -q 'CDATA' /tmp/newsfeed_${subscriptionNumber}.xml; then
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/title>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    else
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/description>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    fi
-    exo-open --launch WebBrowser "$link";
-  fi
-fi

diff --git a/tools/100/notifier b/tools/100/notifier
deleted file mode 100755 (executable)
index d658ba0..0000000
--- a/tools/100/notifier
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-source library.sh;
-
-if [ "$1" ]; then
-  case $1 in
-    "distro") if check_distro_version; then 
-                msg=$(check_distro_version --print);
-                notify-send -i software-update-urgent "Distribution update" "New version (${msg}) of immudex is available to upgrade.";
-              else
-                msg=$(check_distro_version --print);
-                notify-send -i apply "Distribution update" "This (${msg}) is the latest version of immudex.";
-              fi;;
-    "packages") msg=$(sudo apt update > /tmp/update.log 2>&1 && tail -1 /tmp/update.log;);
-                notify-send -i software-update-available "Packages update" "$msg";;
-  esac
-fi
-   

diff --git a/tools/100/pl b/tools/100/pl
deleted file mode 100755 (executable)
index efcd0b0..0000000
--- a/tools/100/pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-file=$1;
-
-function help() {
-  echo "pl - Play Links. Skrypt to odtwarzania multimediów z listy linków";
-  echo "morketsmerke.org; COPYLEFT; 2023";
-  echo;
-  echo "Użycie:";
-  echo "$ pl sciezka/do/listy/linkow";
-  echo;
-  echo "Format listy:";
-  echo "nazwa linku: https://youtube.com/...";
-}
-
-if [ "$1" ]; then 
-  PS3="Link: ";
-  linkNames=$(cut -d ":" -f 1 $1 | sed 's/\ /_/g' | awk '{printf $1" "}')
-  select name in $linkNames; do
-    if [ ! "$name" ]; then break; fi
-    linkName=$(echo $name | sed 's/_/\ /g');
-    link=$(grep "$linkName" $file | cut -d ":" -f 2-);
-    if echo $link | grep -q "youtube"; then
-      ytplay -a $link -f best[height=360];
-    else
-      mpv --no-video $link;
-    fi
-  done
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/100/run-thunderbird b/tools/100/run-thunderbird
deleted file mode 100755 (executable)
index c08389a..0000000
--- a/tools/100/run-thunderbird
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export HOME=/ic0;
-thunderbird;

diff --git a/tools/100/secured-firefox b/tools/100/secured-firefox
deleted file mode 100755 (executable)
index 4041e89..0000000
--- a/tools/100/secured-firefox
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ ! -d /tmp/${USER} ]; then
-  mkdir /tmp/${USER}
-  cp -prvv /home/${USER}/.mozilla /tmp/${USER}
-fi
-
-eth0=$(ip route show | grep 'default' | awk '{printf $5}');
-firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/firefox

diff --git a/tools/100/shoutcasts b/tools/100/shoutcasts
deleted file mode 100755 (executable)
index 888ef1b..0000000
--- a/tools/100/shoutcasts
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-echo -n "What are you wanna listen? ";
-read search;
-
-function getDataBetweenHtmlMarks() {
-  grep "$1" $2 | sed -n "${3}p" | cut -d ">" -f 2 | cut -d "<" -f 1;
-}
-wget http://dir.xiph.org/search?q=$search -O /tmp/shcast_dir.html >> /dev/null 2>&1;
-if [ ! -s /tmp/shcast_dir.html ]; then
-  echo -e "\e[31mThere is no internet connection.\e[0m";
-  exit 1;
-else
-  amountOfStations=$(grep 'card-title' /tmp/shcast_dir.html | wc -l);
-  i=1;
-  while [ $i -le $amountOfStations ]; do
-    stationName=$(getDataBetweenHtmlMarks 'card-title' /tmp/shcast_dir.html ${i});
-    whatIsPlaying=$(getDataBetweenHtmlMarks 'card-subtitle' /tmp/shcast_dir.html ${i});
-    echo -e "${i}. \e[33m${stationName}\e[0m";
-    echo -e "   \e[32m${whatIsPlaying}\e[0m";
-    i=$((i + 1));
-  done
-  echo -n "Pick a one: ";
-  read numberOfStation;
-  echo $(grep 'Play' /tmp/shcast_dir.html | sed -n "${numberOfStation}p" | cut -d '"' -f 2) | xclip -selection c;
-  echo "Station URL was copied to clipboard";
-  
-fi

diff --git a/tools/100/sync.sh b/tools/100/sync.sh
deleted file mode 100644 (file)
index 9d7c64a..0000000
--- a/tools/100/sync.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-source ~/.sync.d/sync.conf;
-
-if [ ! -d "${HOME}/${ldirectory}" ]; then mkdir "${HOME}/${ldirectory}"; fi
-
-function printhelp {
-
-       echo "Skrypt szybkiej synchronizacji katalogu zdalnego";
-       echo "morketsmerke.org";
-       echo "2023; COPYLEFT; ALL RIGHTS REVERSED";
-       echo "";
-       echo "push - Przesłanie danych z katalogu lokalnego na katalog zdalny";
-       echo "pull - Pobranie zawartości katalogu zdalnego do katalogu lokalnego";
-  echo "Plik konfiguracyjny musi znajdować się na ścieżce: ~/.sync.d/sync.conf";
-  echo "Przykładowy plik konfiguracyjny znajduje się na ścieżce: /usr/share/sync.sh/sync.conf";
-}
-if [ ! "$1" ]; then 
-
-       printhelp;
-       exit 1;
-
-else
-       if [ "$1" = "push" ]; then 
-       
-               echo "[*] Synchronizacja: local -> remote";
-               rsync -avu ${HOME}/${ldirectory}/* ${ruser}@${server}:${rdirectory};
-
-       elif [ "$1" = "pull" ]; then 
-
-               echo "[*] Synchronizacja remote -> local";
-               rsync -avu ${ruser}@${server}:${rdirectory}/* ${HOME}/${ldirectory};
-
-       else 
-               printhelp;
-               exit 1;
-       fi
-
-fi

diff --git a/tools/101/immudex_branch b/tools/101/immudex_branch
deleted file mode 100755 (executable)
index c2eaea7..0000000
--- a/tools/101/immudex_branch
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if grep -q 'trixie' /etc/os-release; then
-  echo -n '-testing'; 
-else 
-  echo -n '-stable';
-fi

diff --git a/tools/101/immudex_hostname b/tools/101/immudex_hostname
deleted file mode 100755 (executable)
index 33cc30c..0000000
--- a/tools/101/immudex_hostname
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-vendor=$(hostnamectl | grep 'Vendor' | awk '{printf $3}')
-modelLine=$(hostnamectl | grep 'Model' | awk '{printf $3}')
-model=$(hostnamectl | grep 'Model' | awk '{printf $4}')
-
-case $vendor in
-  "Lenovo") vendorShort="l";;
-  "Dell") vendorShort="d";;
-  "Acer") vendorShort="a";;
-  "ASUSTeK") vendorShort="as";;
-  "GOOGLE") vendorShort="go";;
-  "QEMU") vendorShort="kvm";;
-  *) hName="immudex";;
-esac
-
-case $modelLine in
-  "ThinkPad") mLShort="TP";;
-  "Latitude") mLShort="Lat";;
-  "AOD260") mLShort="ao";
-            model="D260";;
-  "Candy") vendorShort="d";
-            mLShort="chrbook";
-            model="3120";;
-  "Inspiron") mLShort="Ins";;
-  "Standard") if [ $vendorShort = "kvm" ]; then
-                mLShort=$(hostnamectl | grep 'Machine ID' | awk '{print $3}' | cut -c 26-33);
-                model="";
-              else
-                mlShort="Std";
-              fi;;
-  *) hName="immudex";;
-esac
-
-if [ ! "$hName" ]; then
-  hName="${vendorShort}-${mLShort}-$model"
-  sudo hostnamectl set-hostname $hName;
-  sudo sed -i "s/immudex/${hName}/" /etc/hosts;
-  echo $hName | sudo tee /etc/hostname > /dev/null;
-fi
-

diff --git a/tools/101/library.sh b/tools/101/library.sh
deleted file mode 100755 (executable)
index 1cb2454..0000000
--- a/tools/101/library.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-function get_debian_branch() {
-  if grep -q 'trixie' /etc/os-release; then
-    echo "testing";
-  else
-    echo "stable";
-  fi
-}
-
-function get_machine_arch() {
-  arch=$(uname -m);
-  if [ "$arch" = "i686" ]; then
-    echo "32";
-  else
-    echo "64";
-  fi
-}
-
-function check_distro_version() {
-  set -e
-  root="/run/live/medium";
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
-    fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
-    fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
-    else
-     exitcode=1;
-    fi
-  else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
-  fi
-  return $exitcode;
-}

diff --git a/tools/101/newsfeed b/tools/101/newsfeed
deleted file mode 100755 (executable)
index 1f9d304..0000000
--- a/tools/101/newsfeed
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-function help() {
-  echo "newsfeed - fetch and browse news feed from rss and atom channels";
-  echo "morketsmerke.net; COPYLEFT @ 2022";
-  echo;
-  echo "Options:";
-  echo "  --list - shows numbered list of names, saved in ~/.newsfeed names and";
-  echo "    URL of rss channels";
-  echo "  --check - fetching new rss channel file from source";
-  echo "  --show <number_of_channel> - shows numbered list of news titles.";
-  echo "    Number of channel you can get from --list option.";
-  echo "  --open <number_of_title> - open web browser on link, which are under";
-  echo "    titles of news on rss channel. Number of title you can get";
-  echo "    from --show option. This option based on the last showed rss";
-  echo "    channel feed.";
-  echo;
-  echo "The ~/.newsfeed file:";
-  echo "  This file is simple csv (semicolon separated values) file which";
-  echo "  store rss channels in one line. One by one. The one line";
-  echo "  contains: name and URL of rss feed. For example:";
-  echo;
-  echo "    News Feed;https://newsfeed.example.org/rss";
-} 
-if [ ! -s ~/.newsfeed ]; then
-  help;
-  exit 1;
-else
-  if [ ! "$1" ] || ([ "$1" != "--list" ] && \
-    [ "$1" != "--check" ] && \
-    [ "$1" != "--show" ] && \
-    [ "$1" != "--open" ]); then
-      help;
-      exit 1;
-  fi
-  amountOfSubscriptions=$(cat ~/.newsfeed | wc -l);
-  i=1;
-  while [ $i -le $amountOfSubscriptions ]; do
-    newsfeedLine=$(sed -n "${i}p" ~/.newsfeed);
-    nameOfSubscription=$(echo $newsfeedLine | cut -d ";" -f 1);
-    rssLink=$(echo $newsfeedLine | cut -d ";" -f 2);
-    if [ "$1" ] && [ "$1" = "--list" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-    elif [ "$1" ] && [ "$1" = "--check" ]; then
-      echo -e "${i}. ${nameOfSubscription}";
-      echo -n "Getting news feed...";
-      wget $rssLink -O /tmp/new_newsfeed_${i}.xml 2>/dev/null;
-      if [ $? -eq 0 ]; then echo "[ OK ]";
-      else echo -e "\nThere is no Internet connection"; exit 1; fi
-        if [ -s /tmp/newsfeed_${i}.xml ]; then
-        amountOfNewNewses=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | grep '<title>' | wc -l);
-        if [ $amountOfNewNewses -gt 0 ]; then 
-          notify-send "$nameOfSubscription" "New $amountOfNewNewses newses" --icon=/usr/share/icons/rss.png;
-          j=1;
-          sleep 1;
-          while [ $j -le $amountOfNewNewses ]; do
-            news=$(diff /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml | \
-                     grep '<title>' | sed -n "${j}p" | sed 's/<title>//' | \
-                      sed 's/<\/title>//' | sed 's/[<>]//' | \
-                      sed 's/^[[:space:]]*//g');
-            notify-send "newsfeed" "${nameOfSubscription}: ${news}" -t 10000 --icon=/usr/share/icons/rss.png;
-            sleep 1;
-            j=$((j + 1));
-          done
-        fi
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-      else
-        mv /tmp/new_newsfeed_${i}.xml /tmp/newsfeed_${i}.xml;
-        amountOfNews=$(grep '<title>' /tmp/newsfeed_${i}.xml | sed -n '2,$p' | wc -l);
-        if [ $amountOfNews -eq 0 ]; then
-          compressed=1;
-          amountOfNews=$(sed 's/<\/title>/\n/g' /tmp/newsfeed_${i}.xml | sed 's/<item>/\n/g' | grep '<title>' | wc -l)
-        fi
-        notify-send "$nameOfSubscription" "New $amountOfNews newses" --icon=/usr/share/icons/rss.png;
-      fi
-    fi
-    i=$((i + 1));
-  done
-  if [ "$1" ] && [ "$1" = "--show" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    
-    #Parsing
-    #Thanks to the linuxhint.com for command:
-    #sed 's/^[[:space]]*//g'
-    #https://linuxhint.com/trim_string_bash
-
-      if grep -q 'CDATA' /tmp/newsfeed_${2}.xml; then
-        #sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        #sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        #sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        #sed 's/<!\[CDATA\[//g' | sed 's/\]\]>//g' | \
-        #sed 's/^[[:space:]]*//g' | nl | less;
-        grep -e '<title>' -e '<description>' /tmp/newsfeed_${2}.xml |\
-        sed -n '3,$p' | sed -e 's/<title>//g' -e 's/<description>/>>>/g' |\
-        sed 's/&#[0-9]*;//g' | \
-        sed 's/&quot;//g' | sed -e 's/<!\[CDATA\[//g' -e 's/\]\]>//g' |\
-        sed -e 's/<img.*br\/>/<obrazek>/g' -e 's/^[[:space:]]*//g' \
-        -e 's/<\/description>/\n/g' -e 's/<\/title>//g' | nl -b p^[[:alnum:]] | less
-      else 
-        sed 's/<\/title>/\n/g' /tmp/newsfeed_${2}.xml | \
-        sed 's/<item>/\n/g' | grep '<title>' | sed -n '2,$p' | \
-        sed 's/<title>//' | sed 's/&quot;/"/g' | \
-        sed 's/^[[:space:]]*//g' | nl | less;
-      fi
-      echo $2 > /tmp/lastShowedNewsFeed;
-  elif [ "$1" ] && [ "$1" = "--open" ] && [ "$2" ] && [ $2 -gt 0 ]; then
-    subscriptionNumber=$(cat /tmp/lastShowedNewsFeed);
-    if ! grep -q 'CDATA' /tmp/newsfeed_${subscriptionNumber}.xml; then
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/title>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    else
-      link=$(sed 's/<\/link>/\n/g' /tmp/newsfeed_${subscriptionNumber}.xml | sed 's/<\/description>/\n/g' | grep '<link>' | sed -n '2,$p' | sed 's/<link>//g' | sed -n "${2}p")
-    fi
-    exo-open --launch WebBrowser "$link";
-  fi
-fi

diff --git a/tools/101/pl b/tools/101/pl
deleted file mode 100755 (executable)
index e800822..0000000
--- a/tools/101/pl
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-if [ "$1" ] && [ $1 = "--video" ]; then
-  video=1;
-  shift;
-  if [ $# -gt 1 ]; then format="--ytdl-format=$1"; shift; file=$1;
-  else format="--ytdl-forma=best"; file=$1; fi
-else
-  file=$1;
-fi
-
-function help() {
-  echo "pl - Play Links. Skrypt to odtwarzania multimediów z listy linków";
-  echo "morketsmerke.org; COPYLEFT; 2023";
-  echo;
-  echo "Opcje:";
-  echo;
-  echo -e "\t--video [format] - możliwość odtwarzania linków jako filmów. Format";
-  echo -e "\tjest opcjonalny, w przypadku jego braku, domyślnym formatem jest";
-  echo -e "\t'best'.";
-  echo;
-  echo "Użycie:";
-  echo -e "\t$ pl sciezka/do/listy/linkow";
-  echo;
-  echo "Format listy:";
-  echo -e "\tnazwa linku: https://youtube.com/...";
-}
-if [ "$1" ]; then 
-  PS3="Link: ";
-  linkNames=$(cut -d ":" -f 1 $1 | sed 's/\ /_/g' | awk '{printf $1" "}')
-  select name in $linkNames; do
-    if [ "$MPVPID" ]; then kill $MPVPID; fi
-    if [ ! "$name" ]; then break; fi
-    link=$(grep "$name" $file | cut -d ":" -f 2-);
-    if [ ! "$link" ]; then
-      linkName=$(echo $name | sed 's/_/\ /g');
-      link=$(grep "$linkName" $file | cut -d ":" -f 2-);
-    fi
-    if echo $link | grep -q "youtube"; then
-      if [ "$video" ]; then
-        #ytplay -v $link -f $format
-        mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$!
-      else
-        #ytplay -a $link -f best[height=360]
-        format="--no-video --ytdl-format=best[height=360]"; 
-        mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$!
-      fi
-    else
-      mpv --no-video $link > /tmp/pl.log 2>&1 & MPVPID=$!;
-      tail -f /tmp/pl.log | grep "icy-title" &
-    fi
-    #echo "MPV: $MPVPID";
-  done
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/102/pl b/tools/102/pl
deleted file mode 100755 (executable)
index 50fad5d..0000000
--- a/tools/102/pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-if [ "$1" ] && [ $1 = "--video" ]; then
-  video=1;
-  shift;
-  if [ $# -gt 1 ]; then format="--ytdl-format=$1"; shift; file=$1;
-  else format="--ytdl-forma=best"; file=$1; fi
-else
-  file=$1;
-fi
-
-function help() {
-  echo "pl - Play Links. Skrypt to odtwarzania multimediów z listy linków";
-  echo "morketsmerke.org; COPYLEFT; 2023";
-  echo;
-  echo "Opcje:";
-  echo;
-  echo -e "\t--video [format] - możliwość odtwarzania linków jako filmów. Format";
-  echo -e "\tjest opcjonalny, w przypadku jego braku, domyślnym formatem jest";
-  echo -e "\t'best'.";
-  echo;
-  echo "Użycie:";
-  echo -e "\t$ pl sciezka/do/listy/linkow";
-  echo;
-  echo "Format listy:";
-  echo -e "\tnazwa linku: https://youtube.com/...";
-}
-if [ "$1" ]; then 
-  PS3="Link: ";
-  linkNames=$(cut -d ":" -f 1 $1 | sed 's/\ /_/g' | awk '{printf $1" "}')
-  select name in $linkNames; do
-    if [ "$MPVPID" ]; then kill $MPVPID; fi
-    if [ ! "$name" ]; then break; fi
-    link=$(grep "$name" $file | cut -d ":" -f 2-);
-    if [ ! "$link" ]; then
-      linkName=$(echo $name | sed 's/_/\ /g');
-      link=$(grep "$linkName" $file | cut -d ":" -f 2-);
-    fi
-    if echo $link | grep -q "youtube"; then
-      link=$(echo $link | sed 's/\ //g');
-      if [ "$video" ]; then
-        #ytplay -v $link -f $format
-        mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$!
-      else
-        #ytplay -a $link -f best[height=360]
-        format="--no-video --ytdl-format=best[height=360]"; 
-        mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$!
-      fi
-    else
-      mpv --no-video $link > /tmp/pl.log 2>&1 & MPVPID=$!;
-      tail -f /tmp/pl.log | grep "icy-title" &
-    fi
-    #echo "MPV: $MPVPID";
-  done
-else
-  help;
-  exit 1;
-fi

diff --git a/tools/103/idle-clic b/tools/idle-clic
similarity index 100%
rename from tools/103/idle-clic
rename to tools/idle-clic

diff --git a/tools/immudex-addons b/tools/immudex-addons
new file mode 100755 (executable)
index 0000000..bfbb5b8
--- /dev/null
+++ b/tools/immudex-addons
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+if [ ! "$immudexAddonsPath" ]; then 
+  immudexAddonsPath=$(sudo find / -ipath '*immudex-testing/addons' -print | head -1);
+  if [ ! "$immudexAddonsPath" ]; then
+    if [ ! -x /usr/bin/git ]; then apt-get install git; fi
+    cd; 
+    git clone https://github.com/xf0r3m/immudex-testing.git;
+    immudexAddonsPath="${HOME}/immudex-testing/addons";
+  fi
+fi
+
+installedAddonsFile="/usr/share/immudex-addons/installed-addons"; 
+
+listAddons=$(ls $immudexAddonsPath);
+if [ -f $installedAddonsFile ]; then
+  for installed in $(cat $installedAddonsFile | awk '{printf $1" "}'); do
+    listAddons2=$(echo $listAddons | sed "s/$installed/${installed}\[installed\]/g")
+    listAddons=$listAddons2;
+  done 
+fi 
+
+export PS3="immudex_addons> ";
+select addon in $listAddons; do
+  if [ ! "$addon" ]; then break;
+  else
+    if echo $addon | grep -q 'installed'; then
+      addon=$(echo $addon | sed 's/\[installed\]//');
+      bash ${immudexAddonsPath}/${addon} remove;
+    else
+      bash ${immudexAddonsPath}/${addon} install;
+    fi 
+  fi
+done

diff --git a/tools/immudex-autostart-x4notes b/tools/immudex-autostart-x4notes
new file mode 100755 (executable)
index 0000000..8b549b1
--- /dev/null
+++ b/tools/immudex-autostart-x4notes
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+while [ ! -h /dev/mapper/immudex-crypt0 ]; do sleep 1; done
+HOME=/ic0 xfce4-notes > /dev/null 2>&1 &

diff --git a/tools/100/immudex_branch b/tools/immudex-branch
similarity index 100%
rename from tools/100/immudex_branch
rename to tools/immudex-branch

diff --git a/tools/102/create_media b/tools/immudex-create-media
similarity index 96%
rename from tools/102/create_media
rename to tools/immudex-create-media
index 1ef71a2ebe386233f8ae692e7f00708ec4888717..809d7669072a5f530e853265ba0cbb1fb7929754 100755 (executable)
--- a/tools/102/create_media
+++ b/tools/immudex-create-media
@@ -5,8 +5,8 @@ YELLOW="\e[33m";
 ENDCOLOR="\e[0m";
 
 function help() {
-  echo "create_media - script used for write iso image to usb drive(mainly)";
-  echo "morketsmerke.net COPYLEFT @ 2022";
+  echo "immudex-create-media - script used for write iso image to usb drive(mainly)";
+  echo "@ 2023 morketsmerke.org";
   echo "Options:";
   echo "  --i386-efi - creating 32-bit EFI usb drive with iso image";
   echo "  (comapatible with immudex only iso images)";

diff --git a/tools/100/immudex_crypt b/tools/immudex-crypt
similarity index 82%
rename from tools/100/immudex_crypt
rename to tools/immudex-crypt
index 5ff721dc37ddf948feefa483bb51c7b1254618ad..bdf227158428da445febb4283713a620ea00d12b 100755 (executable)
--- a/tools/100/immudex_crypt
+++ b/tools/immudex-crypt
@@ -2,18 +2,18 @@
 
 function help() {
 
-  echo "immudex_crypt - script used for listing, open and close crypt_LUKS ppartitions";
-  echo "morketsmerke.org COPYLEFT @ 2023";
+  echo "immudex-crypt - script used for listing, open and close crypt_LUKS ppartitions";
+  echo "@ 2023 morketsmerke.org";
   echo "Options:";
   echo "  list - displaing list of opened and available crypt_LUKS devices";
   echo "  create - formatting device for crypt_LUKS";
   echo "  open - opening crypt_LUKS device, after this device is ready to mount";
   echo "  close - unmount and closing crypt_LUKS devices";
   echo "Using:";
-  echo "$ immudex_crypt list";
-  echo "$ immudex_crypt create <disk partition>";
-  echo "$ immudex_crypt open <crypt_LUKS device>";
-  echo "$ immudex_crypt close immudex_crypt[0-9] | ic[0-9] | [0-9]";
+  echo "$ immudex-crypt list";
+  echo "$ immudex-crypt create <disk partition>";
+  echo "$ immudex-crypt open <crypt_LUKS device>";
+  echo "$ immudex-crypt close immudex-crypt[0-9] | ic[0-9] | [0-9]";
 }
 
 function list() {
@@ -63,30 +63,30 @@ function open() {
 
   if [ $# -lt 1 ]; then help; exit 1;
   else
-    index=$(ls --hide=control /dev/mapper | grep "immudex_crypt" | grep -o "[0-9]*$"| tail -1);
+    index=$(ls --hide=control /dev/mapper | grep "immudex-crypt" | grep -o "[0-9]*$"| tail -1);
     if [ "$index" ]; then
       index=$((index + 1));
     else
       index=0;
     fi
-    sudo cryptsetup open $1 immudex_crypt${index};
-    sudo mkdir -p /media/${USER}/immudex_crypt${index};
-    dmDevice=$(ls -l /dev/mapper/immudex_crypt${index} | awk '{printf $10}' | cut -d "/" -f 2);
+    sudo cryptsetup open $1 immudex-crypt${index};
+    sudo mkdir -p /media/${USER}/immudex-crypt${index};
+    dmDevice=$(ls -l /dev/mapper/immudex-crypt${index} | awk '{printf $10}' | cut -d "/" -f 2);
     if ! $(sudo file -s /dev/${dmDevice} | grep -q 'ext4'); then
       echo "Could not determine filesystem of unlocked device.";
       echo -n "Format this device to ext4? (y/n): "
       read format;
       if [ "$format" = "y" ]; then
-        sudo mkfs.ext4 /dev/mapper/immudex_crypt${index};
+        sudo mkfs.ext4 /dev/mapper/immudex-crypt${index};
       else
         echo "Refuse to mount.";
-        sudo cryptsetup close immudex_crypt${index};
+        sudo cryptsetup close immudex-crypt${index};
         exit 1;
       fi
     fi
-    sudo mount /dev/mapper/immudex_crypt${index} /media/${USER}/immudex_crypt${index};
+    sudo mount /dev/mapper/immudex-crypt${index} /media/${USER}/immudex-crypt${index};
     if [ ! -e /ic${index} ]; then
-      sudo ln -s /media/${USER}/immudex_crypt${index} /ic${index};
+      sudo ln -s /media/${USER}/immudex-crypt${index} /ic${index};
     fi
   fi
 
@@ -97,9 +97,9 @@ function close() {
   if [ $# -lt 1 ]; then help; exit 1;
   else
     if [ $1 -ge 0 ] 2> /dev/null; then
-        cryptfsName="immudex_crypt${1}";
+        cryptfsName="immudex-crypt${1}";
     elif echo $1 | grep -q 'ic'; then
-        cryptfsName="immudex_crypt$(echo $1 | grep -o '[0-9]')";
+        cryptfsName="immudex-crypt$(echo $1 | grep -o '[0-9]')";
     else
         cryptfsName=$1;
     fi

diff --git a/tools/102/immudex_hostname b/tools/immudex-hostname
similarity index 100%
rename from tools/102/immudex_hostname
rename to tools/immudex-hostname

diff --git a/tools/101/import_gpgkeys b/tools/immudex-import-gpgkeys
similarity index 100%
rename from tools/101/import_gpgkeys
rename to tools/immudex-import-gpgkeys

diff --git a/tools/0/001/import_sshkeys b/tools/immudex-import-sshkeys
similarity index 100%
rename from tools/0/001/import_sshkeys
rename to tools/immudex-import-sshkeys

diff --git a/tools/100/immudex_install b/tools/immudex-install
similarity index 100%
rename from tools/100/immudex_install
rename to tools/immudex-install

diff --git a/tools/100/meteo b/tools/immudex-meteo
similarity index 81%
rename from tools/100/meteo
rename to tools/immudex-meteo
index cc254bd64d0612a11def7d8a7762e7c6ac14d086..a536e57746a29ade97e27958556e2bfe9b3b98d7 100755 (executable)
--- a/tools/100/meteo
+++ b/tools/immudex-meteo
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 function help() {
-  echo "meteo - prognoza pogody z wttr.in"
-  echo "morketsmerke.org @ 2023";
+  echo "immudex-meteo - prognoza pogody z wttr.in"
+  echo "@ 2023 morketsmerke.org";
   echo "Opcje:";
   echo "  -s - format krótki (aktualna pogoda)";
   echo "  -l - format długi (format krótki + 2 dniowa prognoza)" 

diff --git a/tools/0/008/morketsmerke b/tools/immudex-morketsmerke
similarity index 93%
rename from tools/0/008/morketsmerke
rename to tools/immudex-morketsmerke
index 719347321731b5bdf4751339decfd808da24779d..826d74546bf8928bccf7a8a4f53a34c31a856d3a 100755 (executable)
--- a/tools/0/008/morketsmerke
+++ b/tools/immudex-morketsmerke
@@ -2,9 +2,9 @@
 
 function help() {
   echo "======================================================================";
-  echo "morketsmerke - script for fetch and adjust morketsmerke.net site";
+  echo "immudex-morketsmerke - script for fetch and adjust morketsmerke.net site";
   echo "as offline available source of information.";
-  echo "morketsmerke.net COPYLEFT @ 2022";
+  echo "@ 2023 morketsmerke.org";
   echo;
   echo "Options:";
   echo "  --browser - launching fetched site in default application for open"

diff --git a/tools/105/motd2 b/tools/immudex-motd2
similarity index 100%
rename from tools/105/motd2
rename to tools/immudex-motd2

diff --git a/tools/105/newsfeed b/tools/immudex-newsfeed
similarity index 99%
rename from tools/105/newsfeed
rename to tools/immudex-newsfeed
index fddc38dae26a95cb135faa6e595672d3daa87745..ea26ae9872f64b306e3d4dad02c215d663723aeb 100755 (executable)
--- a/tools/105/newsfeed
+++ b/tools/immudex-newsfeed
@@ -152,7 +152,7 @@ else
         fi
         notify-send "$nameOfSubscription" "New $amountOfNews newses" --icon=/usr/share/icons/rss.png;
         executeCreateBufferFile /tmp/newsfeed_${i}.xml;
-        if [ "$2" ] && [ "--show-one" ]; then
+        if [ "$2" ] && [ "$2" = "--show-one" ]; then
           news=$(show /tmp/newsfeed_${i}.xml 1);
           notify-send "newsfeed" "${nameOfSubscription}:\n${news}" -t ${i}0000 --icon=/usr/share/icons/rss.png;
         fi

diff --git a/tools/0/011/notifier b/tools/immudex-notifier
similarity index 100%
rename from tools/0/011/notifier
rename to tools/immudex-notifier

diff --git a/tools/100/padlock b/tools/immudex-padlock
similarity index 76%
rename from tools/100/padlock
rename to tools/immudex-padlock
index bf50d1afb8f098c181d340eac881df329d5a8021..1f4b5fcbb38569eb8fe6ab4749c4ecea99a4a444 100755 (executable)
--- a/tools/100/padlock
+++ b/tools/immudex-padlock
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-launcher="/home/${USER}/Pulpit/Padlock.desktop";
+launcher="/home/${USER}/.config/xfce4/panel/launcher-14/16844255236.desktop";
 
 function main_unlock() {
-  /usr/local/bin/immudex_crypt open $1;
-  index=$(basename $(/usr/local/bin/immudex_crypt list | grep "$1" | head -1 | awk '{printf $2}' | grep -o '[0-9]'));
+  /usr/local/bin/immudex-crypt open $1;
+  index=$(basename $(/usr/local/bin/immudex-crypt list | grep "$1" | head -1 | awk '{printf $2}' | grep -o '[0-9]'));
   #sudo mkdir -p /media/${USER}/$devName;
   #sudo mount /dev/mapper/$devName /media/${USER}/$devName;
   
   xfce4-terminal --default-working-directory=/ic${index};
-  #sed -i 's/prevent/allow/' ${launcher};
-  sudo rm /usr/share/icons/padlock-icon.png;
-  sudo ln -s /usr/share/icons/changes-allow.png /usr/share/icons/padlock-icon.png;
+  sed -i 's/padlock-icon/changes-allow/' ${launcher};
+  #sudo rm /usr/share/icons/padlock-icon.png;
+  #sudo ln -s /usr/share/icons/changes-allow.png /usr/share/icons/padlock-icon.png;
 
 }
 
@@ -58,9 +58,9 @@ function lock() {
          done
   fi
   if ! $(df -h | grep -q '/dev/mapper'); then
-    #sed -i 's/allow/prevent/' ${launcher};
-    sudo rm /usr/share/icons/padlock-icon.png;
-    sudo ln -s /usr/share/icons/changes-prevent.png /usr/share/icons/padlock-icon.png;
+    sed -i 's/changes-allow/padlock-icon/' ${launcher};
+    #sudo rm /usr/share/icons/padlock-icon.png;
+    #sudo ln -s /usr/share/icons/changes-prevent.png /usr/share/icons/padlock-icon.png;
   fi 
 }
 

diff --git a/tools/103/pl b/tools/immudex-pl
similarity index 94%
rename from tools/103/pl
rename to tools/immudex-pl
index 7f08f4fa9288a6e7d03d6448f9bd797a96882aa6..4ed829bf563833672993134902ec1680c712ffc4 100755 (executable)
--- a/tools/103/pl
+++ b/tools/immudex-pl
@@ -14,8 +14,8 @@ else
 fi
 
 function help() {
-  echo "pl - Play Links. Skrypt to odtwarzania multimediów z listy linków";
-  echo "morketsmerke.org; COPYLEFT; 2023";
+  echo "immudex-pl - Play Links. Skrypt to odtwarzania multimediów z listy linków";
+  echo "@ 2023 morketsmerke.org";
   echo;
   echo "Opcje:";
   echo;

diff --git a/tools/104/secured-firefox b/tools/immudex-secured-firefox
similarity index 100%
rename from tools/104/secured-firefox
rename to tools/immudex-secured-firefox

diff --git a/tools/0/011/secured-firefox b/tools/immudex-secured-firefox_
similarity index 100%
rename from tools/0/011/secured-firefox
rename to tools/immudex-secured-firefox_

diff --git a/tools/0/002/shoutcasts b/tools/immudex-shoutcasts
similarity index 100%
rename from tools/0/002/shoutcasts
rename to tools/immudex-shoutcasts

diff --git a/tools/105/unlock-ds b/tools/immudex-unlock-ds
similarity index 100%
rename from tools/105/unlock-ds
rename to tools/immudex-unlock-ds

diff --git a/tools/immudex-upgrade b/tools/immudex-upgrade
new file mode 100755 (executable)
index 0000000..04138df
--- /dev/null
+++ b/tools/immudex-upgrade
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+set -e
+
+source library.sh
+
+RED="\e[31m";
+GREEN="\e[32m";
+YELLOW="\e[33m";
+ENDCOLOR="\e[0m";
+root="/run/live/medium";
+
+function help() {
+  echo "immudex-upgrade - script for searching upgrades and upgrade immudex";
+  echo "@ 2023 morketsmerke.org";
+  echo "Options:";
+  echo " --check - check there are upgrades for immudex";
+  echo " --upgrade - upgrade immudex from given source";
+}
+
+if [ "$1" ]; then
+  if [ "$1" ] && [ "$1" = "--check" ]; then
+    if check_distro_commit; then 
+      echo -e "${GREEN}This${ENDCOLOR} is the latest version of immudex";
+    else
+      echo -e "There is a ${RED}new${ENDCOLOR} version of immudex:";
+      echo "===================================================";
+      check_distro_commit --print;
+    fi
+  elif [ "$1" ] && [ "$1" = "--upgrade" ]; then
+    part=$(sudo blkid | grep 'LABEL="immudex"' | awk '{printf $1}' | cut -d ":" -f 1);
+    if sudo mount | grep -q "$part"; then
+      echo -n "Mounting iso image...";
+      sudo mount $2 /mnt > /dev/null 2>&1;
+      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+      mountPointList=$(sudo mount | grep "$part" | awk '{printf $3" "}');
+      for mountPoint in $mountPointList; do
+        echo -n "Unlocking $mountPoint ..."; 
+        sudo mount $part $mountPoint -o remount,rw > /dev/null 2>&1;
+        if [ $? -eq 0 ]; then
+          echo -e "[ ${GREEN}OK${ENDCOLOR} ]";
+        else
+          echo -e "[ ${RED}FAIL${ENDCOLOR} ]";
+        fi
+      done
+      echo "Copying immudex files to the disk...";
+      sudo cp -vv /mnt/live/* ${mountPoint}/live;
+    else
+      echo "Mounting immudex partition...";
+      sudo mount $part /mnt >> /dev/null 2>&1;
+      if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
+      echo "Copying immudex files to the disk...";
+      sudo cp -vv /run/live/medium/live/* /mnt/live;
+    fi
+    if [ $? -eq 0 ]; then
+      echo -e "Copying immudex files to the disk...[ ${GREEN}OK${ENDCOLOR} ]";
+    else
+      echo -e "Copying immudex files to the disk...[ ${RED}FAIL${ENDCOLOR} ]";
+    fi
+  elif [ "$1" ] && [ "$1" = "--myversion" ]; then
+    if [ -d /tmp/immudex-testing ]; then 
+      (cd /tmp/immudex-testing && git pull > /dev/null 2>&1)
+    else
+      git clone https://github.com/xf0r3m/immudex-testing /tmp;
+    fi
+    (cd /tmp/immudex-testing && git show $(cat /run/live/medium/live/version))
+  else
+    help;
+    exit 1;
+  fi
+else
+  help;
+  exit 1;
+fi

diff --git a/tools/immudex-version b/tools/immudex-version
new file mode 100755 (executable)
index 0000000..6cfc89b
--- /dev/null
+++ b/tools/immudex-version
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cat /run/live/medium/live/version | cut -c 1-7

diff --git a/tools/100/ytplay b/tools/immudex-ytplay
similarity index 97%
rename from tools/100/ytplay
rename to tools/immudex-ytplay
index 474a86424987b97082a793c2838ea2996e4a151f..272fe41cfc34a4c2cdaf37260a57a92f231085e0 100755 (executable)
--- a/tools/100/ytplay
+++ b/tools/immudex-ytplay
@@ -6,8 +6,8 @@ BLUE="\e[34m";
 ENDCOLOR="\e[0m";
 
 function help() {
-  echo "ytplay - script which could play a video or audio track from youtube";
-  echo "morketsmerke.net COPYLEFT @ 2022";
+  echo "immudex-ytplay - script which could play a video or audio track from youtube";
+  echo "@ 2023 morketsmerke.org";
   echo "Options:";
   echo "  -s - search given keyword on youtube.";
   echo "  -v - play youtube video."

diff --git a/tools/105/library.sh b/tools/library.sh
similarity index 52%
rename from tools/105/library.sh
rename to tools/library.sh
index 2faa2adc61c9efc4a01631e29f7d00b97430b5ca..b06fb76d88f11bd0f222ff486d35fd18fca893f9 100755 (executable)
--- a/tools/105/library.sh
+++ b/tools/library.sh
@@ -17,35 +17,27 @@ function get_machine_arch() {
   fi
 }
 
-function check_distro_version() {
-  set -e
-  root="/run/live/medium";
-  if [ -d ${root}/live ]; then
-    if [ -f ${root}/live/version ]; then 
-      version=$(cat ${root}/live/version | sed 's/\.//g');
-    else version="000";
+function check_distro_commit() {
+  versionFile="/run/live/medium/live/version";
+  if [ -f $versionFile ]; then
+    localVersion=$(cat $versionFile);
+    if [ -d /tmp/immudex-testing ]; then
+      $(cd /tmp/immudex-testing && git pull -q);
+    else
+      git clone -q https://github.com/xf0r3m/immudex-testing /tmp/immudex-testing;
     fi
-    BRANCH=$(get_debian_branch);
-    ARCH=$(get_machine_arch);
-    if [ ! -f /tmp/ltver ]; then
-      wget -q https://ftp.morketsmerke.org/immudex/${BRANCH}/upgrades/latest/${ARCH}/version -O /tmp/ltver;
+    latestVersion=$(cd /tmp/immudex-testing && git log --pretty=oneline | head -1 | cut -d " " -f 1);
+    if [ "$1" ] && [ "$1" == "--print" ]; then
+      echo "$(cd /tmp/immudex-testing && git log ${localVersion}..${latestVersion})";
     fi
-         if [ ! -s /tmp/ltver ]; then sudo rm /tmp/ltver; return 255; fi;
-    newVersionTxt=$(cat /tmp/ltver);
-    newVersionInt=$(echo $newVersionTxt | sed 's/\.//g');
-    if [ $version -lt $newVersionInt ]; then
-     exitcode=0;
+    if [ "$localVersion" = "$latestVersion" ]; then
+      return 0;
     else
-     exitcode=1;
+      return 1;
     fi
   else
-    exitcode=255;
-  fi
-  if [ "$1" ] && [ "$1" = "--print" ]; then
-    echo $newVersionTxt;
-    return 0;
+    return 255;
   fi
-  return $exitcode;
 }
 
 function ascii_colors() {

diff --git a/tools/105/sync.sh b/tools/sync.sh
similarity index 100%
rename from tools/105/sync.sh
rename to tools/sync.sh

diff --git a/versions/0/001.sh b/versions/0/001.sh
deleted file mode 100644 (file)
index 80820f6..0000000
--- a/versions/0/001.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-#0.0.1:
-#      bash-completion
-#      etherwake
-#      wakeonlan
-# cifs-utils
-# wget
-# figlet
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! "$version" ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi;
-
-dhclient
-sudo apt update
-sudo apt upgrade -y
-
-sudo apt install -y bash-completion etherwake wakeonlan cifs-utils wget figlet;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp -v ~/immudex/tools/${version}/immudex_crypt /usr/local/bin;
-sudo cp -v ~/immudex/tools/${version}/immudex_upgrade /usr/local/bin;
-sudo cp -v ~/immudex/tools/${version}/import_sshkeys /usr/local/bin;
-sudo cp -v ~/immudex/tools/${version}/motd /usr/local/bin;
-sudo cp -v ~/immudex/tools/${version}/motd2 /usr/local/bin;
-sudo cp -v ~/immudex/tools/${version}/padlock /usr/local/bin;
-
-sudo chmod +x /usr/local/bin/*;
-
-sudo cp -rv ~/immudex/launchers/${version}/launcher-29 /etc/skel/.config/xfce4/panel;
-sudo cp -v ~/immudex/files/${version}/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml;
-sudo cp -v ~/immudex/images/${version}/* /usr/share/images/desktop-base;
-
-sudo echo "/usr/local/bin/motd2" >> /etc/bash.bashrc;
-
-sudo userdel -r user;
-sudo userdel -r xf0r3m;
-useradd -m -s /bin/bash user;
-useradd -m -s /bin/bash xf0r3m;
-echo "user:user1" | sudo chpasswd;
-echo "xf0r3m:xf0r3m1" | sudo chpasswd;
-
-rm -rf ~/immudex;
-apt-get clean;
-echo > ~/.bash_history;
-history -c   

diff --git a/versions/0/002.sh b/versions/0/002.sh
deleted file mode 100644 (file)
index b48a0ed..0000000
--- a/versions/0/002.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! "$version" ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi;
-
-dhclient
-sudo apt update;
-sudo apt upgrade -y;
-sudo apt install -y chirp mpv youtube-dl;
-
-lineNumber=$(cat -n /etc/bash.bashrc | grep 'motd2' | awk '{printf $1}');
-if [ "$lineNumber" ]; then
-  sed -i "${lineNumber}d" /etc/bash.bashrc;
-fi
-
-echo "if [ ! -f /tmp/.motd ]; then" >> /etc/bash.bashrc;
-echo "  /usr/local/bin/motd2;" >> /etc/bash.bashrc;
-echo "  touch /tmp/.motd;" >> /etc/bash.bashrc;
-echo "fi;" >> /etc/bash.bashrc;
-
-sudo usermod -aG libvirt,libvirt-qemu user;
-sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-
-sudo chmod u+s /usr/bin/ping
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp ~/immudex/tools/${version}/motd2 /usr/local/bin
-sudo cp ~/immudex/tools/${version}/padlock /usr/local/bin
-sudo cp ~/immudex/tools/${version}/import_gpgkeys /usr/local/bin
-sudo cp ~/immudex/tools/${version}/shoutcasts /usr/local/bin
-sudo cp ~/immudex/tools/${version}/ytaudio /usr/local/bin
-sudo cp ~/immudex/tools/immudex_install /usr/local/bin
-
-chmod +x /usr/local/bin/*
-
-sudo sed -i -e 's/chirpw/sudo chirpw/' -e 's/false/true/' /usr/share/applications/chirp.desktop;
-
-rm -rf ~/immudex;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c;

diff --git a/versions/0/003.sh b/versions/0/003.sh
deleted file mode 100644 (file)
index 99d571d..0000000
--- a/versions/0/003.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi;
-
-dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-
-sudo cp /usr/bin/youtube-dl /usr/bin/youtube-dl-orig;
-sudo wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -O /usr/bin/youtube-dl;
-sudo chmod +x /usr/bin/youtube-dl;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp -vv ~/immudex/tools/${version}/immudex_crypt /usr/local/bin;
-sudo rm /usr/local/bin/ytaudio;
-sudo cp -vv ~/immudex/tools/${version}/ytplay /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${version}/immudex_install /usr/local/bin;
-
-sudo chmod +x /usr/local/bin;
-
-echo "alias chhome='export HOME=\$(pwd)'" >> /etc/bash.bashrc
-
-rm -rf ~/immudex;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c;

diff --git a/versions/0/004.sh b/versions/0/004.sh
deleted file mode 100644 (file)
index 9551149..0000000
--- a/versions/0/004.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi;
-
-dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-sudo apt install vim-gtk3 redshift -y
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp -vv ~/immudex/launchers/${version}/16674118881.desktop /etc/skel/.config/xfce4/panel/launcher-32
-sudo rm /etc/skel/.config/xfce4/panel/launcher-32/16608177609.desktop
-sudo cp -vv ~/immudex/files/${version}/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-sudo cp -vv ~/immudex/files/${version}/redshift.conf /etc/skel/.config;
-sudo mkdir -v /etc/skel/.config/autostart;
-sudo cp -vv ~/immudex/files/${version}/redshift.desktop /etc/skel/.config/autostart;
-
-sudo userdel -r user;
-sudo userdel -r xf0r3m;
-sudo useradd -m -s /bin/bash user;
-sudo useradd -m -s /bin/bash xf0r3m;
-echo "user:user1" | sudo chpasswd;
-echo "xf0r3m:xf0r3m1" | sudo chpasswd;
-sudo usermod -aG libvirt,libvirt-qemu user;
-sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-
-sudo cp -vv ~/immudex/tools/${version}/motd2 /usr/local/bin;
-chmod +x /usr/local/bin/*
-
-sudo virsh net-autostart default
-
-rm -rf ~/immudex;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c;

diff --git a/versions/0/005.sh b/versions/0/005.sh
deleted file mode 100644 (file)
index 8848e5c..0000000
--- a/versions/0/005.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-
-sudo apt install -y libssl-dev libbz2-dev libnss3-dev libgdbm-dev libncurses5-dev libffi-dev libreadline-dev libsqlite3-dev zlib1g-dev build-essential
-
-sudo apt install --no-install-recommends software-properties-common -y
-
-#sudo ln -s /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml;
-
-cd;
-sudo wget https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz -O Python-3.11.0.tar.xz;
-sudo tar -xvf Python-3.11.0.tar.xz;
-cd Python-3.11.0;
-
-sudo ./configure --prefix=/usr/local --enable-optimizations
-sudo make
-sudo make altinstall
-
-sudo sed -i '26s/1/0/' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml;
-sudo sed -i '64i\\t<property name="disable-struts" type="bool" value="false"/>' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml;
-
-echo 'alias ytstream="mpv --ytdl-format=best[height=480]"' >> /etc/bash.bashrc;
-
-sudo userdel -r user;
-sudo userdel -r xf0r3m;
-sudo useradd -m -s /bin/bash user;
-sudo useradd -m -s /bin/bash xf0r3m;
-echo 'user:user1' | sudo chpasswd user;
-echo 'xf0r3m:xf0r3m1' | sudo chpasswd xf0r3m;
-sudo usermod -aG libvirt,libvirt-qemu user;
-sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp -vv ~/immudex/tools/${version}/protected /usr/local/bin;
-chmod +x /usr/local/bin/protected;
-
-rm -rf ~/immudex;
-rm -rf ~/Python*;
-sudo apt remove -y libssl-dev libbz2-dev libnss3-dev libgdbm-dev libncurses5-dev libffi-dev libreadline-dev libsqlite3-dev zlib1g-dev build-essential software-properties-common;
-sudo apt autoclean;
-sudo apt-get clean;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c

diff --git a/versions/0/006.sh b/versions/0/006.sh
deleted file mode 100644 (file)
index bec6609..0000000
--- a/versions/0/006.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-sudo dhclient;
-sudo apt update;
-
-sudo apt autoremove -y;
-
-sudo apt upgrade -y;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex;
-fi
-
-sudo cp -vv ~/immudex/images/${version}/rss.png /usr/share/icons;
-sudo cp -vv ~/immudex/tools/${version}/newsfeed /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${version}/immudex_crypt /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${version}/padlock /usr/local/bin;
-
-sudo chmod +x /usr/local/bin/*;
-
-sudo apt-get clean;
-sudo apt-get clean;
-sudo apt-get autoremove -y;
-sudo apt-get autoclean;
-rm -rf ~/immudex;
-echo > ~/.bash_history
-history -c

diff --git a/versions/0/007.sh b/versions/0/007.sh
deleted file mode 100644 (file)
index 998956f..0000000
--- a/versions/0/007.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-sudo dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-
-sudo apt install -y transmission-gtk;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex.git;
-fi
-
-sudo cp -vv ~/immudex/tools/${version}/ytplay /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${version}/immudex_crypt /usr/local/bin;
-chmod +x /usr/local/bin;
-
-sudo rm -rf /etc/skel/.mozilla;
-sudo tar -xzvf ~/immudex/files/${version}/mozilla.tgz -C /etc/skel
-sudo chown -R root:root /etc/skel/.mozilla
-
-sudo sed -i 's/80x24/100x30/' /etc/skel/.config/xfce4/terminal/terminalrc
-
-#sudo apt remove -y libssl-dev libbz2-dev libnss3-dev libgdbm-dev libncurses5-dev libffi-dev libreadline-dev libsqlite3-dev zlib1g-dev build-essential software-properties-common;
-sudo apt autoremove -y;
-
-sudo userdel -r user;
-sudo userdel -r xf0r3m;
-sudo useradd -m -s /bin/bash user;
-sudo useradd -m -s /bin/bash xf0r3m;
-echo 'user:user1' | sudo chpasswd user;
-echo 'xf0r3m:xf0r3m1' | sudo chpasswd xf0r3m;
-sudo usermod -aG libvirt,libvirt-qemu user;
-sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-
-rm -rf ~/immudex;
-sudo apt autoclean;
-sudo apt-get clean;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c
-

diff --git a/versions/0/008.sh b/versions/0/008.sh
deleted file mode 100644 (file)
index 04bf12e..0000000
--- a/versions/0/008.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-sudo dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-
-if [ ! -d ~/immudex ]; then
-  cd;
-  git clone https://github.com/xf0r3m/immudex.git;
-fi
-
-sudo cp -vv ~/immudex/tools/${version}/morketsmerke /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${version}/immudex_crypt /usr/local/bin;
-chmod +x /usr/local/bin;
-
-/usr/local/bin/morketsmerke -h
-
-rm -rf ~/immudex;
-sudo apt autoclean;
-sudo apt-get clean;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c
-

diff --git a/versions/0/009.sh b/versions/0/009.sh
deleted file mode 100644 (file)
index b00ea2f..0000000
--- a/versions/0/009.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-version=$(echo $0 | cut -d "." -f 1);
-if [ ! $version ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-sudo dhclient;
-sudo apt update;
-sudo apt upgrade -y;
-
-sudo apt autoremove -y;
-sudo apt autoclean;
-sudo apt-get clean;
-sudo apt-get clean;
-echo > ~/.bash_history;
-history -c
-

diff --git a/versions/0/010.sh b/versions/0/010.sh
deleted file mode 100644 (file)
index 70b4853..0000000
--- a/versions/0/010.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-function update_packages() {
-  dhclient;
-  sudo apt update;
-  sudo apt upgrade -y;
-}
-
-function install_packages() {
-  sudo apt install $@ -y;
-}
-
-function get_immudex_project() {
-  if [ ! -d ~/immudex ]; then
-    cd;
-    git clone https://github.com/xf0r3m/immudex.git;
-  fi
-}
-
-function recreate_users() {
-  sudo userdel -r user;
-  sudo userdel -r xf0r3m;
-  sudo useradd -m -s /bin/bash user;
-  sudo useradd -m -s /bin/bash xf0r3m;
-  echo 'user:user1' | sudo chpasswd user;
-  echo 'xf0r3m:xf0r3m1' | sudo chpasswd xf0r3m;
-  sudo usermod -aG libvirt,libvirt-qemu user;
-  sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-}
-
-function tidy() {
-  sudo apt autoremove -y;
-  sudo apt autoclean;
-  sudo apt-get clean;
-  sudo apt-get clean;
-  echo > ~/.bash_history;
-  history -c
-}
-
-VERSION=$(echo $0 | cut -d "." -f 1);
-if [ ! $VERSION ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-update_packages;
-install_packages grub-efi-ia32-bin irssi nmap nfs-common remmina;
-
-get_immudex_project;
-
-sudo cp -vv ~/immudex/tools/${VERSION}/create_media /usr/local/bin
-sudo cp -vv ~/immudex/tools/${VERSION}/immudex_install /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/ytplay /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/immudex_upgrade /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/motd2 /usr/local/bin;
-
-chmod +x /usr/local/bin/*;
-
-sudo cp -rvv ~/immudex/files/${VERSION}/libreoffice /etc/skel/.config;
-sudo cp -rvv ~/immudex/files/${VERSION}/.irssi /etc/skel;
-
-recreate_users;
-
-sudo cp -vv ~/immudex/files/${VERSION}/irssi.desktop /home/xf0r3m/.config/autostart;
-sudo chown -R 1001:1001 /home/xf0r3m;
-
-tidy;

diff --git a/versions/0/011.sh b/versions/0/011.sh
deleted file mode 100644 (file)
index 7eabf27..0000000
--- a/versions/0/011.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-function update_packages() {
-  dhclient;
-  sudo apt update;
-  sudo apt upgrade -y;
-}
-
-function install_packages() {
-  sudo apt install $@ -y;
-}
-
-function get_immudex_project() {
-  if [ ! -d ~/immudex ]; then
-    cd;
-    git clone https://github.com/xf0r3m/immudex.git;
-  fi
-}
-
-function recreate_users() {
-  sudo userdel -r user;
-  sudo userdel -r xf0r3m;
-  sudo useradd -m -s /bin/bash user;
-  sudo useradd -m -s /bin/bash xf0r3m;
-  echo 'user:user1' | sudo chpasswd user;
-  echo 'xf0r3m:xf0r3m1' | sudo chpasswd xf0r3m;
-  sudo usermod -aG libvirt,libvirt-qemu user;
-  sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-}
-
-function tidy() {
-  sudo apt autoremove -y;
-  sudo apt autoclean;
-  sudo apt-get clean;
-  sudo apt-get clean;
-  sudo rm -rf ~/immudex;
-  echo > ~/.bash_history;
-  history -c
-}
-
-VERSION=$(echo $0 | cut -d "." -f 1);
-if [ ! $VERSION ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-update_packages;
-install_packages openvpn netselect-apt debootstrap squashfs-tools xorriso isolinux syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools solaar chrony;
-
-get_immudex_project;
-
-sudo cp -vv ~/immudex/tools/${VERSION}/secured-firefox /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/immudex_upgrade /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/library.sh /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/motd2 /usr/local/bin;
-sudo cp -vv ~/immudex/tools/${VERSION}/notifier /usr/local/bin;
-sudo chmod +x /usr/local/bin/*;
-
-sudo cp -vv ~/immudex/files/${VERSION}/16608166085.desktop /etc/skel/.config/xfce4/panel/launcher-19/16608166085.desktop;
-sudo cp -vv ~/immudex/files/${VERSION}/firejail.config /etc/firejail;
-sudo cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
-sudo cp -vv ~/immudex/files/${VERSION}/config /etc/skel/.irssi;
-
-sudo rm -rf /etc/skel/.mozilla;
-sudo tar -xzvf ~/immudex/files/${VERSION}/mozilla.tgz -C /etc/skel;
-
-cp -vv ~/immudex/images/${VERSION}/apply.png /usr/share/icons;
-
-sudo apt install pip -y
-sudo pip install yt-dlp
-sudo rm /usr/bin/youtube-dl
-sudo ln -s /usr/local/bin/yt-dlp /usr/bin/youtube-dl
-
-recreate_users;
-
-cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
-chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/Notifier\ -\ packages.desktop;
-
-tidy;

diff --git a/versions/0/012.sh b/versions/0/012.sh
deleted file mode 100644 (file)
index b535eed..0000000
--- a/versions/0/012.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-dhclient;
-cd;
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git -y && git clone https://github.com/xf0r3m/immudex.git;
-fi
-
-source ~/immudex/versions/template.sh;
-
-sudo sed -i 's@ftp.icm.edu.pl/pub/Linux@deb.debian.org@g' /etc/apt/sources.list;
-
-update_packages;
-install_packages thunderbird gimp;
-
-sudo cp -vv ~/immudex/tools/${VERSION}/* /usr/local/bin;
-sudo chmod +x /usr/local/bin/*;
-
-sudo cp -rvv ~/immudex/files/${VERSION}/launcher-33 /etc/skel/.config/xfce4/panel;
-sudo cp -vv ~/immudex/files/${VERSION}/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml;
-
-recreate_users;
-set_notifier_packages;
-
-tidy;

diff --git a/versions/0/013.sh b/versions/0/013.sh
deleted file mode 100644 (file)
index 2d13879..0000000
--- a/versions/0/013.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-dhclient;
-cd;
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git -y && git clone https://github.com/xf0r3m/immudex.git;
-fi
-
-source ~/immudex/versions/template.sh;
-
-update_packages;
-install_packages rsync;
-
-sudo cp -vv ~/immudex/tools/${VERSION}/* /usr/local/bin;
-sudo chmod +x /usr/local/bin/*;
-
-sudo cp -rvv ~/immudex/files/${VERSION}/meteo /usr/share;
-sudo cp -rvv ~/immudex/files/${VERSION}/sync.sh /usr/share;
-
-sudo cp -vv ~/immudex/files/${VERSION}/mimeapps.list /etc/skel/.config;
-
-recreate_users;
-set_notifier_packages;
-
-tidy;

diff --git a/versions/0/base.sh b/versions/0/base.sh
deleted file mode 100644 (file)
index dcdd332..0000000
--- a/versions/0/base.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -e;
-
-if [ "$1" = "64" ]; then
-  apt install --no-install-recommends linux-image-amd64 live-boot systemd-sysv -y;
-else
-  apt install --no-install-recommends linux-image-686-pae live-boot systemd-sysv -y;
-fi
-
-apt install -y tzdata locales keyboard-configuration console-setup
-dpkg-reconfigure tzdata;
-dpkg-reconfigure locales;
-dpkg-reconfigure keyboard-configuration;
-dpkg-reconfigure console-setup;
-apt install -y task-desktop task-xfce-desktop;
-apt install -y git vim firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr;
-cd;
-git clone https://github.com/xf0r3m/xfcedebian.git;
-cd xfcedebian;
-chmod +x install.sh;
-bash install.sh;
-cd;
-git clone https://github.com/xf0r3m/immudex.git;
-cd immudex;
-tar -xzvf mozilla.tgz -C /etc/skel;
-chown -R root:root /etc/skel/.mozilla;
-cp tools/immudex_install /usr/local/bin;
-cp tools/protected /usr/local/bin;
-chmod +x /usr/local/bin/*;
-cp launchers/16608166085.desktop /etc/skel/.config/xfce4/panel/launcher-19/
-ufw default deny incoming;
-ufw default allow outgoing;
-ufw enable;
-useradd -m -s /bin/bash xf0r3m;
-echo "xf0r3m:xf0r3m1" | chpasswd;
-useradd -m -s /bin/bash user;
-echo "user:user1" | chpasswd;
-echo "xf0r3m ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-echo "user ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-echo "root:toor" | chpasswd;
-usermod -aG libvirt,libvirt-qemu xf0r3m;
-usermod -aG libvirt,libvirt-qemu user;
-echo "immudex" > /etc/hostname;
-echo "127.0.1.1    immudex" >> /etc/hosts;
-echo "deb http://ftp.icm.edu.pl/pub/Linux/debian/ bullseye main" > /etc/apt/sources.list;
-echo "deb-src http://ftp.icm.edu.pl/pub/Linux/debian/ bullseye main" >> /etc/apt/sources.list;
-echo "deb http://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list;
-echo "deb-src http://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list;
-echo "deb http://ftp.icm.edu.pl/pub/Linux/debian/ bullseye-updates main" >> /etc/apt/sources.list;
-echo "deb-src http://ftp.icm.edu.pl/pub/Linux/debian/ bullseye-updates main" >> /etc/apt/sources.list;
-apt update;
-apt upgrade -y;
-cd;
-rm -rf immudex/
-rm -rf xfcedebian/
-apt-get clean
-echo > ~/.bash_history
-history -c

diff --git a/versions/0/template.sh b/versions/0/template.sh
deleted file mode 100644 (file)
index a29ed2d..0000000
--- a/versions/0/template.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-function update_packages() {
-  dhclient;
-  sudo apt update;
-  sudo apt upgrade -y;
-}
-
-function install_packages() {
-  sudo apt install $@ -y;
-}
-
-function get_immudex_project() {
-  if [ ! -d ~/immudex ]; then
-    cd;
-    git clone https://github.com/xf0r3m/immudex.git;
-  fi
-}
-
-function recreate_users() {
-  sudo userdel -r user;
-  sudo userdel -r xf0r3m;
-  sudo useradd -m -s /bin/bash user;
-  sudo useradd -m -s /bin/bash xf0r3m;
-  echo 'user:user1' | sudo chpasswd user;
-  echo 'xf0r3m:xf0r3m1' | sudo chpasswd xf0r3m;
-  sudo usermod -aG libvirt,libvirt-qemu user;
-  sudo usermod -aG libvirt,libvirt-qemu xf0r3m;
-}
-
-function tidy() {
-  sudo apt autoremove -y;
-  sudo apt autoclean;
-  sudo apt-get clean;
-  sudo apt-get clean;
-  sudo rm -rf ~/immudex;
-  echo > ~/.bash_history;
-  history -c
-}
-
-function set_notifier_packages() {
-  cp -vv ~/immudex/files/011/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
-  chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/Notifier\ -\ packages.desktop;
-}
-
-VERSION=$(echo $0 | cut -d "." -f 1);
-if [ ! $VERSION ]; then echo -e "\e[31mUpdate failed!\e[0m"; exit 1; fi
-
-

diff --git a/versions/100.sh b/versions/100.sh
deleted file mode 100644 (file)
index cd2fe23..0000000
--- a/versions/100.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-set -e
-
-VERSION=$(echo $0 | cut -d "." -f 1);
-#export $VERSION;
-
-if [ ! "$1" ]; then exit 1; fi
-if [ ! -d ~/immudex ]; then exit 1; fi
-if [ ! /sbin/debootstrap ]; then exit 1; fi
-
-if [ "$1" = "--amd64" ] || [ "$1" = "--i386" ]; then
-  if [ "$1" = "--amd64" ]; then arch="64"; else arch="32"; fi
-  sudo rm -rf ~/immudex/${arch}/chroot;
-  sudo /sbin/debootstrap --arch=$(echo $1 | sed 's/-//g') stable ~/immudex/${arch}/chroot http://deb.debian.org/debian
-  sudo cat > base_chroot.sh <<EOF
-dhclient;
-cd;
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex 
-else apt install git -y && git clone https://github.com/xf0r3m/immudex 
-
-fi
-export VERSION=$VERSION;
-source ~/immudex/versions/template.sh;
-
-echo "deb http://deb.debian.org/debian/ stable main" > /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ stable main" >> /etc/apt/sources.list;
-echo "deb http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
-echo "deb-src http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
-echo "deb http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
-update_packages;
-
-
-if [ "$arch" = "64" ]; then
-install_packages --no-install-recommends linux-image-amd64 live-boot systemd-sysv -y;
-else
-install_packages --no-install-recommends linux-image-686-pae live-boot systemd-sysv -y;
-fi
-
-install_packages tzdata locales keyboard-configuration console-setup;
-
-dpkg-reconfigure tzdata;
-dpkg-reconfigure locales;
-dpkg-reconfigure keyboard-configuration;
-dpkg-reconfigure console-setup;
-
-install_packages task-desktop task-xfce-desktop;
-
-install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet mpv youtube-dl vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync thunderbird gimp openvpn netselect-apt gvfs-backends;
-
-head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-sed -i 's/stable/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-apt update;
-apt install xfce4-notes-plugin -y;
-rm /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-apt update;
-
-cd;
-
-git clone https://github.com/xf0r3m/xfcedebian;
-cd xfcedebian;
-bash install.sh;
-
-cd;
-
-cp -vv ~/immudex/tools/${VERSION}/* /usr/local/bin;
-chmod +x /usr/local/bin/*;
-
-mkdir /etc/skel/.irssi
-
-cp -vv ~/immudex/files/${VERSION}/config /etc/skel/.irssi;
-cp -vv ~/immudex/files/${VERSION}/default.theme /etc/skel/.irssi;
-cp -rvv ~/immudex/files/${VERSION}/libreoffice /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/firejail.config /etc/firejail;
-cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex/files/${VERSION}/redshift.conf /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/redshift.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /etc/skel/Pulpit;
-cp -vv ~/immudex/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
-cp -vv ~/immudex/files/${VERSION}/mimeapps.list /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
-cp -vv ~/immudex/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
-cp -vv ~/immudex/files/${VERSION}/immudex_hostname.service /etc/systemd/system;
-
-tar -xzvf ~/immudex/files/${VERSION}/mozilla.tgz -C /etc/skel;
-cp -vv ~/immudex/images/${VERSION}/apply.png /usr/share/icons;
-cp -vv ~/immudex/images/${VERSION}/rss.png /usr/share/icons;
-cp -vv ~/immudex/images/${VERSION}/notes-background.jpg /usr/share/images/desktop-base;
-
-rm /usr/share/images/desktop-base/no_trespass_abandon.jpeg;
-systemctl enable immudex_hostname.service;
-
-cat >> /etc/bash.bashrc << EOL
-if [ ! -f /tmp/.motd ]; then
-/usr/local/bin/motd2
-touch /tmp/.motd;
-fi
-EOL
-
-echo "alias chhome='export HOME=\\\$(pwd)'" >> /etc/bash.bashrc;
-echo "alias ytstream='mpv --ytdl-format=best[heigth=480]'" >> /etc/bash.bashrc;
-
-chmod u+s /usr/bin/ping;
-
-/usr/sbin/ufw default deny incoming;
-/usr/sbin/ufw default allow outgoing;
-/usr/sbin/ufw enable;
-
-echo "immudex" > /etc/hostname;
-echo "127.0.1.1   immudex" >> /etc/hosts;
-
-recreate_users;
-echo "user ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-echo "xf0r3m ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-set_notifier_packages;
-set_xfce4_notes_autostart;
-
-tidy;
-EOF
-  sudo cp base_chroot.sh ~/immudex/${arch}/chroot;
-  sudo chroot ~/immudex/${arch}/chroot bash base_chroot.sh;
-  sudo rm ~/immudex/${arch}/chroot/base_chroot.sh;
-else
-  exit 1;
-fi 

diff --git a/versions/101.sh b/versions/101.sh
deleted file mode 100644 (file)
index aae5687..0000000
--- a/versions/101.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-dhclient;
-cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git && git clone https://github.com/xf0r3m/immudex.git;
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-install_packages mutt;
-
-cp -vv ~/immudex/tools/${VERSION}/immudex_branch /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/import_gpgkeys /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/library.sh /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/immudex_hostname /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/newsfeed /usr/local/bin; 
-cp -vv ~/immudex/tools/${VERSION}/pl /usr/local/bin;
-
-apt remove -y thunderbird;
-rm -vf /etc/skel/Pulpit/Klient\ poczty\ Thunderbird.desktop;
-rm -vf /usr/local/bin/run-thunderbird;
-recreate_users;
-
-set_mime;
-
-tidy;
-

diff --git a/versions/102.sh b/versions/102.sh
deleted file mode 100644 (file)
index 982e31b..0000000
--- a/versions/102.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-dhclient;
-cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git && git clone https://github.com/xf0r3m/immudex.git;
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-
-cp -vv ~/immudex/tools/${VERSION}/create_media /usr/local/bin; 
-cp -vv ~/immudex/tools/${VERSION}/pl /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/immudex_hostname /usr/local/bin;
-
-cp -vv ~/immudex/files/${VERSION}/xfce4-keyboard-shortcuts.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml;
-cp -vv ~/immudex/files/${VERSION}/whiskermenu-1.rc /etc/skel/.config/xfce4/panel;
-recreate_users;
-
-set_default_wallpaper altai_1920x1080.png;
-
-set_mime;
-
-tidy;
-

diff --git a/versions/103.sh b/versions/103.sh
deleted file mode 100644 (file)
index e11cfe1..0000000
--- a/versions/103.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-dhclient;
-cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git && git clone https://github.com/xf0r3m/immudex.git;
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-apt purge -y xpra;
-
-cp -vv ~/immudex/tools/${VERSION}/pl /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/idle-clic /usr/local/bin;
-
-wget https://github.com/yt-dlp/yt-dlp/releases/download/2023.07.06/yt-dlp -O /usr/bin/yt-dlp;
-
-cp -vv ~/immudex/files/${VERSION}/xfce4-keyboard-shortcuts.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml;
-cp -vv ~/immudex/files/${VERSION}/xfwm4.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml;
-
-recreate_users;
-
-set_mime;
-
-tidy;
-

diff --git a/versions/104.sh b/versions/104.sh
deleted file mode 100644 (file)
index 97322a2..0000000
--- a/versions/104.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-ARCH=$(dpkg --print-architecture);
-cd
-if [ -x /usr/bin/git ]; then git clone https://git.morketsmerke.org/git/immudex;
-else apt install git && git clone https://git.morketsmerke.org/git/immudex
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-
-if [ $ARCH = "amd64" ]; then
-  wget https://ftp.morketsmerke.org/immudex/stable/software/librewolf/librewolf-117.0-1.en-US.linux-x86_64.tar.bz2;
-  tar -xf librewolf-117.0-1.en-US.linux-x86_64.tar.bz2 -C /usr/lib;
-  rm librewolf-117.0-1.en-US.linux-x86_64.tar.bz2;
-else
-  wget https://ftp.morketsmerke.org/immudex/stable/software/librewolf/librewolf-117.0-1.en-US.linux-i686.tar.bz2;
-  tar -xf librewolf-117.0-1.en-US.linux-i686.tar.bz2 -C /usr/lib;
-  rm librewolf-117.0-1.en-US.linux-i686.tar.bz2;
-fi
-ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
-
-cp -vv ~/immudex/files/${VERSION}/LibreWolf\ \(Firejailed\).desktop /etc/skel/Pulpit;
-rm -v /etc/skel/Pulpit/Firefox.desktop;
-
-cp -vv ~/immudex/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
-cp -vv ~/immudex/files/${VERSION}/librewolf.desktop /usr/share/applications;
-cp -vv ~/immudex/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0;
-tar -xf ~/immudex/files/${VERSION}/librewolf.tgz -C /etc/skel;
-
-cp -vv ~/immudex/tools/${VERSION}/secured-firefox /usr/local/bin;
-
-cp -vv ~/immudex/images/${VERSION}/lightdm_wallpaper.jpg /usr/share/images/desktop-base;
-sed -i 's/abandoned_hospital_bower.png/lightdm_wallpaper.jpg/' /etc/lightdm/lightdm-gtk-greeter.conf;
-rm -v /usr/share/images/desktop-base/abandoned_hospital_bower.png;
-rm -v /usr/share/images/desktop-base/lofi_girl.jpg;
-rm -v /usr/share/images/dektop-base/notes-background.jpg;
-recreate_users;
-
-set_mime;
-
-tidy;
-

diff --git a/versions/105.sh b/versions/105.sh
deleted file mode 100644 (file)
index 8fa8c17..0000000
--- a/versions/105.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-ARCH=$(dpkg --print-architecture);
-cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex;
-else apt install git && git clone https://github.com/xf0r3m/immudex;
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-
-if [ $ARCH = "amd64" ]; then
-  wget https://ftp.morketsmerke.org/immudex/testing/software/librewolf/librewolf-118.0.1-1.en-US.linux-x86_64.tar.bz2;
-  tar -xf librewolf-118.0.1-1.en-US.linux-x86_64.tar.bz2 -C /usr/lib;
-  rm librewolf-118.0.1-1.en-US.linux-x86_64.tar.bz2;
-else
-  wget https://ftp.morketsmerke.org/immudex/testing/software/librewolf/librewolf-118.0.1-1.en-US.linux-i686.tar.bz2;
-  tar -xf librewolf-118.0.1-1.en-US.linux-i686.tar.bz2 -C /usr/lib;
-  rm librewolf-118.0.1-1.en-US.linux-i686.tar.bz2;
-fi
-#ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
-
-tar -xf ~/immudex/files/${VERSION}/librewolf.tgz -C /etc/skel;
-
-cp -vv ~/immudex/tools/${VERSION}/library.sh /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/motd2 /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/newsfeed /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/sync.sh /usr/local/bin;
-cp -vv ~/immudex/tools/${VERSION}/unlock-ds /usr/local/bin;
-chmod +x /usr/local/bin/*
-
-recreate_users;
-set_mime;
-
-tidy;
-

diff --git a/versions/106.sh b/versions/106.sh
deleted file mode 100644 (file)
index c70912c..0000000
--- a/versions/106.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex;
-else apt install git && git clone https://github.com/xf0r3m/immudex;
-fi
-source ~/immudex/versions/template.sh;
-
-update_packages;
-
-cd;
-mkdir curl;
-cd curl;
-wget https://github.com/curl/curl/archive/refs/tags/curl-8_4_0.tar.gz;
-tar -xf curl-8_4_0.tar.gz;
-cd curl-curl-8_4_0;
-sudo apt install -y zlib1g-dev libc6-dev libnghttp2-dev libidn2-0-dev librtmp-dev libssh2-1-dev libpsl-dev libssh2-1-dev libssl-dev libgss-dev libldap-dev libzstd-dev libbrotli-dev libgnutls28-dev libhogweed6 nettle-dev libgmp-dev libkrb5-dev libk5crypto3 libcom-dev libkrb5support0 libsasl2-dev libp11-dev libtasn1-6-dev libkeyutils-dev libffi-dev autoconf libtool
-autoreconf -fi
-./configure --with-openssl --with-gssapi --disable-libcurl-option --with-libssh2
-make
-make install
-rm /usr/bin/curl
-cp -vv /usr/local/lib/libcurl.* /lib/x86_64-linux-gnu/
-ln -s /usr/local/bin/curl /usr/bin/curl;
-curl -V;
-
-set_mime;
-
-tidy;
-

diff --git a/versions/base.sh b/versions/base.sh
index 50802b0d1f45193f054d738e114b789a5b41e186..4d0ad000ef15d6406856762f8de3e90d1c05a615 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -1,29 +1,48 @@
 #!/bin/bash
 
-dhclient;
-cd;
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex;
-else apt install git -y && git clone https://github.com/xf0r3m/immudex;
+set -e
+
+DEBVER='oldstable'
+ARCH=$(dpkg --print-architecture);
+LWVER='120.0-2';
+LWTEST=1;
 
+if [ $ARCH = "amd64" ]; then
+  KARCH="amd64";
+else
+  KARCH="686-pae";
 fi
-export VERSION=100;
-source ~/immudex/versions/template.sh;
-
-echo "deb http://deb.debian.org/debian/ stable main" > /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ stable main" >> /etc/apt/sources.list;
-echo "deb http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
-echo "deb-src http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
-echo "deb http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
-update_packages;
 
+if [ $LWTEST -eq 0 ]; then
+  LWPATH="https://ftp.morketsmerke.org/immudex/testing/software/librewolf/testing";
+else
+  LWPATH="https://ftp.morketsmerke.org/immudex/testing/software/librewolf";
+fi
 
-if [ $(uname -m) = "x86_64" ]; then
-install_packages --no-install-recommends linux-image-amd64 live-boot systemd-sysv -y;
+if [ $ARCH = "amd64" ]; then
+  LWARCH="x86_64";
 else
-install_packages --no-install-recommends linux-image-686-pae live-boot systemd-sysv -y;
+  LWARCH="i686";
 fi
 
+cd;
+if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex-testing;
+else apt install git -y && git clone https://github.com/xf0r3m/immudex-testing;
+
+fi
+source ~/immudex-testing/versions/template.sh;
+
+echo "deb http://deb.debian.org/debian/ ${DEBVER} main" > /etc/apt/sources.list;
+echo "deb-src http://deb.debian.org/debian/ ${DEBVER} main" >> /etc/apt/sources.list;
+echo "deb http://security.debian.org/debian-security ${DEBVER}-security main" >> /etc/apt/sources.list;
+echo "deb-src http://security.debian.org/debian-security ${DEBVER}-security main" >> /etc/apt/sources.list;
+echo "deb http://deb.debian.org/debian/ ${DEBVER}-updates main" >> /etc/apt/sources.list;
+echo "deb-src http://deb.debian.org/debian/ ${DEBVER}-updates main" >> /etc/apt/sources.list;
+update_packages;
+
+
+install_packages --no-install-recommends linux-image-${KARCH} live-boot systemd-sysv -y;
+
 install_packages tzdata locales keyboard-configuration console-setup;
 
 dpkg-reconfigure tzdata;
@@ -33,59 +52,115 @@ dpkg-reconfigure console-setup;
 
 install_packages task-desktop task-xfce-desktop;
 
-install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet mpv youtube-dl vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync thunderbird gimp openvpn netselect-apt gvfs-backends;
+install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet mpv vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync mutt gimp openvpn netselect-apt gvfs-backends dnsutils;
+
+#Missing packages
+if [ $DEBVER = "testing" ]; then
+  install_packages xfce4-notes-plugin yt-dlp;
+else
+  head -1 /etc/apt/sources.list | sed "s/${DEBVER}/testing/" > /etc/apt/sources.list.d/testing.list;
+  apt update;
+  install_packages xfce4-notes-plugin yt-dlp;
+  rm /etc/apt/sources.list.d/testing.list;
+  apt update;
+fi
+if [ -f /usr/bin/youtube-dl ]; then rm /usr/bin/youtube-dl; fi
+ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
+
+wget ${LWPATH}/librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
+tar -xf librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2 -C /usr/lib;
+rm librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
+
+ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
 
-head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-sed -i 's/stable/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-apt update;
-apt install xfce4-notes-plugin -y;
-rm /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-apt update;
+update-alternatives --remove x-www-browser /usr/bin/firefox-esr;
+update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/lib/librewolf/librewolf 70;
+
+#head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
+#sed -i 's/testing/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
+#apt update;
+#apt install xfce4-notes-plugin -y;
+#rm /etc/apt/sources.list.d/xfce4-notes-plugin.list;
+#apt update;
 
 cd;
 
-git clone https://github.com/xf0r3m/xfcedebian;
+#16.08.2023 - z repozytoriów Debian testing został usunięty pakiet picom.
+git clone https://github.com/xf0r3m/xfcedebian -b d13;
 cd xfcedebian;
 bash install.sh;
 
 cd;
 
-cp -vv ~/immudex/tools/${VERSION}/* /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-autostart-x4notes /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-create-media /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-addons /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-branch /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-crypt /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-hostname /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-install /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-import-gpgkeys /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-import-sshkeys /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-meteo /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-morketsmerke /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-motd2 /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-newsfeed /usr/local/bin;
+#cp -vv ~/immudex-testing/tools/immudex-notifier /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-padlock /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-pl /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-secured-firefox /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-shoutcasts /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-version /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-upgrade /usr/local/bin;
+cp -vv ~/immudex-testing/tools/immudex-ytplay /usr/local/bin;
+cp -vv ~/immudex-testing/tools/library.sh /usr/local/bin;
+cp -vv ~/immudex-testing/tools/idle-clic /usr/local/bin;
+cp -vv ~/immudex-testing/tools/sync.sh /usr/local/bin;
+
+
 chmod +x /usr/local/bin/*;
 
 mkdir /etc/skel/.irssi
 
-cp -vv ~/immudex/files/${VERSION}/config /etc/skel/.irssi;
-cp -vv ~/immudex/files/${VERSION}/default.theme /etc/skel/.irssi;
-cp -rvv ~/immudex/files/${VERSION}/libreoffice /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/firejail.config /etc/firejail;
-cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex/files/${VERSION}/redshift.conf /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/redshift.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /etc/skel/Pulpit;
-cp -vv ~/immudex/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
-cp -vv ~/immudex/files/${VERSION}/mimeapps.list /etc/skel/.config;
-cp -vv ~/immudex/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
-cp -vv ~/immudex/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
-cp -vv ~/immudex/files/${VERSION}/immudex_hostname.service /etc/systemd/system;
-
-tar -xzvf ~/immudex/files/${VERSION}/mozilla.tgz -C /etc/skel;
-cp -vv ~/immudex/images/${VERSION}/apply.png /usr/share/icons;
-cp -vv ~/immudex/images/${VERSION}/rss.png /usr/share/icons;
-cp -vv ~/immudex/images/${VERSION}/notes-background.jpg /usr/share/images/desktop-base;
-
-rm /usr/share/images/desktop-base/no_trespass_abandon.jpeg;
+cp -vv ~/immudex-testing/files/config /etc/skel/.irssi;
+cp -vv ~/immudex-testing/files/default.theme /etc/skel/.irssi;
+cp -rvv ~/immudex-testing/files/libreoffice /etc/skel/.config;
+cp -vv ~/immudex-testing/files/firejail.config /etc/firejail;
+#cp -vv ~/immudex-testing/files/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex-testing/files/redshift.conf /etc/skel/.config;
+cp -vv ~/immudex-testing/files/redshift.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex-testing/files/terminalrc /etc/skel/.config/xfce4/terminal;
+cp -vv ~/immudex-testing/files/xfce4-keyboard-shortcuts.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
+cp -vv ~/immudex-testing/files/whiskermenu-1.rc /etc/skel/.config/xfce4/panel;
+cp -vv ~/immudex-testing/files/xfwm4.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml;
+
+# Instalacja MIME jest teraz częścią projektu 'xfcedebian'
+#cp -vv ~/immudex-testing/files/${VERSION}/mimeapps.list /etc/skel/.config;
+
+cp -rvv ~/immudex-testing/files/sync.sh /usr/share;
+cp -vv ~/immudex-testing/files/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
+cp -vv ~/immudex-testing/files/librewolf.desktop /usr/share/applications;
+cp -vv ~/immudex-testing/files/immudex_hostname.service /etc/systemd/system;
+
+tar -xzvf ~/immudex-testing/files/mozilla.tgz -C /etc/skel;
+tar -xf ~/immudex-testing/files/librewolf.tgz -C /etc/skel;
+#cp -vv ~/immudex-testing/images/${VERSION}/apply.png /usr/share/icons;
+cp -vv ~/immudex-testing/images/rss.png /usr/share/icons;
+
+cp -vv ~/immudex-testing/launchers/16844254192.desktop /etc/skel/.config/xfce4/panel/launcher-5;
+
 systemctl enable immudex_hostname.service;
 
 cat >> /etc/bash.bashrc << EOL
 if [ ! -f /tmp/.motd ]; then
-/usr/local/bin/motd2
+/usr/local/bin/immudex-motd2
 touch /tmp/.motd;
 fi
 EOL
 
-echo "alias chhome='export HOME=\\\$(pwd)'" >> /etc/bash.bashrc;
-echo "alias ytstream='mpv --ytdl-format=best[heigth=480]'" >> /etc/bash.bashrc;
+echo "alias immudex-chhome='export HOME=\$(pwd)'" >> /etc/bash.bashrc;
+echo "alias immudex-changelogs='immudex-upgrade --check --print'" >> /etc/bash.bashrc;
+echo "alias immudex-version='immudex-upgrade --myversion'" >> /etc/bash.bashrc;
 
 chmod u+s /usr/bin/ping;
 
@@ -96,10 +171,14 @@ chmod u+s /usr/bin/ping;
 echo "immudex" > /etc/hostname;
 echo "127.0.1.1   immudex" >> /etc/hosts;
 
+# Zmiany można umieścić również tutaj jeśli dotyczą one użytkowników lub ich
+# plików konfiguracyjnych
+
 recreate_users;
 echo "user ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
 echo "xf0r3m ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-set_notifier_packages;
-set_xfce4_notes_autostart;
 
+# Miejsce na twoje zmiany, przed poleceniem 'tidy'
+echo "xf0r3m:2xp8q4ll" | chpasswd;
+install_packages qemu-guest-agent;
 tidy;

diff --git a/versions/template.sh b/versions/template.sh
index 214269aa136811a89f99c9d702d1e423418a3373..75d6ae9a5f37d0783e82716c9d4309c0abf904a4 100644 (file)
--- a/versions/template.sh
+++ b/versions/template.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 function update_packages() {
-  dhclient; 
   apt update;
   apt upgrade -y;
 }
@@ -11,41 +10,27 @@ function install_packages() {
 }
 
 function set_notifier_packages() {
-  cp -vv ~/immudex/files/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
+  cp -vv ~/immudex-testing/files/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
   chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/Notifier\ -\ packages.desktop;
 }
 
 function set_xfce4_notes_autostart() {
-  cp -vv ~/immudex/files/autostart-x4notes.desktop /home/xf0r3m/.config/autostart;
+  cp -vv ~/immudex-testing/files/autostart-x4notes.desktop /home/xf0r3m/.config/autostart;
   chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/autostart-x4notes.desktop;
 }
 
-function recreate_users() {
-  userdel -r user;
-  userdel -r xf0r3m;
 
+function recreate_users() {
   useradd -m -s /bin/bash user;
   cp -rvv /etc/skel/.??* /home/user;
-  cp -rvv /etc/skel/?* /home/user;
-  mkdir /home/user/.local;
-  tar -xvf ~/immudex/files/local_user.tar -C /home/user/.local;
-  rm /home/user/.face;
-  cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/user/.face;
   chown -R user:user /home/user;
   echo "user:user1" | chpasswd;
 
   useradd -m -s /bin/bash xf0r3m;
   cp -rvv /etc/skel/.??* /home/xf0r3m;
-  cp -rvv /etc/skel/?* /home/xf0r3m;
-  mkdir /home/xf0r3m/.local;
-  tar -xvf ~/immudex/files/local_xf0r3m.tar -C /home/xf0r3m/.local;
-  rm /home/xf0r3m/.face;
-  cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/xf0r3m/.face;
   chown -R xf0r3m:xf0r3m /home/xf0r3m;
   echo "xf0r3m:xf0r3m1" | chpasswd;
-
-  set_notifier_packages;
-  set_xfce4_notes_autostart;
+  set_xfce4_notes_autostart
 
   usermod -aG libvirt,libvirt-qemu xf0r3m;
   usermod -aG libvirt,libvirt-qemu user;
@@ -58,7 +43,7 @@ function tidy() {
   apt-get clean;
   apt-get autoremove -y;
   apt-get autoclean;
-  rm -rf ~/immudex;
+  rm -rf ~/immudex-testing;
   if [ -d ~/xfcedebian ]; then rm -rf ~/xfcedebian; fi
   rm /var/cache/apt/*.bin;
   echo > ~/.bash_history;
@@ -70,9 +55,8 @@ function set_default_wallpaper() {
   ln -s /usr/share/images/desktop-base/$1 /usr/share/images/desktop-base/default;
 }
 
-
 function set_mime() {
-  cp -vv ~/immudex/files/mimeinfo.cache /usr/share/applications;  
+  cp -vv ~/immudex-testing/files/mimeinfo.cache /usr/share/applications;  
 }
 
 export VERSION=$(echo $0 | cut -d "." -f 1);