Добавлена поддержка ini.env в профиле MATE

profiles/base/package.keywords/default

@@ -210,7 +210,7 @@
 ~x11-drivers/ati-drivers-15.12 amd64 x86
 ~x11-drivers/xf86-video-amdgpu-1.1.2 amd64 x86
 ~x11-drivers/xf86-video-ati-7.7.1 amd64 x86
-~x11-drivers/xf86-video-intel-2.99.917_p20161024 amd64
+~x11-drivers/xf86-video-intel-2.99.917_p20161103 amd64
 ~x11-drivers/xf86-video-virtualbox-5.0.20 amd64 x86
 ~x11-misc/cdm-0.6.1_pre20130419 amd64 x86
 ~x11-misc/lightdm-gtk-greeter-2.0.1 amd64 x86

profiles/ini.env

@@ -1,18 +1,32 @@
 # User Profile Settings
 [profile]
-# Font family (droid, roboto, noto)
-font-name = droid
 # Font size
 font-size = 10
-# Single mouse click (on, off)
-mouse-singleclick = on
+keyboard-delay = 360
+keyboard-rate = 300
+# Mouse click policy (single, double)
+mouse-clickpolicy = single
+mouse-doubleclick-delayed = 400
+mouse-lefthanded = off
+# Time in seconds after which put the to sleep an inactive computer, 0 - newer
+power-computer-sleep = 0
+# Time in seconds after which the display is turned off when idle, 0 - newer
+power-display-sleep = 1800
+# Activate screensaver when computer is idle
+screensaver-activation = on
+# Time in minutes, after which the computer is idle
+screensaver-delay = 10
+# Lock screen when screensaver is active
+screensaver-lock = on
 # Icon size
 wm-icon-size = 48
-# The position of the main panel (top, bottom, left, right, off)
+wm-panel-main-autohide = off
+# The position of the main panel (top, bottom, left, right)
 wm-panel-main-position = top
 # The size of the Main panel
-wm-panel-main-size = 24
-# Position the Quick Launch toolbar (top, bottom, left, right, off)
-wm-panel-menu-position = off
+wm-panel-main-size = 32
+wm-panel-menu-autohide = off
+# Position the Quick Launch toolbar (top, bottom, left, right)
+wm-panel-menu-position = bottom
 # The size of the Quick Launch toolbar
 wm-panel-menu-size = 56

profiles/templates/3.4/6_ac_update_sync/world/grp/emulation

@@ -17,6 +17,7 @@ app-emulation/wine
 app-emulation/winetricks
 app-emulation/xen-tools
 games-emulation/dosbox
+games-emulation/hatari
 games-emulation/mednafen
 games-server/mednafen-server
 sci-visualization/qtiplot

profiles/templates/3.5/6_ac_desktop_profile/2-user/kde-apps/KDE-5/.config/katepartrc

@@ -0,0 +1,3 @@
+# Calculate format=kde
+[View]
+Scroll Bar MiniMap=false

profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/livecd

@@ -1,5 +0,0 @@
-# Calculate format=dconf dconf=/org/mate os_root_type==livecd
-
-[screensaver]
-idle-activation-enabled=false
-lock-enabled=false

profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/mate

@@ -4,7 +4,7 @@ show-thousands=true
 
 [caja/desktop]
 computer-icon-visible=false
-font='Droid Sans 10'
+font='Droid Sans #-ini(profile.font-size)-#'
 #?env(client.os_remote_auth)==||ur_domain_set==off#
 home-icon-visible=true
 #env#
@@ -15,7 +15,7 @@ trash-icon-visible=false
 volumes-visible=false
 
 [caja/preferences]
-click-policy='single'
+click-policy='#-ini(profile.mouse-clickpolicy)-#'
 
 #pkg(media-gfx/calculate-wallpapers)!=#
 [desktop/background]
@@ -27,11 +27,11 @@ secondary-color='#000000000000'
 #pkg#
 
 [desktop/interface]
-document-font-name='Droid Sans 10'
-font-name='Droid Sans 10'
+document-font-name='Droid Sans #-ini(profile.font-size)-#'
+font-name='Droid Sans #-ini(profile.font-size)-#'
 gtk-theme='Calculate'
 icon-theme='Calculate'
-monospace-font-name='Droid Sans Mono Slashed 10'
+monospace-font-name='Droid Sans Mono Slashed #-ini(profile.font-size)-#'
 
 [desktop/keybindings/custom0]
 action='xkill'
@@ -58,7 +58,8 @@ automount=false
 
 [desktop/peripherals/keyboard]
 cursor-theme='Calculate'
-delay=360
+delay=#-ini(profile.keyboard-delay)-#
+rate=#-ini(profile.keyboard-rate)-#
 #?hr_laptop==#
 numlock-state='on'
 #hr_laptop#
@@ -74,18 +75,25 @@ font-family='Droid Sans 18'
 
 [desktop/peripherals/mouse]
 cursor-theme='Calculate'
