removed appskey / added button-settings

3 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 15c9b5f..cfeff86 100644
--- a/Makefile
+++ b/Makefile
@@ -32,54 +32,54 @@ PLAYER = core/multimedia/opieplayer/libmpeg3 \
 COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)	
 
 
 PIMAPPS = core/pim/addressbook core/pim/datebook \
 	 core/pim/today core/pim/todo 
 
 TODAYPLUGINS = core/pim/today/plugins/datebook \
 		core/pim/today/plugins/todolist \
 		core/pim/today/plugins/mail \
 		noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
 		noncore/todayplugins/fortune \
 		noncore/todayplugins/weather
 
 
 COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
 	core/apps/textedit core/apps/embeddedkonsole \
 	core/launcher  \
 	core/opie-login \
 	core/apps/oipkg core/apps/qcop
 
 COREMULTIMEDIA = core/multimedia/opieplayer
 
 CORESETTINGS = core/settings/light-and-power core/settings/security \
 	noncore/settings/netsystemtime core/settings/citytime \
-	core/settings/launcher
+	core/settings/launcher core/settings/button
 
 NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
 	noncore/settings/appearance2 noncore/settings/sound \
 	noncore/settings/mediummount \
-	noncore/settings/tabmanager noncore/settings/appskey \
+	noncore/settings/tabmanager \
 	noncore/settings/sshkeys noncore/settings/usermanager \
 	noncore/settings/backup
 
 NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
 	 noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
 	 noncore/tools/formatter
 
 NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
 	noncore/styles/flat noncore/styles/fresh
 
 NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
 	noncore/decorations/polished
 
 GAMES = noncore/games/minesweep noncore/games/solitaire \
 	noncore/games/tetrix noncore/games/wordgame \
 	noncore/games/parashoot noncore/games/snake \
 	noncore/games/mindbreaker \
 	noncore/games/go noncore/games/qasteroids \
 	noncore/games/fifteen noncore/games/tictac \
 	noncore/games/kcheckers noncore/games/kpacman \
 	noncore/games/kbill noncore/games/buzzword \
 	noncore/games/bounce noncore/games/sfcave
 
 NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -59,49 +59,48 @@ CONFIG_TODAY_STOCKTICKERSUB=y
 CONFIG_TODAY_STOCKTICKERLIB=y
 CONFIG_TODAY_FORTUNE=y
 
 #
 # styles
 #
 CONFIG_THEME=y
 CONFIG_METAL=y
 CONFIG_LIQUID=y
 CONFIG_FRESH=y
 CONFIG_FLAT=y
 
 #
 # settings
 #
 CONFIG_USERMANAGER=y
 CONFIG_TABMANAGER=y
 CONFIG_SSHKEYS=y
 CONFIG_SOUND=y
 CONFIG_ROTATION=y
 CONFIG_NETSYSTEMTIME=y
 CONFIG_MEDIUMMOUNT=y
 CONFIG_LANGUAGE=y
 CONFIG_BACKUP=y
-CONFIG_APPSKEY=y
 CONFIG_APPEARANCE2=y
 
 #
 # appearance
 #
 
 #
 # net
 #
 
 #
 # opietooth
 #
 CONFIG_OPIEIRC=y
 CONFIG_OPIEFTP=y
 CONFIG_NETWORKSETUP=y
 CONFIG_NETWORKSETUP-CORE=y
 CONFIG_WLAN=y
 CONFIG_INTERFACES=y
 
 #
 # multimedia
 #
 CONFIG_SHOWIMG=y
@@ -194,48 +193,49 @@ CONFIG_UNIKEYBOARD=y
 CONFIG_PICKBOARD=y
 CONFIG_MULTIKEY=y
 CONFIG_KJUMPX=y
 CONFIG_KEYBOARD=y
 CONFIG_JUMPX=y
 CONFIG_HANDWRITING=y
 CONFIG_DVORAK=y
 CONFIG_FREETYPE=y
 
 #
 # development
 #
 
 #
 # Core
 #
 
 #
 # settings
 #
 CONFIG_SECURITY=y
 CONFIG_LIGHT-AND-POWER=y
 CONFIG_LAUNCHER-SETTINGS=y
 CONFIG_CITYTIME=y
+CONFIG_BUTTON-SETTINGS=y
 
 #
 # pim
 #
 CONFIG_TODO=y
 
 #
 # today
 #
 CONFIG_TODAY=y
 
 #
 # plugins
 #
 CONFIG_TODAY_TODOLIST=y
 CONFIG_TODAY_MAIL=y
 CONFIG_TODAY_DATEBOOK=y
 CONFIG_DATEBOOK=y
 CONFIG_ADDRESSBOOK=y
 CONFIG_OPIE-LOGIN=y
 
 #
 # multimedia
 #
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,77 +1,78 @@
 #CONFIG_APPLET	noncore/net/opietooth/applet	applet.pro
