Merge branch 'testing'

6 files changed, 37 insertions, 47 deletions

diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD
index c6cd7a9..0c32c32 100644
--- a/abs/core/e16_theme_settings/PKGBUILD
+++ b/abs/core/e16_theme_settings/PKGBUILD
@@ -1,19 +1,19 @@
 pkgname=e16_theme_settings
-pkgver=8.1
-pkgrel=2
+pkgver=8.4
+pkgrel=3
 pkgdesc="Default settings for e16"
-depends=('enlightenment')
+depends=('enlightenment' 'ttf-overlock')
 source=()
 arch=('i686' 'x86_64')
 groups=(alt_wm)
 install=e16.install
 configdir=/usr/share/wm_data
-backup=('usr/share/wm_data/e16_config_dir/e_config--0.0.cfg')
 package() {
-	echo $startdir
-	mkdir -p $pkgdir/$configdir
-        rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir
-  	echo "all done"
+    echo $startdir
+    mkdir -p $pkgdir/$configdir
+    rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir
+    chmod -R 777 $pkgdir/$configdir/*
+    echo "all done"
 }
 
 md5sums=()
diff --git a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.cfg b/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.cfg
index 5031dba..1d3d66a 100644
--- a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.cfg
+++ b/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.cfg
@@ -28,7 +28,7 @@ desktops.slidespeed = 500
 desktops.areas_nx = 2
 desktops.areas_ny = 1
 desktops.areas_wraparound = 0
-desktops.edge_flip_mode = 1
+desktops.edge_flip_mode = 0
 desktops.edge_flip_resistance = 25
 effects.ripples.enabled = 0
 effects.waves.enabled = 0
@@ -77,6 +77,8 @@ misc.dock.dirmode = 3
 misc.dock.startx = 0
 misc.dock.starty = 0
 misc.hints.set_xroot_info_on_root_window = 0
+misc.log.difftime = 0
+misc.log.dest = 0
 misc.magwin.zoom_res = 4
 misc.movres.mode_move = 0
 misc.movres.mode_resize = 2
@@ -133,7 +135,6 @@ misc.testing.no_sync_mask = 0
 misc.autosave = 1
 misc.memory_paranoia = 1
 misc.save_under = 0
-misc.difftime = 0
 pagers.enable = 0
 pagers.zoom = 1
 pagers.title = 1
@@ -151,17 +152,6 @@ theme.font_cfg =
 tooltips.enable = 0
 tooltips.showroottooltip = 0
 tooltips.delay = 1500
-transparency.alpha = 0
-transparency.menu = 1
-transparency.menu_item = 1
-transparency.tooltip = 2
-transparency.widget = 1
-transparency.hilight = 0
-transparency.border = 1
-transparency.iconbox = 1
-transparency.dialog = 1
-transparency.pager = 1
-transparency.warplist = 1
 warplist.enable = 1
 warplist.showsticky = 1
 warplist.showshaded = 1
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
index 7d5bebc..d57f452 100644
--- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg
@@ -5,17 +5,16 @@ __E_CFG_VERSION 1
    $Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */
 
 __FONTS __BGN
-  font-border "VeraBd/18"
-  font-coords "VeraBd/17"
-  font-dialog "Vera/18"
-  font-dialog-hilite "VeraBd/18"
-  font-epplet "Vera/16"
-  font-epplet-large "Vera/20"
-  font-epplet-medium "Vera/18"
-  font-epplet-small "Vera/16"
-  font-focus "VeraBd/18"
-  font-init "VeraBd/19"
-  font-menu "Vera/18"
-  font-tooltip "Vera/17"
+  font-border "Overlock-Bold/16"
+  font-coords "Overlock-Bold/17"
+  font-dialog "Overlock-Regular/18"
+  font-dialog-hilite "Overlock-Bold/18"
+  font-epplet "Overlock-Regular/16"
+  font-epplet-large "Overlock-Regular/20"
+  font-epplet-medium "Overlock-Regular/18"
+  font-epplet-small "Overlock-Regular/16"
+  font-focus "Overlock-Bold/18"
+  font-init "Overlock-Bold/19"
+  font-menu "Overlock-Regular/16"
+  font-tooltip "Overlock-Regular/17"
 __END
-
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
index 7d5bebc..d57f452 100644
--- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg
@@ -5,17 +5,16 @@ __E_CFG_VERSION 1
    $Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */
 
 __FONTS __BGN
-  font-border "VeraBd/18"
-  font-coords "VeraBd/17"
-  font-dialog "Vera/18"
-  font-dialog-hilite "VeraBd/18"
-  font-epplet "Vera/16"
-  font-epplet-large "Vera/20"
-  font-epplet-medium "Vera/18"
-  font-epplet-small "Vera/16"
-  font-focus "VeraBd/18"
-  font-init "VeraBd/19"
-  font-menu "Vera/18"
-  font-tooltip "Vera/17"
+  font-border "Overlock-Bold/16"
+  font-coords "Overlock-Bold/17"
+  font-dialog "Overlock-Regular/18"
+  font-dialog-hilite "Overlock-Bold/18"
+  font-epplet "Overlock-Regular/16"
+  font-epplet-large "Overlock-Regular/20"
+  font-epplet-medium "Overlock-Regular/18"
+  font-epplet-small "Overlock-Regular/16"
+  font-focus "Overlock-Bold/18"
+  font-init "Overlock-Bold/19"
+  font-menu "Overlock-Regular/16"
+  font-tooltip "Overlock-Regular/17"
 __END
-
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf
new file mode 120000
index 0000000..ede4578
--- /dev/null
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf
@@ -0,0 +1 @@
+../../../../../fonts/TTF/Overlock-Bold.ttf
\ No newline at end of file
diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf
new file mode 120000
index 0000000..6e45825
--- /dev/null
+++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf
@@ -0,0 +1 @@
+../../../../../fonts/TTF/Overlock-Regular.ttf
\ No newline at end of file