+double-click=#-ini(profile.mouse-doubleclick-delayed)-#
+#?ini(profile.mouse-lefthanded)==on#
+left-handed=true
+#ini#
 
 [desktop/peripherals/touchpad]
 disable-while-typing=false
 tap-to-click=true
 
+[desktop/session]
+idle-delay=#-ini(profile.screensaver-delay)-#
+
 [dictionary]
 print-font='Droid Sans 12'
 
 [marco/general]
 side-by-side-tiling=false
 theme='Dopple-Left'
-titlebar-font='Droid Sans Bold 10'
+titlebar-font='Droid Sans Bold #-ini(profile.font-size)-#'
 
 [marco/general]
 center-new-windows=false
@@ -102,6 +110,22 @@ switch-to-workspace-4='<Primary>F4'
 [notification-daemon]
 theme='slider'
 
+[power-manager]
+sleep-computer-ac=#-ini(profile.power-computer-sleep)-#
+sleep-display-ac=#-ini(profile.power-display-sleep)-#
+
+[screensaver]
+#?ini(profile.screensaver-activation)==on&&os_root_type!=livecd#
+idle-activation-enabled=true
+#!ini#
+idle-activation-enabled=false
+#ini#
+#?ini(profile.screensaver-lock)==on&&os_root_type!=livecd#
+lock-enabled=true
+#!ini#
+lock-enabled=false
+#ini#
+
 [screenshot]
 last-save-directory='file://#-ini(resource.pictures)-#'
 
@@ -109,5 +133,5 @@ last-save-directory='file://#-ini(resource.pictures)-#'
 screensaver='Scroll_Lock'
 
 [stickynotes]
-default-font='Droid Sans 10'
+default-font='Droid Sans #-ini(profile.font-size)-#'
 

profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/panel

@@ -1,28 +1,69 @@
 # Calculate format=dconf dconf=/org/mate/panel
 [general]
-toplevel-id-list=['toplevel_top', 'toplevel_bottom']
+toplevel-id-list=['toplevel_main', 'toplevel_menu']
 object-id-list=['object_menu', 'object_home', 'object_workspace', 'object_showdesktop', 'object_windowlist', 'object_trash', 'object_notification', 'object_clock', 'object_lock', 'object_shutdown', 'object_browser', 'object_mail', 'object_chat', 'object_im', 'object_writer', 'object_calc', 'object_calculator', 'object_imageedit', 'object_imageview', 'object_audioplayer', 'object_videoplayer', 'object_textedit', 'object_terminal', 'object_separator_1', 'object_separator_2', 'object_separator_3'#?env(client.os_remote_auth)!=&&ur_domain_set==on#, 'object_share', 'object_ftp'#env#]
 
-[toplevels/toplevel_top]
+[toplevels/toplevel_main]
+#?ini(profile.wm-panel-main-autohide)==on#
+auto-hide=true
+#!ini#
+auto-hide=false
+#ini#
+#?ini(profile.wm-panel-main-position)==top#
 orientation='top'
-size=32
+x-centered=true
+y=0
+#ini#
+#?ini(profile.wm-panel-main-position)==bottom#
+orientation='bottom'
+x-centered=true
+y-bottom=0
+#ini#
+#?ini(profile.wm-panel-main-position)==left#
+orientation='left'
+y-centered=true
+#ini#
+#?ini(profile.wm-panel-main-position)==right#
+orientation='right'
+y-centered=true
+#ini#
+size=#-ini(profile.wm-panel-main-size)-#
 screen=0
 monitor=0
 
-[toplevels/toplevel_bottom]
-y-bottom=0
-orientation='bottom'
+[toplevels/toplevel_menu]
+#?ini(profile.wm-panel-menu-autohide)==on#
 auto-hide=true
+#!ini#
+auto-hide=false
+#ini#
+#?ini(profile.wm-panel-menu-position)==bottom#
+orientation='bottom'
+x-centered=true
+y-bottom=0
+#ini#
+#?ini(profile.wm-panel-menu-position)==top#
+orientation='top'
+x-centered=true
+y=0
+#ini#
+#?ini(profile.wm-panel-menu-position)==left#
+orientation='left'
+y-centered=true
+#ini#
+#?ini(profile.wm-panel-menu-position)==right#
+orientation='right'
+y-centered=true
+x-right=0
+#ini#
 enable-buttons=false
 expand=false
-size=56
+size=#-ini(profile.wm-panel-menu-size)-#
 screen=0
 monitor=0
-x-right=0
-x-centered=true
 
 [objects/object_menu]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,0)-#
 object-type='menu'
 use-menu-path=false
@@ -66,7 +107,7 @@ tooltip='головне меню'
 #os_locale_lang#
 
 [objects/object_separator_1]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='separator'
 locked=true
@@ -74,7 +115,7 @@ panel-right-stick=false
 
 [objects/object_home]
 launcher-location='launcher-home.desktop'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -83,7 +124,7 @@ panel-right-stick=false
 #?env(client.os_remote_auth)!=&&ur_domain_set==on#
 [objects/object_share]
 launcher-location='launcher-share.desktop'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -91,7 +132,7 @@ panel-right-stick=false
 
 [objects/object_ftp]
 launcher-location='launcher-ftp.desktop'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -100,7 +141,7 @@ panel-right-stick=false
 
 [objects/object_workspace]
 applet-iid='WnckletFactory::WorkspaceSwitcherApplet'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='applet'
 locked=true
