diff --git a/bin/arch b/bin/arch
index 8d93dfa1..890ed900 100755
--- a/bin/arch
+++ b/bin/arch
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="arch"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
printf "%s " $(uname -m)
diff --git a/bin/battery b/bin/battery
index 40fa7f24..49f2982b 100755
--- a/bin/battery
+++ b/bin/battery
@@ -19,10 +19,6 @@
# along with this program. If not, see .
#
-# Default is "off"
-p="battery"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
search () {
local str expr
str="$1"
diff --git a/bin/cpu-count b/bin/cpu-count
index 79de39cf..4f9a8317 100755
--- a/bin/cpu-count
+++ b/bin/cpu-count
@@ -17,9 +17,5 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "on"
-p="cpu-count"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
count=`grep -c "^processor.*:" /proc/cpuinfo`
[ "$count" = "1" ] || echo $count"x"
diff --git a/bin/cpu-freq b/bin/cpu-freq
index c481ddd6..089898ae 100755
--- a/bin/cpu-freq
+++ b/bin/cpu-freq
@@ -17,10 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "on"
-p="cpu-freq"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
mhz=`grep -m 1 "^cpu MHz" /proc/cpuinfo | awk -F"[:.]" '{print $2}'` || mhz=`grep -m 1 "^clock" /proc/cpuinfo | awk -F"[:.]" '{print $2}'`
if [ $mhz -ge 1000 ]; then
diff --git a/bin/hostname b/bin/hostname
index 4111a196..e1ccfd36 100755
--- a/bin/hostname
+++ b/bin/hostname
@@ -17,9 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="hostname"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
at=
grep -qs "^whoami=1$" "$HOME/.screen-profiles/status" && at="@"
diff --git a/bin/load-average b/bin/load-average
index fb9176b7..b0e49fe8 100755
--- a/bin/load-average
+++ b/bin/load-average
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "on"
-p="load-average"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
printf "\005{= Yk}%s\005{-} " $(cat /proc/loadavg | cut -d " " -f -1)
diff --git a/bin/logo b/bin/logo
index 476591c2..9f1e64ea 100755
--- a/bin/logo
+++ b/bin/logo
@@ -17,10 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="logo"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
if [ -r "$HOME/.screen-profiles/logo" ]; then
# Allow users to define their own logo
cat "$HOME/.screen-profiles/logo"
diff --git a/bin/mem-available b/bin/mem-available
index c0344e3e..9a2b29fe 100755
--- a/bin/mem-available
+++ b/bin/mem-available
@@ -17,9 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="mem-available"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
comma=
whitespace=
grep -qs "^mem-used=1$" "$HOME/.screen-profiles/status" && comma="," || whitespace=" "
diff --git a/bin/mem-used b/bin/mem-used
index fcb10d02..5d1a6174 100755
--- a/bin/mem-used
+++ b/bin/mem-used
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="mem-used"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
free | awk '/buffers\/cache:/ {printf "\005{=b gW}%.0f\005{-}\005{= gW}%%\005{-} ", 100*$3/($3 + $4)}'
diff --git a/bin/menu b/bin/menu
index 9af5f173..a46c6315 100755
--- a/bin/menu
+++ b/bin/menu
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "on"
-p="menu"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
printf " \005{= kw}%s" `gettext "Menu:"`
diff --git a/bin/network-down b/bin/network-down
index 6b470c65..ac2ea77b 100755
--- a/bin/network-down
+++ b/bin/network-down
@@ -17,11 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="network-down"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
-cache="$HOME/.screen-profiles/$p"
+cache="$HOME/.screen-profiles/network-down"
interface=`route -n | tail -n 1 | sed "s/^.* //"`
unit="kB/s"
diff --git a/bin/network-up b/bin/network-up
index b79a51f6..ba9baec5 100755
--- a/bin/network-up
+++ b/bin/network-up
@@ -17,11 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="network-up"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
-cache="$HOME/.screen-profiles/$p"
+cache="$HOME/.screen-profiles/network-up"
interface=`route -n | tail -n 1 | sed "s/^.* //"`
unit="kB/s"
diff --git a/bin/processes b/bin/processes
index 0a0b5107..575a8b5b 100755
--- a/bin/processes
+++ b/bin/processes
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="processes"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
printf "\005{=b yk}%s\005{-}\005{= yk}&\005{-} " $(ps -e | wc -l)
diff --git a/bin/reboot-required b/bin/reboot-required
index 2a9909e7..9a57b37a 100755
--- a/bin/reboot-required
+++ b/bin/reboot-required
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="reboot-required"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
[ -e /var/run/reboot-required ] && printf "\005{=b bW}(@)\005{-} "
diff --git a/bin/release b/bin/release
index 826306ce..1c1448c2 100755
--- a/bin/release
+++ b/bin/release
@@ -17,10 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="release"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
if which lsb_release >/dev/null; then
# If lsb_release is available, use it
if lsb_release -s -d | grep -qs "^Ubuntu .*\..*\..*$"; then
diff --git a/bin/updates-available b/bin/updates-available
index 97b1075e..bcf91d94 100755
--- a/bin/updates-available
+++ b/bin/updates-available
@@ -17,10 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is on
-p="updates-available"
-grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0
-
# expire the cache in X seconds; 1 hour by default
EXPIRATION=3600
diff --git a/bin/uptime b/bin/uptime
index 2849b3d6..ae7f955a 100755
--- a/bin/uptime
+++ b/bin/uptime
@@ -20,10 +20,6 @@
# along with this program. If not, see .
#
-# Default is "off"
-p="uptime"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
u=$(sed "s/\..*$//" /proc/uptime)
printf "\005{= b}"
if [ "$u" -gt 86400 ]; then
diff --git a/bin/users b/bin/users
index fc8fdaf3..e04b52ba 100755
--- a/bin/users
+++ b/bin/users
@@ -20,8 +20,4 @@
# along with this program. If not, see .
#
-# Default is "off"
-p="users"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
printf "\005{= r}%d#\005{-} " `who | wc -l`
diff --git a/bin/whoami b/bin/whoami
index 13d78a17..fcea5d9d 100755
--- a/bin/whoami
+++ b/bin/whoami
@@ -17,8 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="whoami"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
printf "\005{= }%s\005{-}" $(whoami)
diff --git a/bin/wifi-quality b/bin/wifi-quality
index 5cb13a5f..dca2131d 100755
--- a/bin/wifi-quality
+++ b/bin/wifi-quality
@@ -17,10 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Default is "off"
-p="wifi-quality"
-grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0
-
interface=`route -n | tail -n 1 | sed "s/^.* //"`
bitrate=`iwconfig "$interface" 2>/dev/null | grep "Bit Rate=" | sed "s/^.*Bit Rate=//" | sed "s/ .*$//g"`
[ -z "$bitrate" ] && bitrate="0"
diff --git a/po/es.po b/po/es.po
index 773f2b0b..f5a675ea 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the GNU Screen Profiles package.
# Nicolas Valcarcel , 2008.
#
-#: screen-profiles:303
+#: screen-profiles:304
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 13:50-0700\n"
+"POT-Creation-Date: 2009-04-07 07:50-0700\n"
"PO-Revision-Date: 2008-12-22 01:01-0500\n"
"Last-Translator: Nicolas Valcarcel \n"
"Language-Team: LANGUAGE \n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: screen-profiles:87 screen-profiles:469
+#: screen-profiles:87 screen-profiles:470
msgid " Screen Profiles Configuration Menu"
msgstr ""
@@ -66,14 +66,14 @@ msgid "Okay"
msgstr ""
#: screen-profiles:98 screen-profiles:134 screen-profiles:150
-#: screen-profiles:185 screen-profiles:310 screen-profiles:352
-#: screen-profiles:430
+#: screen-profiles:185 screen-profiles:311 screen-profiles:353
+#: screen-profiles:431
msgid "Cancel"
msgstr ""
#: screen-profiles:116 screen-profiles:143 screen-profiles:157
-#: screen-profiles:323 screen-profiles:377 screen-profiles:385
-#: screen-profiles:458
+#: screen-profiles:324 screen-profiles:378 screen-profiles:386
+#: screen-profiles:459
msgid "Menu"
msgstr ""
@@ -82,7 +82,7 @@ msgid "Screen Profiles Help"
msgstr ""
#: screen-profiles:134 screen-profiles:150 screen-profiles:185
-#: screen-profiles:310 screen-profiles:352 screen-profiles:430
+#: screen-profiles:311 screen-profiles:353 screen-profiles:431
msgid "Apply"
msgstr ""
@@ -90,8 +90,8 @@ msgstr ""
msgid "Which profile would you like to use?"
msgstr ""
-#: screen-profiles:142 screen-profiles:156 screen-profiles:322
-#: screen-profiles:384 screen-profiles:456
+#: screen-profiles:142 screen-profiles:156 screen-profiles:323
+#: screen-profiles:385 screen-profiles:457
msgid "Message"
msgstr ""
@@ -119,35 +119,35 @@ msgstr ""
msgid "Create new window(s):"
msgstr ""
-#: screen-profiles:311
+#: screen-profiles:312
msgid "Toggle status notifications:"
msgstr ""
-#: screen-profiles:344
+#: screen-profiles:345
msgid "Windows:"
msgstr ""
-#: screen-profiles:354
+#: screen-profiles:355
msgid "Select window(s) to create by default:"
msgstr ""
-#: screen-profiles:374
+#: screen-profiles:375
msgid "Screen will be launched automatically next time you login."
msgstr ""
-#: screen-profiles:382
+#: screen-profiles:383
msgid "Screen will not be used next time you login."
msgstr ""
-#: screen-profiles:429
+#: screen-profiles:430
msgid "Escape key: ctrl-"
msgstr ""
-#: screen-profiles:432
+#: screen-profiles:433
msgid "Change escape sequence:"
msgstr ""
-#: screen-profiles:470
+#: screen-profiles:471
msgid "/ between elements | Validates"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 907a1eb7..464f6de6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the GNU Screen Profiles package.
# Nicolas Barcet , 2008.
#
-#: screen-profiles:303
+#: screen-profiles:304
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 13:50-0700\n"
+"POT-Creation-Date: 2009-04-07 07:50-0700\n"
"PO-Revision-Date: 2008-12-17 23:42+0100\n"
"Last-Translator: Nicolas Barcet \n"
"Language-Team: LANGUAGE \n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: screen-profiles:87 screen-profiles:469
+#: screen-profiles:87 screen-profiles:470
msgid " Screen Profiles Configuration Menu"
msgstr ""
@@ -66,14 +66,14 @@ msgid "Okay"
msgstr ""
#: screen-profiles:98 screen-profiles:134 screen-profiles:150
-#: screen-profiles:185 screen-profiles:310 screen-profiles:352
-#: screen-profiles:430
+#: screen-profiles:185 screen-profiles:311 screen-profiles:353
+#: screen-profiles:431
msgid "Cancel"
msgstr ""
#: screen-profiles:116 screen-profiles:143 screen-profiles:157
-#: screen-profiles:323 screen-profiles:377 screen-profiles:385
-#: screen-profiles:458
+#: screen-profiles:324 screen-profiles:378 screen-profiles:386
+#: screen-profiles:459
msgid "Menu"
msgstr ""
@@ -82,7 +82,7 @@ msgid "Screen Profiles Help"
msgstr ""
#: screen-profiles:134 screen-profiles:150 screen-profiles:185
-#: screen-profiles:310 screen-profiles:352 screen-profiles:430
+#: screen-profiles:311 screen-profiles:353 screen-profiles:431
msgid "Apply"
msgstr ""
@@ -90,8 +90,8 @@ msgstr ""
msgid "Which profile would you like to use?"
msgstr ""
-#: screen-profiles:142 screen-profiles:156 screen-profiles:322
-#: screen-profiles:384 screen-profiles:456
+#: screen-profiles:142 screen-profiles:156 screen-profiles:323
+#: screen-profiles:385 screen-profiles:457
msgid "Message"
msgstr ""
@@ -119,35 +119,35 @@ msgstr ""
msgid "Create new window(s):"
msgstr ""
-#: screen-profiles:311
+#: screen-profiles:312
msgid "Toggle status notifications:"
msgstr ""
-#: screen-profiles:344
+#: screen-profiles:345
msgid "Windows:"
msgstr ""
-#: screen-profiles:354
+#: screen-profiles:355
msgid "Select window(s) to create by default:"
msgstr ""
-#: screen-profiles:374
+#: screen-profiles:375
msgid "Screen will be launched automatically next time you login."
msgstr ""
-#: screen-profiles:382
+#: screen-profiles:383
msgid "Screen will not be used next time you login."
msgstr ""
-#: screen-profiles:429
+#: screen-profiles:430
msgid "Escape key: ctrl-"
msgstr ""
-#: screen-profiles:432
+#: screen-profiles:433
msgid "Change escape sequence:"
msgstr ""
-#: screen-profiles:470
+#: screen-profiles:471
msgid "/ between elements | Validates"
msgstr ""
diff --git a/po/screen-profiles.pot b/po/screen-profiles.pot
index f8524508..4e37fbc1 100644
--- a/po/screen-profiles.pot
+++ b/po/screen-profiles.pot
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
#
-#: screen-profiles:303
+#: screen-profiles:304
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 13:50-0700\n"
+"POT-Creation-Date: 2009-04-07 07:50-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: screen-profiles:87 screen-profiles:469
+#: screen-profiles:87 screen-profiles:470
msgid " Screen Profiles Configuration Menu"
msgstr ""
@@ -66,14 +66,14 @@ msgid "Okay"
msgstr ""
#: screen-profiles:98 screen-profiles:134 screen-profiles:150
-#: screen-profiles:185 screen-profiles:310 screen-profiles:352
-#: screen-profiles:430
+#: screen-profiles:185 screen-profiles:311 screen-profiles:353
+#: screen-profiles:431
msgid "Cancel"
msgstr ""
#: screen-profiles:116 screen-profiles:143 screen-profiles:157
-#: screen-profiles:323 screen-profiles:377 screen-profiles:385
-#: screen-profiles:458
+#: screen-profiles:324 screen-profiles:378 screen-profiles:386
+#: screen-profiles:459
msgid "Menu"
msgstr ""
@@ -82,7 +82,7 @@ msgid "Screen Profiles Help"
msgstr ""
#: screen-profiles:134 screen-profiles:150 screen-profiles:185
-#: screen-profiles:310 screen-profiles:352 screen-profiles:430
+#: screen-profiles:311 screen-profiles:353 screen-profiles:431
msgid "Apply"
msgstr ""
@@ -90,8 +90,8 @@ msgstr ""
msgid "Which profile would you like to use?"
msgstr ""
-#: screen-profiles:142 screen-profiles:156 screen-profiles:322
-#: screen-profiles:384 screen-profiles:456
+#: screen-profiles:142 screen-profiles:156 screen-profiles:323
+#: screen-profiles:385 screen-profiles:457
msgid "Message"
msgstr ""
@@ -119,34 +119,34 @@ msgstr ""
msgid "Create new window(s):"
msgstr ""
-#: screen-profiles:311
+#: screen-profiles:312
msgid "Toggle status notifications:"
msgstr ""
-#: screen-profiles:344
+#: screen-profiles:345
msgid "Windows:"
msgstr ""
-#: screen-profiles:354
+#: screen-profiles:355
msgid "Select window(s) to create by default:"
msgstr ""
-#: screen-profiles:374
+#: screen-profiles:375
msgid "Screen will be launched automatically next time you login."
msgstr ""
-#: screen-profiles:382
+#: screen-profiles:383
msgid "Screen will not be used next time you login."
msgstr ""
-#: screen-profiles:429
+#: screen-profiles:430
msgid "Escape key: ctrl-"
msgstr ""
-#: screen-profiles:432
+#: screen-profiles:433
msgid "Change escape sequence:"
msgstr ""
-#: screen-profiles:470
+#: screen-profiles:471
msgid "/ between elements | Validates"
msgstr ""
diff --git a/screen-profiles b/screen-profiles
index 4720c213..51c37974 100755
--- a/screen-profiles
+++ b/screen-profiles
@@ -257,15 +257,16 @@ def readstatus():
status["mem-available"]=1
status["mem-used"]=1
status["menu"]=1
- status["network-up"]=0
status["network-down"]=0
+ status["network-up"]=0
status["processes"]=0
status["reboot-required"]=1
status["release"]=1
- status["updates-available"]=1
status["users"]=0
+ status["updates-available"]=1
status["uptime"]=0
status["whoami"]=0
+ status["wifi-quality"]=0
if os.path.exists(HOME+'/.screen-profiles/status'):
f=open(HOME+'/.screen-profiles/status', 'r')
for line in f.readlines():