diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
| commit | 2648e999d277eac5c3d331a3609bcc73fafbea71 (patch) | |
| tree | 40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/core/e16_theme_settings | |
| parent | c759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff) | |
| parent | 7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff) | |
| download | linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2 | |
Merge branch 'testing'
# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish
Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables.
xf86-video-ati: xorg ati driver.
LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE.
LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop.
e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902
zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to
linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink
runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900
iguanair: rebuild with python 2.7
LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
linhes-udev-rules: add rules for mce,streamzap,serial lirc devices.
mythinstall: recompile for matching libs
mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager
linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV
linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
...
Diffstat (limited to 'abs/core/e16_theme_settings')
| -rw-r--r-- | abs/core/e16_theme_settings/PKGBUILD | 9 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16.install | 15 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.bg | 46 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.cfg | 2 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.snapshots | 13 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-mv-bg-0.png | bin | 0 -> 497904 bytes | |||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-wallpaper.png | bin | 107688 -> 0 bytes | |||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/themes/Summer/desktops.cfg | 14 | ||||
| -rw-r--r-- | abs/core/e16_theme_settings/e16_config_dir/themes/Summer/graphics/startup-overlay.png | bin | 120009 -> 102891 bytes |
9 files changed, 25 insertions, 74 deletions
diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD index 278c08a..4616e97 100644 --- a/abs/core/e16_theme_settings/PKGBUILD +++ b/abs/core/e16_theme_settings/PKGBUILD @@ -1,19 +1,18 @@ pkgname=e16_theme_settings pkgver=1.0 -pkgrel=9 +pkgrel=15 pkgdesc="Default settings for e16" depends=(enlightenment 'linhes-scripts>=7-24') source=() -arch=('i686') +arch=('i686' 'x86_64') groups=(alt_wm) install=e16.install -configdir=/data/ -backup=('data/e16_config_dir/e_config--0.0.cfg') +configdir=/usr/share/wm_data +backup=('usr/share/wm_data/e16_config_dir/e_config--0.0.cfg') build() { echo $startdir mkdir -p $pkgdir/$configdir rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir -# chown -R mythtv:mythtv $startdir/$configdir echo "all done" } diff --git a/abs/core/e16_theme_settings/e16.install b/abs/core/e16_theme_settings/e16.install index 9840e93..0cb1cb9 100644 --- a/abs/core/e16_theme_settings/e16.install +++ b/abs/core/e16_theme_settings/e16.install @@ -1,5 +1,6 @@ # This is a default template for a post-install scriptlet. You can # remove any functions you don't need (and this header). +configdir=/usr/share/wm_data/ # arg 1: the new package version pre_install() { @@ -9,11 +10,11 @@ pre_install() { # arg 1: the new package version post_install() { - chown -R 1000:100 /data/e16_config_dir - setfacl -d -R -m u:1000:rwx /data/e16_config_dir - setfacl -R -m u:1000:rwx /data/e16_config_dir - setfacl -d -R -m o::rwx /data/e16_config_dir - setfacl -R -m o::rwx /data/e16_config_dir + chown -R 1000:100 $configdir/e16_config_dir + setfacl -d -R -m u:1000:rwx $configdir/e16_config_dir + setfacl -R -m u:1000:rwx $configdir/e16_config_dir + setfacl -d -R -m o::rwx $configdir/e16_config_dir + setfacl -R -m o::rwx $configdir/e16_config_dir } @@ -26,9 +27,9 @@ pre_upgrade() { # arg 1: the new package version # arg 2: the old package version post_upgrade() { - if [ -e /data/e16_config_dir/cached ] + if [ -e $configdir/e16_config_dir/cached ] then - rm -rf /data/e16_config_dir/cached/* + rm -rf $configdir/e16_config_dir/cached/* fi post_install } diff --git a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.bg b/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.bg deleted file mode 100644 index c1c3337..0000000 --- a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.bg +++ /dev/null @@ -1,46 +0,0 @@ -5 999 -100 NONE -1000 -5 999 -100 DESKTOP_0 -565 /data/e16_config_dir//themes/Summer/artwork/backgrounds/lh-wallpaper.png -566 0 1 512 512 1024 1024 -564 0 -564 2 -564 4 -564 6 -564 8 -564 10 -564 12 -564 14 -564 16 -564 18 -564 20 -564 22 -564 24 -564 26 -564 28 -564 30 -1000 -5 999 -100 DESKTOP_1 -560 0 0 128 -567 /data/e16_config_dir//themes/Summer/graphics/header.png -568 1 512 1024 0 0 -564 1 -564 3 -564 5 -564 7 -564 9 -564 11 -564 13 -564 15 -564 17 -564 19 -564 21 -564 23 -564 25 -564 27 -564 29 -564 31 -1000 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 f424388..5031dba 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 @@ -102,7 +102,7 @@ misc.place.ignore_struts = 0 misc.place.ignore_struts_fullscreen = 0 misc.place.ignore_struts_maximize = 0 misc.place.raise_fullscreen = 0 -misc.place.slidein = 1 +misc.place.slidein = 0 misc.place.cleanupslide = 1 misc.place.slidemode = 0 misc.place.slidespeedmap = 1500 diff --git a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.snapshots b/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.snapshots index 25a89e0..e3ef04e 100644 --- a/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.snapshots +++ b/abs/core/e16_theme_settings/e16_config_dir/e_config--0.0.snapshots @@ -4,9 +4,9 @@ CLASS: Enlightenment_IconBox AUTO: yes BORDER: ICONBOX DESKTOP: 0 -RES: 2560 1600 +RES: 1280 768 WH: 128 68 -XY: 2424 1483 0 0 +XY: 1148 677 0 0 LAYER: 4 STICKY: 1 SHADE: 0 @@ -21,9 +21,9 @@ CLASS: Enlightenment_Pager AUTO: yes BORDER: PAGER DESKTOP: 0 -RES: 2560 1600 +RES: 1280 768 WH: 128 48 -XY: 0 1360 0 0 +XY: 0 630 0 0 LAYER: 4 STICKY: 1 SHADE: 0 @@ -38,9 +38,9 @@ CLASS: Enlightenment_Pager AUTO: yes BORDER: PAGER DESKTOP: 0 -RES: 2560 1600 +RES: 1280 768 WH: 128 48 -XY: 0 1523 0 0 +XY: 0 706 0 0 LAYER: 4 STICKY: 1 SHADE: 0 @@ -50,7 +50,6 @@ SKIPFOCUS: 1 FLAGS: 0x10000000 0 NEW: mythfrontend.Mythfrontend -WIN: 0xe00003 TITLE: MythTV Frontend NAME: mythfrontend CLASS: Mythfrontend diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-mv-bg-0.png b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-mv-bg-0.png Binary files differnew file mode 100644 index 0000000..8e41368 --- /dev/null +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-mv-bg-0.png diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-wallpaper.png b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-wallpaper.png Binary files differdeleted file mode 100644 index bd9590c..0000000 --- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/artwork/backgrounds/lh-wallpaper.png +++ /dev/null diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/desktops.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/desktops.cfg index cd0e702..4a1d46b 100644 --- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/desktops.cfg +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/desktops.cfg @@ -5,7 +5,9 @@ __E_CFG_VERSION 1 $Id: desktops.cfg 46 2009-04-13 05:25:03Z don $ */ BEGIN_BACKGROUND("DESKTOP_0") - ADD_BACKGROUND_SCALED_RETAIN_ASPECT("artwork/backgrounds/lh-wallpaper.png") + // ADD_BACKGROUND_SCALED_RETAIN_ASPECT("artwork/backgrounds/lh-wallpaper.png") + ADD_BACKGROUND_SCALED("artwork/backgrounds/lh-mv-bg-0.png") + ADD_OVERLAY_IMAGE_BOTTOM_MIDDLE("graphics/startup-overlay.png") ON_DESKTOP("0") ON_DESKTOP("2") ON_DESKTOP("4") @@ -26,12 +28,9 @@ END_BACKGROUND BEGIN_BACKGROUND("DESKTOP_1") //ADD_BACKGROUND_SCALED("artwork/backgrounds/back-summer02.png") - //SET_SOLID("10 114 188") -// SET_SOLID("72 61 139") - SET_SOLID("0 0 128") - //SET_SOLID("65 105 225") - //ADD_OVERLAY_IMAGE_CENTERED(graphics/header.png) - ADD_OVERLAY_IMAGE_BOTTOM_MIDDLE(graphics/header.png) + //SET_SOLID("10 10 155") + ADD_BACKGROUND_SCALED("artwork/backgrounds/lh-mv-bg-0.png") +// ADD_OVERLAY_IMAGE_BOTTOM_MIDDLE(graphics/header.png) ON_DESKTOP("1") ON_DESKTOP("3") ON_DESKTOP("5") @@ -49,4 +48,3 @@ BEGIN_BACKGROUND("DESKTOP_1") ON_DESKTOP("29") ON_DESKTOP("31") END_BACKGROUND - diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/graphics/startup-overlay.png b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/graphics/startup-overlay.png Binary files differindex 480edf0..129feec 100644 --- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/graphics/startup-overlay.png +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/graphics/startup-overlay.png |