@@ -108,7 +149,7 @@ panel-right-stick=false
 
 [objects/object_showdesktop]
 applet-iid='WnckletFactory::ShowDesktopApplet'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='applet'
 locked=true
@@ -116,7 +157,7 @@ panel-right-stick=false
 
 [objects/object_windowlist]
 applet-iid='WnckletFactory::WindowListApplet'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='applet'
 locked=true
@@ -124,7 +165,7 @@ panel-right-stick=false
 
 [objects/object_trash]
 applet-iid='TrashAppletFactory::TrashApplet'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,10000)-#
 object-type='applet'
 locked=true
@@ -132,14 +173,14 @@ panel-right-stick=false
 
 [objects/object_notification]
 applet-iid='NotificationAreaAppletFactory::NotificationArea'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='applet'
 locked=true
 panel-right-stick=false
 
 [objects/object_separator_2]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='separator'
 locked=true
@@ -147,7 +188,7 @@ panel-right-stick=false
 
 [objects/object_clock]
 applet-iid='ClockAppletFactory::ClockApplet'
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='applet'
 locked=true
@@ -159,14 +200,14 @@ show-date=false
 custom-format=''
 
 [objects/object_separator_3]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 position=#-sum(pos,pos+1)-#
 object-type='separator'
 locked=true
 panel-right-stick=false
 
 [objects/object_lock]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 action-type='lock'
 position=#-sum(pos,pos+1)-#
 object-type='action'
@@ -174,7 +215,7 @@ locked=true
 panel-right-stick=false
 
 [objects/object_shutdown]
-toplevel-id='toplevel_top'
+toplevel-id='toplevel_main'
 action-type='shutdown'
 position=#-sum(pos,pos+1)-#
 object-type='action'
@@ -183,7 +224,7 @@ panel-right-stick=false
 
 [objects/object_browser]
 launcher-location='calculate-browser.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,0)-#
 object-type='launcher'
 locked=true
@@ -191,7 +232,7 @@ panel-right-stick=false
 
 [objects/object_mail]
 launcher-location='calculate-mail.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -199,7 +240,7 @@ panel-right-stick=false
 
 [objects/object_chat]
 launcher-location='calculate-chat.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -207,7 +248,7 @@ panel-right-stick=false
 
 [objects/object_im]
 launcher-location='calculate-im.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -215,7 +256,7 @@ panel-right-stick=false
 
 [objects/object_writer]
 launcher-location='calculate-writer.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -223,7 +264,7 @@ panel-right-stick=false
 
 [objects/object_calc]
 launcher-location='calculate-calc.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -231,7 +272,7 @@ panel-right-stick=false
 
 [objects/object_calculator]
 launcher-location='mate-calc.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -239,7 +280,7 @@ panel-right-stick=false
 
 [objects/object_imageedit]
 launcher-location='calculate-imageedit.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -247,7 +288,7 @@ panel-right-stick=false
 
 [objects/object_imageview]
 launcher-location='calculate-imageview.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -255,7 +296,7 @@ panel-right-stick=false
 
 [objects/object_audioplayer]
 launcher-location='calculate-audioplayer.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -263,7 +304,7 @@ panel-right-stick=false
 
 [objects/object_videoplayer]
 launcher-location='calculate-videoplayer.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -271,7 +312,7 @@ panel-right-stick=false
 
 [objects/object_textedit]
 launcher-location='calculate-textedit.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true
@@ -279,7 +320,7 @@ panel-right-stick=false
 
 [objects/object_terminal]
 launcher-location='mate-terminal.desktop'
-toplevel-id='toplevel_bottom'
+toplevel-id='toplevel_menu'
 position=#-sum(pos,pos+1)-#
 object-type='launcher'
 locked=true

profiles/templates/3.5/6_ac_desktop_profile/2-user/mate-base/MATE-1.8/pluma

@@ -2,8 +2,8 @@
 
 #?pkg(media-fonts/droid)!=#
 [/]
-editor-font='Droid Sans Mono Slashed 10'
+editor-font='Droid Sans Mono Slashed #-ini(profile.font-size)-#'
 print-font-body-pango='Droid Sans Mono Slashed 9'
-print-font-header-pango='Droid Sans 10'
+print-font-header-pango='Droid Sans #-ini(profile.font-size)-#'
 print-font-numbers-pango='Droid Sans 8'
 #pkg#

profiles/templates/3.5/6_ac_update_sync/world/grp/emulation

@@ -17,6 +17,7 @@ app-emulation/wine
 app-emulation/winetricks
 app-emulation/xen-tools
 games-emulation/dosbox
+games-emulation/hatari
 games-emulation/mednafen
 games-server/mednafen-server
 sci-visualization/qtiplot