Move most of config categorization into root config, and consolated core vs noncore from a config perspective, as its confusing and unnecessary for users. Also cleaned up a bit, and added some basic descriptions.

15 files changed, 13 insertions, 20 deletions

diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in
index 5c3b591..611ba50 100644
--- a/core/applets/batteryapplet/config.in
+++ b/core/applets/batteryapplet/config.in
@@ -1,4 +1,4 @@
   config BATTERYAPPLET
-    boolean "batteryapplet"
+    boolean "Battery (Applet to monitor battery status)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TARGET_SHARP
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in
index 328b2e1..89cfc22 100644
--- a/core/applets/cardmon/config.in
+++ b/core/applets/cardmon/config.in
@@ -1,4 +1,4 @@
   config CARDMON
-    boolean "cardmon"
+    boolean "Cardmon (monitor cf/sd/mmc card status, and eject function)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in
index 0b69fe0..44132c7 100644
--- a/core/applets/clipboardapplet/config.in
+++ b/core/applets/clipboardapplet/config.in
@@ -1,4 +1,4 @@
   config CLIPBOARDAPPLET
-    boolean "clipboardapplet"
+    boolean "Clipboard (copy/cut/paste applet)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 3ca12fe..b810afe 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
   config CLOCKAPPLET
-    boolean "clockapplet"
+    boolean "Clock (Digital clock applet)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in
index feb8097..1828da0 100644
--- a/core/applets/homeapplet/config.in
+++ b/core/applets/homeapplet/config.in
@@ -1,4 +1,4 @@
   config HOMEAPPLET
-    boolean "homeapplet"
+    boolean "Home"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in
index 0b2fc51..5f90c65 100644
--- a/core/applets/irdaapplet/config.in
+++ b/core/applets/irdaapplet/config.in
@@ -1,4 +1,4 @@
   config IRDAAPPLET
-    boolean "irdaapplet"
+    boolean "Irda (applet for IR beaming/discovery)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in
index 3dc0408..385b02f 100644
--- a/core/applets/logoutapplet/config.in
+++ b/core/applets/logoutapplet/config.in
@@ -1,4 +1,4 @@
   config LOGOUTAPPLET
-    boolean "logoutapplet"
+    boolean "Logout"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/obex/config.in b/core/applets/obex/config.in
index 33771db..4d1f43d 100644
--- a/core/applets/obex/config.in
+++ b/core/applets/obex/config.in
@@ -1,4 +1,4 @@
   config OBEX
-    boolean "obex"
+    boolean "Obex library (library needed for beaming in Opie)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in
index 0fa991d..79ec658 100644
--- a/core/applets/restartapplet/config.in
+++ b/core/applets/restartapplet/config.in
@@ -1,4 +1,4 @@
   config RESTARTAPPLET
-    boolean "restartapplet"
+    boolean "Restart"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in
index 94e2b84..f65c7f5 100644
--- a/core/applets/screenshotapplet/config.in
+++ b/core/applets/screenshotapplet/config.in
@@ -1,4 +1,4 @@
   config SCREENSHOTAPPLET
-    boolean "screenshotapplet"
+    boolean "Screenshot"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in
index 4d3c42d..fdbe8b3 100644
--- a/core/applets/suspendapplet/config.in
+++ b/core/applets/suspendapplet/config.in
@@ -1,4 +1,4 @@
   config SUSPENDAPPLET
-    boolean "suspendapplet"
+    boolean "Suspend"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in
index bcf02f2..b9a92db 100644
--- a/core/applets/vmemo/config.in
+++ b/core/applets/vmemo/config.in
@@ -1,4 +1,4 @@
   config VMEMO
-    boolean "vmemo"
+    boolean "Vmemo (take voice memos)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in
index f65faeb..6033422 100644
--- a/core/applets/volumeapplet/config.in
+++ b/core/applets/volumeapplet/config.in
@@ -1,4 +1,4 @@
   config VOLUMEAPPLET
-    boolean "volumeapplet"
+    boolean "Volume"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/config.in.in b/core/config.in.in
deleted file mode 100644
index 6689eaf..0000000
--- a/core/config.in.in
+++ b/dev/null
@@ -1,3 +0,0 @@
-menu "Core"
-@sources@
-endmenu
diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index 6bcdbe2..2cb97db 100644
--- a/core/pim/today/config.in
+++ b/core/pim/today/config.in
@@ -1,8 +1,4 @@
-menu "today"
-
   config TODAY
     boolean "today"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
-  source core/pim/today/plugins/config.in
-endmenu