author | kergoth <kergoth> | 2003-01-16 05:12:28 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-16 05:12:28 (UTC) |
commit | ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2 (patch) (unidiff) | |
tree | ca49caadf5e3629ec0be98a38ee1f47661977578 | |
parent | cc976ca7f032c892d3dadcaadf2225c8869a6612 (diff) | |
download | opie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.zip opie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.tar.gz opie-ec2be2b453c0cb5df6b1eabbcdc1e899562bf5c2.tar.bz2 |
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.
29 files changed, 95 insertions, 66 deletions
diff --git a/Makefile.test b/Makefile.test index 15cd128..8418158 100644 --- a/Makefile.test +++ b/Makefile.test | |||
@@ -10,3 +10,3 @@ noconfig_targets := xconfig menuconfig config oldconfig randconfig \ | |||
10 | 10 | ||
11 | configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in | 11 | configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in |
12 | 12 | ||
@@ -72,3 +72,3 @@ endmenu | |||
72 | 72 | ||
73 | menu "Libraries" | 73 | menu "Base" |
74 | choice | 74 | choice |
@@ -81,9 +81,55 @@ menu "Libraries" | |||
81 | source libopie/config.in | 81 | source libopie/config.in |
82 | source freetype/config.in | 82 | source core/opie-login/config.in |
83 | source core/opiealarm/config.in | ||
84 | source core/launcher/config.in | ||
83 | endmenu | 85 | endmenu |
84 | 86 | ||
85 | source inputmethods/config.in | 87 | comment "" |
86 | source core/config.in | 88 | |
87 | source noncore/config.in | 89 | menu "Applets" |
88 | source development/config.in | 90 | source core/applets/config.in |
89 | source quickexec/config.in | 91 | source noncore/applets/config.in |
92 | endmenu | ||
93 | menu "Apps" | ||
94 | source core/apps/config.in | ||
95 | source noncore/apps/config.in | ||
96 | endmenu | ||
97 | menu "Communications and Networking" | ||
98 | source noncore/comm/config.in | ||
99 | source noncore/mail/config.in | ||
100 | source noncore/net/config.in | ||
101 | endmenu | ||
102 | menu "Games" | ||
103 | source noncore/games/config.in | ||
104 | endmenu | ||
105 | menu "Graphics and Multimedia" | ||
106 | source freetype/config.in | ||
107 | source noncore/graphics/config.in | ||
108 | source core/multimedia/config.in | ||
109 | source noncore/multimedia/config.in | ||
110 | endmenu | ||
111 | menu "Input methods" | ||
112 | source inputmethods/config.in | ||
113 | endmenu | ||
114 | menu "Pim" | ||
115 | source core/pim/config.in | ||
116 | menu "Today Plugins" | ||
117 | source noncore/todayplugins/config.in | ||
118 | source core/pim/today/plugins/config.in | ||
119 | endmenu | ||
120 | endmenu | ||
121 | menu "Settings" | ||
122 | source core/settings/config.in | ||
123 | source noncore/settings/config.in | ||
124 | endmenu | ||
125 | menu "Theming" | ||
126 | source noncore/decorations/config.in | ||
127 | source noncore/styles/config.in | ||
128 | endmenu | ||
129 | menu "Tools" | ||
130 | source noncore/tools/config.in | ||
131 | source development/config.in | ||
132 | endmenu | ||
133 | menu "Unsupported" | ||
134 | source noncore/unsupported/config.in | ||
135 | endmenu | ||
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,3 +1,3 @@ | |||
1 | config BATTERYAPPLET | 1 | config BATTERYAPPLET |
2 | boolean "batteryapplet" | 2 | boolean "Battery (Applet to monitor battery status)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config CARDMON | 1 | config CARDMON |
2 | boolean "cardmon" | 2 | boolean "Cardmon (monitor cf/sd/mmc card status, and eject function)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config CLIPBOARDAPPLET | 1 | config CLIPBOARDAPPLET |
2 | boolean "clipboardapplet" | 2 | boolean "Clipboard (copy/cut/paste applet)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config CLOCKAPPLET | 1 | config CLOCKAPPLET |
2 | boolean "clockapplet" | 2 | boolean "Clock (Digital clock applet)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config HOMEAPPLET | 1 | config HOMEAPPLET |
2 | boolean "homeapplet" | 2 | boolean "Home" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config IRDAAPPLET | 1 | config IRDAAPPLET |
2 | boolean "irdaapplet" | 2 | boolean "Irda (applet for IR beaming/discovery)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config LOGOUTAPPLET | 1 | config LOGOUTAPPLET |
2 | boolean "logoutapplet" | 2 | boolean "Logout" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config OBEX | 1 | config OBEX |
2 | boolean "obex" | 2 | boolean "Obex library (library needed for beaming in Opie)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config RESTARTAPPLET | 1 | config RESTARTAPPLET |
2 | boolean "restartapplet" | 2 | boolean "Restart" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config SCREENSHOTAPPLET | 1 | config SCREENSHOTAPPLET |
2 | boolean "screenshotapplet" | 2 | boolean "Screenshot" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config SUSPENDAPPLET | 1 | config SUSPENDAPPLET |
2 | boolean "suspendapplet" | 2 | boolean "Suspend" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config VMEMO | 1 | config VMEMO |
2 | boolean "vmemo" | 2 | boolean "Vmemo (take voice memos)" |
3 | default "y" | 3 | default "y" |
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,3 +1,3 @@ | |||
1 | config VOLUMEAPPLET | 1 | config VOLUMEAPPLET |
2 | boolean "volumeapplet" | 2 | boolean "Volume" |
3 | default "y" | 3 | default "y" |
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 @@ | |||
1 | menu "Core" | ||
2 | @sources@ | ||
3 | 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,3 +1 @@ | |||
1 | menu "today" | ||
2 | |||
3 | config TODAY | config TODAY | |
@@ -6,3 +4 @@ menu "today" | |||
6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | |
7 | source core/pim/today/plugins/config.in | ||
8 | endmenu | ||
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in index 6a90f19..9f13d55 100644 --- a/noncore/applets/notesapplet/config.in +++ b/noncore/applets/notesapplet/config.in | |||
@@ -1,3 +1,3 @@ | |||
1 | config NOTESAPPLET | 1 | config NOTESAPPLET |
2 | boolean "notesapplet" | 2 | boolean "Notes (quick note taking applet)" |
3 | default "y" | 3 | default "y" |
diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in index e502f93..c201bab 100644 --- a/noncore/applets/wirelessapplet/config.in +++ b/noncore/applets/wirelessapplet/config.in | |||
@@ -1,3 +1,3 @@ | |||
1 | config WIRELESSAPPLET | 1 | config WIRELESSAPPLET |
2 | boolean "wirelessapplet" | 2 | boolean "Wireless (view wireless signal strength, and renew IP on AP change)" |
3 | default "y" | 3 | default "y" |
diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in index 845ae85..fabc81d 100644 --- a/noncore/apps/opie-console/config.in +++ b/noncore/apps/opie-console/config.in | |||
@@ -1,4 +1,2 @@ | |||
1 | menu "opie-console" | 1 | config OPIE-CONSOLE |
2 | |||
3 | config #OPIE-CONSOLE | ||
4 | boolean "opie-console" | 2 | boolean "opie-console" |
@@ -6,3 +4 @@ menu "opie-console" | |||
6 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | |
7 | source noncore/apps/opie-console/test/config.in | ||
8 | endmenu | ||
diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in index 9842b4b..5e736f1 100644 --- a/noncore/apps/opie-write/config.in +++ b/noncore/apps/opie-write/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #OPIE-WRITE | 1 | config OPIE-WRITE |
2 | # boolean "opie-write" | 2 | boolean "opie-write" |
3 | # default "y" | 3 | default "y" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/noncore/comm/mobilemsg/config.in b/noncore/comm/mobilemsg/config.in index 45c4ca4..524e254 100644 --- a/noncore/comm/mobilemsg/config.in +++ b/noncore/comm/mobilemsg/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #MOBILEMSG | 1 | config MOBILEMSG |
2 | # boolean "mobilemsg" | 2 | boolean "mobilemsg" |
3 | # default "y" | 3 | default "y" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/noncore/config.in.in b/noncore/config.in.in deleted file mode 100644 index 07e5743..0000000 --- a/noncore/config.in.in +++ b/dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | menu "Non-core" | ||
2 | @sources@ | ||
3 | endmenu | ||
diff --git a/noncore/games/chess/config.in b/noncore/games/chess/config.in index 6cddb51..6d49f3e 100644 --- a/noncore/games/chess/config.in +++ b/noncore/games/chess/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #CHESS | 1 | config CHESS |
2 | # boolean "chess" | 2 | boolean "chess" |
3 | # default "y" | 3 | default "n" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/noncore/multimedia/opieplayer2/config.in b/noncore/multimedia/opieplayer2/config.in index da0a647..2272a9b 100644 --- a/noncore/multimedia/opieplayer2/config.in +++ b/noncore/multimedia/opieplayer2/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #OPIEPLAYER2 | 1 | config OPIEPLAYER2 |
2 | # boolean "opieplayer2" | 2 | boolean "opieplayer2" |
3 | # default "y" | 3 | default "n" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/noncore/net/ubrowser/config.in b/noncore/net/ubrowser/config.in index 562741d..3fb5c37 100644 --- a/noncore/net/ubrowser/config.in +++ b/noncore/net/ubrowser/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #UBROWSER | 1 | config UBROWSER |
2 | # boolean "ubrowser" | 2 | boolean "ubrowser" |
3 | # default "y" | 3 | default "n" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in index 0da6502..2312610 100644 --- a/noncore/settings/appearance2/config.in +++ b/noncore/settings/appearance2/config.in | |||
@@ -1,3 +1,3 @@ | |||
1 | config APPEARANCE2 | 1 | config APPEARANCE2 |
2 | boolean "appearance2" | 2 | boolean "Appearance" |
3 | default "y" | 3 | default "y" |
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in index 036b04c..0186c44 100644 --- a/noncore/todayplugins/stockticker/config.in +++ b/noncore/todayplugins/stockticker/config.in | |||
@@ -1,3 +1 @@ | |||
1 | menu "stockticker" | ||
2 | |||
3 | config TODAY_STOCKTICKER | config TODAY_STOCKTICKER | |
@@ -9,2 +7 @@ menu "stockticker" | |||
9 | source noncore/todayplugins/stockticker/stocktickerlib/config.in | source noncore/todayplugins/stockticker/stocktickerlib/config.in | |
10 | endmenu | ||
diff --git a/noncore/unsupported/gsmtool/config.in b/noncore/unsupported/gsmtool/config.in index f023d61..bb7a052 100644 --- a/noncore/unsupported/gsmtool/config.in +++ b/noncore/unsupported/gsmtool/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # config #GSMTOOL | 1 | config GSMTOOL |
2 | # boolean "gsmtool" | 2 | boolean "gsmtool" |
3 | # default "y" | 3 | default "y" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |