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
@@ -44,30 +44,30 @@ TODAYPLUGINS = core/pim/today/plugins/datebook \
 
 
 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
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -71,25 +71,24 @@ 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
@@ -206,24 +205,25 @@ CONFIG_FREETYPE=y
 
 #
 # 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
 
 #
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,13 +1,14 @@
 #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
@@ -35,31 +36,31 @@ 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