+#CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
 #CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 #CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
 #CONFIG_CALC2	noncore/tools/calc2	calc2.pro
 #CONFIG_CALIBRATE	core/apps/calibrate	calibrate.pro
 #CONFIG_CHESS	noncore/games/chess	chess.pro
 #CONFIG_CONVERTER	noncore/unsupported/opiemail/converter	converter.pro
 #CONFIG_DIALUP	noncore/unsupported/netsetup/dialup	dialup.pro
 #CONFIG_DICTIONARY	noncore/apps/dictionary	dictionary.pro
 #CONFIG_EXAMPLE	example	example.pro
 #CONFIG_GSMTOOL	noncore/comm/gsmtool	gsmtool.pro
 #CONFIG_KEYVIEW	development/keyview	keyview.pro
 #CONFIG_LAN	noncore/unsupported/netsetup/lan	lan.pro
 #CONFIG_LIB	noncore/net/opietooth/lib	lib.pro
 #CONFIG_LIB	noncore/unsupported/opiemail/lib	lib.pro
 #CONFIG_LIBFFMPEG	core/multimedia/opieplayer/libffmpeg	libffmpeg.pro
 #CONFIG_LIBFLASH	core/multimedia/opieplayer/libflash	libflash.pro
 #CONFIG_LIBOPIE_PIM	libopie/pim	pim.pro
 CONFIG_LIBQPE-X11	x11/libqpe-x11	libqpe-x11.pro
 #CONFIG_LIBSQL	libsql	libsql.pro
 #CONFIG_MANAGER	noncore/net/opietooth/manager	manager.pro
 #CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.pro
 #CONFIG_NETSETUP	noncore/unsupported/netsetup	netsetup.pro
 #CONFIG_NETMONAPPLET	noncore/unsupported/netmonapplet	netmonapplet.pro
 #CONFIG_OFILESELECTOR	libopie/ofileselector	ofileselector.pro
 #CONFIG_OPIE-WRITE	noncore/apps/opie-write	opie-write.pro
 #CONFIG_OPIEMAIL	noncore/unsupported/opiemail	opiemail.pro
 #CONFIG_OPIEPLAYER2	noncore/multimedia/opieplayer2	opieplayer2.pro
 #CONFIG_POP3	noncore/unsupported/opiemail/ifaces/pop3	pop3.pro
 #CONFIG_QUICKEXEC	quickexec	quickexec.pro
 #CONFIG_RESTARTAPPLET	core/applets/restartapplet	restartapplet.pro
 #CONFIG_RESTARTAPPLET2	core/applets/restartapplet2	restartapplet2.pro
 #CONFIG_SDMON	noncore/unsupported/sdmon	sdmon.pro
 CONFIG_OCOPSERVER	x11/ipc/server	ocopserver.pro
 #CONFIG_SIMPLE	noncore/tools/calc2/simple	simple.pro
 #CONFIG_SMTP	noncore/unsupported/opiemail/ifaces/smtp	smtp.pro
 #CONFIG_SPREADSHEET	noncore/unsupported/spreadsheet	spreadsheet.pro
 #CONFIG_SYSTEMTIME	noncore/unsupported/systemtime	systemtime.pro
 #CONFIG_TEST	libsql/test	test.pro
 #CONFIG_TEST	noncore/apps/opie-console/test	test.pro
 #CONFIG_UBROWSER	noncore/net/ubrowser	ubrowser.pro
 #CONFIG_WELLENREITER	noncore/net/wellenreiter	wellenreiter.pro
 #CONFIG_WLANSETUP	noncore/unsupported/wlansetup	wlansetup.pro
 CONFIG_ADDRESSBOOK	core/pim/addressbook	addressbook.pro
 CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
 CONFIG_APPEARANCE2	noncore/settings/appearance2	appearance2.pro
-CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
 CONFIG_AQPKG	noncore/apps/aqpkg	aqpkg.pro
 CONFIG_BACKUP	noncore/settings/backup	backup.pro
 CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
 CONFIG_BATTERYAPPLET-IPAQ	core/applets/batteryapplet-ipaq	batteryapplet-ipaq.pro
 CONFIG_BEND	noncore/mail/bend	bend.pro
 CONFIG_BOUNCE	noncore/games/bounce	bounce.pro
+CONFIG_BUTTON-SETTINGS	core/settings/button	button.pro
 CONFIG_BUZZWORD	noncore/games/buzzword	buzzword.pro
 CONFIG_CALCULATOR	noncore/tools/calculator	calculator.pro
 CONFIG_CARDMON	core/applets/cardmon	cardmon.pro
 CONFIG_CHECKBOOK	noncore/apps/checkbook	checkbook.pro
 CONFIG_CITYTIME	core/settings/citytime	citytime.pro
 CONFIG_CLIPBOARDAPPLET	core/applets/clipboardapplet	clipboardapplet.pro
 CONFIG_CLOCK	noncore/tools/clock	clock.pro
 CONFIG_CLOCKAPPLET	core/applets/clockapplet	clockapplet.pro
 CONFIG_CONFEDIT	noncore/apps/confedit	confedit.pro
 CONFIG_DATEBOOK	core/pim/datebook	datebook.pro
 CONFIG_DECO_FLAT	noncore/decorations/flat	flat.pro
 CONFIG_DECO_LIQUID	noncore/decorations/liquid	liquid.pro
 CONFIG_DECO_POLISHED	noncore/decorations/polished	polished.pro
 CONFIG_DRAWPAD	noncore/graphics/drawpad	drawpad.pro
 CONFIG_DVORAK	inputmethods/dvorak	dvorak.pro
 CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
 CONFIG_FIFTEEN	noncore/games/fifteen	fifteen.pro
 CONFIG_FILEBROWSER	core/apps/filebrowser	filebrowser.pro
 CONFIG_FLAT	noncore/styles/flat	flat.pro
 CONFIG_FORMATTER	noncore/tools/formatter	formatter.pro
 CONFIG_FREETYPE	freetype	freetype.pro
 CONFIG_FRESH	noncore/styles/fresh	fresh.pro
 CONFIG_GO	noncore/games/go	go.pro
 CONFIG_HANDWRITING	inputmethods/handwriting	handwriting.pro