New network setup app now in root Makefile per max's suggestion. Ben meyer wrote it, much improved, though lacks some features. Also, needs an icon.

6 files changed, 51 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index b45bcc1..a191794 100644
--- a/Makefile
+++ b/Makefile
@@ -1,132 +1,134 @@
 indefault:  dynamic
 
 all: default docs
 
 LIBS=library libopie
 
 
 INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
         inputmethods/handwriting  inputmethods/unikeyboard \
         inputmethods/jumpx inputmethods/kjumpx \
         inputmethods/dvorak  inputmethods/multikey \
 
 APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
         core/applets/irdaapplet core/applets/volumeapplet \
         core/applets/clockapplet core/applets/netmonapplet \
         core/applets/homeapplet core/applets/suspendapplet \
         core/applets/logoutapplet \
         core/applets/screenshotapplet core/applets/clipboardapplet \
         core/applets/cardmon core/applets/obex \
         core/applets/vmemo noncore/net/netsetup/dialup \
         noncore/net/netsetup/lan  \
+        noncore/net/networksetup/wlan \
         noncore/applets/wirelessapplet noncore/applets/notesapplet
 
 MAIL= noncore/mail/libmail noncore/mail/bend 
 
 PLAYER = core/multimedia/opieplayer/libmpeg3 \
         core/multimedia/opieplayer/libmad \
         core/multimedia/opieplayer/wavplugin \
         core/multimedia/opieplayer/modplug
 
         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 \
 
 
 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 \
         core/settings/systemtime core/settings/citytime \
         core/settings/launcher
 
 NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
         noncore/settings/appearance2 noncore/settings/sound \
         noncore/settings/mediummount \
         noncore/settings/tabmanager noncore/settings/appskey \
         noncore/settings/netsystemtime noncore/settings/wlansetup \
         noncore/settings/sshkeys noncore/settings/usermanager \
         noncore/apps/backup
 
 NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
          noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm
 
 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 
 
 NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
         noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
         noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
         
-NONNET = noncore/net/netsetup noncore/net/opieftp \
+NONNET = noncore/net/netsetup noncore/net/networksetup \
+        noncore/net/opieftp \
         noncore/mail
 
 NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
         noncore/graphics/qpdf noncore/apps/confedit
 
 
 NONCOMM = noncore/comm/keypebble
 
 APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
         $(COREMULTIMEDIA) $(CORESETTINGS) \
         $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
         $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
         $(NONCOMM) $(GAMES) $(TODAYPLUGINS)
     
     
 
 NONTMAKEAPPS := ipaq/opiealarm 
 
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 
 dynamic: $(APPS) $(NONTMAKEAPPS)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
         $(MAKE) -C $@ -f Makefile
 
 showcomponents:
         @echo $(LIBS) $(APPS) $(COMPONENTS) single
 
 clean:
         $(MAKE) -C single -f Makefile $@
         for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 lupdate:
         for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 lrelease:
         for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 
 .PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
diff --git a/apps/Settings/networksettings.desktop b/apps/Settings/networksettings.desktop
new file mode 100644
index 0000000..a55eac8
--- a/dev/null
+++ b/apps/Settings/networksettings.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=networksetup
+Icon=Network/PPPConnect
+Type=Application
+Name=Network
+Name[pt_BR]=Rede
+Name[de]=Netzwerk
+Name[it]=PPP
+Name[pt]=Rede
+Name[es]=Red
+Name[zh_TW]=網絡
+Name[ko]=네트워크 설정
diff --git a/apps/Settings/networksetup.desktop b/apps/Settings/networksetup.desktop
new file mode 100644
index 0000000..a55eac8
--- a/dev/null
+++ b/apps/Settings/networksetup.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=networksetup
+Icon=Network/PPPConnect
+Type=Application
+Name=Network
+Name[pt_BR]=Rede
+Name[de]=Netzwerk
+Name[it]=PPP
+Name[pt]=Rede
+Name[es]=Red
+Name[zh_TW]=網絡
+Name[ko]=네트워크 설정
diff --git a/noncore/net/networksetup/opie-networksetup.control b/noncore/net/networksetup/opie-networksetup.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/net/networksetup/opie-networksetup.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool
diff --git a/noncore/settings/networksettings/opie-networksetup.control b/noncore/settings/networksettings/opie-networksetup.control
new file mode 100644
index 0000000..96e4ee6
--- a/dev/null
+++ b/noncore/settings/networksettings/opie-networksetup.control
@@ -0,0 +1,8 @@
+Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/*
+Priority: optional
+Section: opie/settings
+Maintainer: Ben Meyer <meyerb@sharpsec.com> 
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: Opie network setup tool