From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Sun, 23 Jan 2011 11:20:56 +0000 (+0100)
Subject: xfce4-conf.zip: Removed mail and messenger link from XFCE panel
X-Git-Tag: sz_beta3~199
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=b4530175c1aec3b429fcc7884d3833f6db0ade8f

xfce4-conf.zip: Removed mail and messenger link from XFCE panel
---

diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip b/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip
index 8232751..b38aa73 100644
Binary files a/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip and b/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip differ
diff --git a/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh b/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
index a30525d..593d44b 100755
--- a/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
+++ b/recipes/pandora-system/pandora-scripts/op_lcdsettings.sh
@@ -3,7 +3,7 @@
 # LCD-Settings, v1.0, written by Michael Mrozek aka EvilDragon 2010. Brightness-Settings-Part written by vimacs.
 # This scripts allows you to create, load and save Gamma-Settings and to change the LCD Brightness.
 
-while mainsel=$(zenity --title="LCD-Settings" --width="300" --height="200" --list --column "id" --column "Please select" --hide-column=1 --text="What do you want to do?" "bright" "Change LCD Brightness" "gamma" "Manage LCD Gamma" "filter" "Select current video filter"); do
+while mainsel=$(zenity --title="LCD-Settings" --width="300" --height="200" --list --column "id" --column "Please select" --hide-column=1 --text="What do you want to do?" "bright" "Change LCD Brightness" "gamma" "Manage LCD Gamma" "filter" "Select current video filter" "filterdef" "Select default video filter"); do
 
 case $mainsel in
 
@@ -79,5 +79,12 @@ case $mainsel in
       sudo /usr/pandora/scripts/op_videofir.sh $videofilter
       zenity --info --title="Videofilter applied" --text "The videofilter has been applied." --timeout 6
     fi;;
+    
+    "filterdef")
+    if selection=$(head -1 /etc/pandora/conf/dss_fir/* | sed 's:==> ::' | sed 's: <==::' | sed '/^$/d' | zenity --width=700 --height=200 --title="Videofilter" --hide-column=1 --list --column "filter" --column "Videofilter" --text "Please select a videofilter which will automatically be set on startup" ); then
+      videofilter=$(basename $selection)
+      echo $videofilter > /etc/pandora/conf/filter.state
+      zenity --info --title="Default Videofilter set" --text "The default video filter has been set." --timeout 6
+    fi;;
 esac
 done
\ No newline at end of file
diff --git a/recipes/pandora-system/pandora-scripts/op_videofir.sh b/recipes/pandora-system/pandora-scripts/op_videofir.sh
index 2461b0d..b63c6d7 100755
--- a/recipes/pandora-system/pandora-scripts/op_videofir.sh
+++ b/recipes/pandora-system/pandora-scripts/op_videofir.sh
@@ -16,6 +16,9 @@ fi
 apply_filter()
 {
 	file="${1}"
+	if [ ! -f "$file" ]; then
+	    file="${1}_up"
+	fi
 	if [ -f "$file" ]; then
 		# hardcode overlay for now.. We'll update this as needed
 		echo "writing fir:"
@@ -23,6 +26,8 @@ apply_filter()
 		sed -n 3,10p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_h"
 		sed -n 12,19p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_v3"
 		sed -n 21,28p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_v5"
+	else
+	    echo "No filter with that name"
 	fi
 }