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/appletapplet.pro
+        #CONFIG_APPSKEY         noncore/settings/appskeyappskey.pro
         #CONFIG_BINARY  noncore/tools/calc2/binarybinary.pro
         #CONFIG_BLUE-PIN        noncore/net/opietooth/blue-pinblue-pin.pro
         #CONFIG_CALC2   noncore/tools/calc2calc2.pro
         #CONFIG_CALIBRATE       core/apps/calibratecalibrate.pro
         #CONFIG_CHESS   noncore/games/chesschess.pro
         #CONFIG_CONVERTER       noncore/unsupported/opiemail/converterconverter.pro
         #CONFIG_DIALUP  noncore/unsupported/netsetup/dialupdialup.pro
         #CONFIG_DICTIONARY      noncore/apps/dictionarydictionary.pro
         #CONFIG_EXAMPLE         exampleexample.pro
         #CONFIG_GSMTOOL         noncore/comm/gsmtoolgsmtool.pro
         #CONFIG_KEYVIEW         development/keyviewkeyview.pro
         #CONFIG_LAN     noncore/unsupported/netsetup/lanlan.pro
@@ -35,31 +36,31 @@ CONFIG_OCOPSERVER	x11/ipc/server	ocopserver.pro
         #CONFIG_SIMPLE  noncore/tools/calc2/simplesimple.pro
         #CONFIG_SMTP    noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
         #CONFIG_SPREADSHEET     noncore/unsupported/spreadsheetspreadsheet.pro
         #CONFIG_SYSTEMTIME      noncore/unsupported/systemtimesystemtime.pro
         #CONFIG_TEST    libsql/testtest.pro
         #CONFIG_TEST    noncore/apps/opie-console/testtest.pro
         #CONFIG_UBROWSER        noncore/net/ubrowserubrowser.pro
         #CONFIG_WELLENREITER    noncore/net/wellenreiterwellenreiter.pro
         #CONFIG_WLANSETUP       noncore/unsupported/wlansetupwlansetup.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
-        CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BATTERYAPPLET-IPAQ       core/applets/batteryapplet-ipaqbatteryapplet-ipaq.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
+        CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro