diff --git a/merge/README.txt b/merge/README.txt index eca55ff..e20d107 100644 --- a/merge/README.txt +++ b/merge/README.txt @@ -52,6 +52,7 @@ merge/sys-apps/portage/syncmodule/calculate содержит код, котор Обрабатывается ли корректно параметр name='' Проверить сравнение с версией в dracut 048 Перенести шаблон nginx.conf в live, так как там используется main.hr.cpu.num +./uca.xml - проверить переводы строк с учётом {%- ---Учесть при внедрении--- Удалены шаблоны для plymouth 0.9.4, учесть возможность того, что останутся устаревшие версии diff --git a/merge/xfce-base/.calculate_directory b/merge/xfce-base/.calculate_directory new file mode 100644 index 0000000..fe9987a --- /dev/null +++ b/merge/xfce-base/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip' %} diff --git a/merge/xfce-base/exo/.calculate_directory b/merge/xfce-base/exo/.calculate_directory new file mode 100644 index 0000000..f4cfb2a --- /dev/null +++ b/merge/xfce-base/exo/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='xfce-base/exo' %} diff --git a/merge/xfce-base/exo/applications/.calculate_directory b/merge/xfce-base/exo/applications/.calculate_directory new file mode 100644 index 0000000..5ce555b --- /dev/null +++ b/merge/xfce-base/exo/applications/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share' %} diff --git a/merge/xfce-base/exo/applications/exo-file-manager.desktop b/merge/xfce-base/exo/applications/exo-file-manager.desktop new file mode 100644 index 0000000..3f9f987 --- /dev/null +++ b/merge/xfce-base/exo/applications/exo-file-manager.desktop @@ -0,0 +1,5 @@ +{% calculate format='kde' %} + +# Hide icon +[Desktop Entry] +OnlyShowIn=X-NeverShowThis; diff --git a/merge/xfce-base/exo/applications/exo-mail-reader.desktop b/merge/xfce-base/exo/applications/exo-mail-reader.desktop new file mode 100644 index 0000000..3f9f987 --- /dev/null +++ b/merge/xfce-base/exo/applications/exo-mail-reader.desktop @@ -0,0 +1,5 @@ +{% calculate format='kde' %} + +# Hide icon +[Desktop Entry] +OnlyShowIn=X-NeverShowThis; diff --git a/merge/xfce-base/exo/applications/exo-terminal-emulator.desktop b/merge/xfce-base/exo/applications/exo-terminal-emulator.desktop new file mode 100644 index 0000000..3f9f987 --- /dev/null +++ b/merge/xfce-base/exo/applications/exo-terminal-emulator.desktop @@ -0,0 +1,5 @@ +{% calculate format='kde' %} + +# Hide icon +[Desktop Entry] +OnlyShowIn=X-NeverShowThis; diff --git a/merge/xfce-base/exo/applications/exo-web-browser.desktop b/merge/xfce-base/exo/applications/exo-web-browser.desktop new file mode 100644 index 0000000..3f9f987 --- /dev/null +++ b/merge/xfce-base/exo/applications/exo-web-browser.desktop @@ -0,0 +1,5 @@ +{% calculate format='kde' %} + +# Hide icon +[Desktop Entry] +OnlyShowIn=X-NeverShowThis; diff --git a/merge/xfce-base/exo/helpers/.calculate_directory b/merge/xfce-base/exo/helpers/.calculate_directory new file mode 100644 index 0000000..d5bd22e --- /dev/null +++ b/merge/xfce-base/exo/helpers/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share/xfce4' %} diff --git a/merge/xfce-base/exo/helpers/chromium-chromium.desktop b/merge/xfce-base/exo/helpers/chromium-chromium.desktop new file mode 100644 index 0000000..6fb604a --- /dev/null +++ b/merge/xfce-base/exo/helpers/chromium-chromium.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Name=Chromium +Comment=Open-source version of Google Chrome web browser +Exec=chromium %U +TryExec=chromium +Icon=chromium-browser +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +Categories=Network;WebBrowser; +X-XFCE-Category=WebBrowser +X-XFCE-Commands=chromium +X-XFCE-CommandsWithParameter=chromium "%s" +Type=X-XFCE-Helper +X-XFCE-Category=WebBrowser +X-XFCE-Commands=chromium +X-XFCE-CommandsWithParameter=chromium "%s" diff --git a/merge/xfce-base/libxfce4ui/.calculate_directory b/merge/xfce-base/libxfce4ui/.calculate_directory new file mode 100644 index 0000000..7b6fd22 --- /dev/null +++ b/merge/xfce-base/libxfce4ui/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc/xdg/xfce4/xfconf', name='xfce-perchannel-xml', package='xfce-base/libxfce4ui' %} diff --git a/merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml b/merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000..bb921a2 --- /dev/null +++ b/merge/xfce-base/libxfce4ui/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,3 @@ +{% calculate format='regex' %} +\n.*Primary.*Alt.*Delete.*lock.* + diff --git a/merge/xfce-base/thunar/.calculate_directory b/merge/xfce-base/thunar/.calculate_directory new file mode 100644 index 0000000..3927e05 --- /dev/null +++ b/merge/xfce-base/thunar/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc/xdg', name='Thunar', package='xfce-base/thunar' %} diff --git a/merge/xfce-base/thunar/thunar-bulk-rename.desktop b/merge/xfce-base/thunar/thunar-bulk-rename.desktop new file mode 100644 index 0000000..d223cf6 --- /dev/null +++ b/merge/xfce-base/thunar/thunar-bulk-rename.desktop @@ -0,0 +1,3 @@ +{% calculate format='kde', path='/usr/share/applications' %} +[Desktop Entry] +Categories=Utility;Core;GTK;Filesystem; diff --git a/merge/xfce-base/thunar/thunar.desktop b/merge/xfce-base/thunar/thunar.desktop new file mode 100644 index 0000000..3daed37 --- /dev/null +++ b/merge/xfce-base/thunar/thunar.desktop @@ -0,0 +1,3 @@ +{% calculate format='kde', path='/usr/share/applications' %} +[Desktop Entry] +Categories=System; diff --git a/merge/xfce-base/thunar/uca.xml b/merge/xfce-base/thunar/uca.xml new file mode 100644 index 0000000..d3cd8e0 --- /dev/null +++ b/merge/xfce-base/thunar/uca.xml @@ -0,0 +1,25 @@ +{% calculate format='regex', comment='xml' %} +</action> +( <action> + <icon>edit-find</icon> + <patterns>*</patterns> + <name>Search</name> + <name xml:lang="ru">Поиск</name> + <command>catfish --fileman=thunar --path=%f</command> + <description>find files or filders</description> + <description xml:lang="ru">найти файлы и папки</description> + <directories/> + </action>)? + +</action> +{% if pkg('dev-util/catfish') %} <action> + <icon>edit-find</icon> + <patterns>*</patterns> + <name>Search</name> + <name xml:lang="ru">Поиск</name> + <command>catfish %f</command> + <description>find files or filders</description> + <description xml:lang="ru">найти файлы и папки</description> + <directories/> + </action> +{% endif %} diff --git a/merge/xfce-base/xfce4-appfinder/.calculate_directory b/merge/xfce-base/xfce4-appfinder/.calculate_directory new file mode 100644 index 0000000..c4680e1 --- /dev/null +++ b/merge/xfce-base/xfce4-appfinder/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share', name='applications', package='xfce-base/xfce4-appfinder' %} diff --git a/merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop b/merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop new file mode 100644 index 0000000..da0c0ff --- /dev/null +++ b/merge/xfce-base/xfce4-appfinder/xfce4-appfinder.desktop @@ -0,0 +1,4 @@ +{% calculate format='kde' %} + +[Desktop Entry] +NoDisplay=true diff --git a/merge/xfce-base/xfce4-panel/.calculate_directory b/merge/xfce-base/xfce4-panel/.calculate_directory new file mode 100644 index 0000000..c36cdb8 --- /dev/null +++ b/merge/xfce-base/xfce4-panel/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='xfce-base/xfce4-panel', pkg('x11-themes/calculate-icon-theme') >= '14-r6' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory b/merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory new file mode 100644 index 0000000..9d6af0f --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share/icons', name='hicolor' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png b/merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/16x16/apps/xfce4-panel-menu.png @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png b/merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/22x22/apps/xfce4-panel-menu.png @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png b/merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/24x24/apps/xfce4-panel-menu.png @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png b/merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/32x32/apps/xfce4-panel-menu.png @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png b/merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/xfce-base/xfce4-panel/remove-start-here/48x48/apps/xfce4-panel-menu.png @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg b/merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg new file mode 100644 index 0000000..8c71419 --- /dev/null +++ b/merge/xfce-base/xfce4-panel/xfce4-panel-menu.svg @@ -0,0 +1 @@ +{% calculate append='link', path='/usr/share/icons/hicolor/symbolic/apps', source='/usr/share/pixmaps/calculate/start-here-blue.svg', mirror %} diff --git a/merge/xfce-base/xfce4-session/.calculate_directory b/merge/xfce-base/xfce4-session/.calculate_directory new file mode 100644 index 0000000..27505f2 --- /dev/null +++ b/merge/xfce-base/xfce4-session/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='xfce-base/xfce4-session' %} diff --git a/merge/xfce-base/xfce4-session/xfce.desktop b/merge/xfce-base/xfce4-session/xfce.desktop new file mode 100644 index 0000000..8436158 --- /dev/null +++ b/merge/xfce-base/xfce4-session/xfce.desktop @@ -0,0 +1,4 @@ +{% calculate format='kde', path='/usr/share/xsessions' %} + +[Desktop Entry] +Name[ru]=Сеанс Xfce diff --git a/merge/xfce-base/xfce4-session/xfce4-session-logout.desktop b/merge/xfce-base/xfce4-session/xfce4-session-logout.desktop new file mode 100644 index 0000000..cf87f21 --- /dev/null +++ b/merge/xfce-base/xfce4-session/xfce4-session-logout.desktop @@ -0,0 +1,4 @@ +{% calculate format='kde', path='/usr/share/applications' %} + +[Desktop Entry] +Categories=X-XFCE;X-Xfce-Toplevel; diff --git a/merge/xfce-base/xfce4-session/xflock4 b/merge/xfce-base/xfce4-session/xflock4 new file mode 100755 index 0000000..20839c1 --- /dev/null +++ b/merge/xfce-base/xfce4-session/xflock4 @@ -0,0 +1,66 @@ +{% calculate path='/usr/bin', chmod='755', chown='root:root' %} +#!/bin/sh +# +# xfce4 +# +# Copyright (C) 1999, 2003 Olivier Fourdan (fourdan@xfce.org) +# Copyright (C) 2011 Guido Berhoerster (guido+xfce.org@berhoerster.name) +# Copyright (C) 2011 Jarno Suni (8@iki.fi) +# Copyright (C) 2013 Mir Calculate (support@calculate-linux.ru) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +PATH=/bin:/usr/bin +export PATH + +# spawn xflock4 before suspend contains DISPLAY without dot symbol +# wait several seconds before the dm-tool running if it's the suspend +SLEEPCMD=: +[ "${DISPLAY}" == "${DISPLAY/./}" ] && SLEEPCMD="sleep 2" +# lock screen by gnome-screensaver and activate lightdm user switch +if type dm-tool &>/dev/null; then + if type gnome-screensaver-command &>/dev/null; then + gnome-screensaver-command --lock &>/dev/null && + $SLEEPCMD && dm-tool switch-to-greeter &>/dev/null && exit + else + dm-tool switch-to-greeter &>/dev/null && exit + fi +fi + +# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running +for lock_cmd in \ + "xscreensaver-command -lock" \ + "gnome-screensaver-command --lock" +do + $lock_cmd >/dev/null 2>&1 && exit +done + +# else run another access locking utility, if installed +for lock_cmd in \ + "xlock -mode blank" \ + "slock" + do + set -- $lock_cmd + if command -v -- $1 >/dev/null 2>&1; then + $lock_cmd >/dev/null 2>&1 & + # turn off display backlight: + xset dpms force off + exit + fi +done + +# else access locking failed +exit 1 diff --git a/merge/xfce-base/xfdesktop/.calculate_directory b/merge/xfce-base/xfdesktop/.calculate_directory new file mode 100644 index 0000000..f6b52e9 --- /dev/null +++ b/merge/xfce-base/xfdesktop/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='xfce-base/xfdesktop' %} diff --git a/merge/xfce-base/xfdesktop/kioskrc b/merge/xfce-base/xfdesktop/kioskrc new file mode 100644 index 0000000..16b1aee --- /dev/null +++ b/merge/xfce-base/xfdesktop/kioskrc @@ -0,0 +1,4 @@ +{% calculate format='samba', path='/etc/xdg/xfce4/kiosk' %} + +[xfce4-session] +!Shutdown= diff --git a/merge/xfce-base/xfdesktop/xfce-blue.jpg b/merge/xfce-base/xfdesktop/xfce-blue.jpg new file mode 100644 index 0000000..fa0b7bb --- /dev/null +++ b/merge/xfce-base/xfdesktop/xfce-blue.jpg @@ -0,0 +1 @@ +{% calculate append='remove', path='/usr/share/backgrounds/xfce' %}