moved taskbar/ to launcher/.

4 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 24a9050..01aba30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,71 +1,71 @@
 default:  dynamic
 
 all: default docs
 
 LIBS=library libopie
 
 COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
 	inputmethods/pickboard \
 	inputmethods/handwriting \
 	inputmethods/unikeyboard \
 	inputmethods/jumpx \
 	inputmethods/dvorak \
-	taskbar/batteryapplet \
-	taskbar/volumeapplet \
-	taskbar/clockapplet \
-	taskbar/netmonapplet \
-	taskbar/screenshotapplet \
-	taskbar/vmemo \
+	launcher/batteryapplet \
+	launcher/volumeapplet \
+	launcher/clockapplet \
+	launcher/netmonapplet \
+	launcher/screenshotapplet \
+	launcher/vmemo \
 	netsetup/dialup \
 	netsetup/lan \
 	opiemail/ifaces/pop3 opiemail/ifaces/smtp \
 	mpegplayer/libmpeg3 \
 	mpegplayer/libmad \
 	mpegplayer/wavplugin \
 	cardmon \
 	sdmon 
 
 APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
     filebrowser helpbrowser minesweep mpegplayer \
     settings/light-and-power \
     settings/language \
     settings/rotation \
     settings/appearance \
     settings/security \
     settings/sound \
     settings/systemtime \
     solitaire spreadsheet tetrix textedit \
-    todo wordgame embeddedkonsole taskbar sysinfo \
+    todo wordgame embeddedkonsole launcher sysinfo \
     parashoot snake citytime showimg netsetup tableviewer \
     qipkg mindbreaker go qasteroids qcop fifteen keypebble  today opiemail/converter opiemail \
     noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
 
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 
 dynamic: $(APPS)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single:
 	$(MAKE) -C $@ -f Makefile
 
 showcomponents:
 	@echo $(LIBS) $(APPS) $(COMPONENTS) single
 
 clean:
 	$(MAKE) -C single -f Makefile $@
 	for dir in $(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 $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index d7f36bd..18d28cb 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -20,105 +20,105 @@
 
 #include "startmenu.h"
 #include "inputmethods.h"
 #include "mrulist.h"
 #include "systray.h"
 #include "calibrate.h"
 #include "wait.h"
 #include "appicons.h"
 
 #include "taskbar.h"
 #include "desktop.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #ifdef QT_QWS_CUSTOM
 #include <qpe/custom.h>
 #endif
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qwidgetstack.h>
 
 #if defined( Q_WS_QWS )
 #include <qwsdisplay_qws.h>
 #include <qgfx_qws.h>
 #endif
 
 
 #define FACTORY(T) \
     static QWidget *new##T( bool maximized ) { \
 	QWidget *w = new T( 0, "test", QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
 	if ( maximized ) { \
 	    if ( qApp->desktop()->width() <= 350 ) { \
 		w->showMaximized(); \
 	    } else { \
 		w->resize( QSize( 300, 300 ) ); \
 	    } \
 	} \
 	w->show(); \
 	return w; \
     }
 
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) FACTORY(b)
-#include "../taskbar/apps.h"
+#include "../launcher/apps.h"
 #undef APP
 #endif // SINGLE_APP
 
 static Global::Command builtins[] = {
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) { a, new##b, c },
-#include "../taskbar/apps.h"
+#include "../launcher/apps.h"
 #undef APP
 #endif
 
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX)
         { "calibrate",          TaskBar::calibrate,	1, 0 },
 #endif
 #if !defined(QT_QWS_CASSIOPEIA)
 	{ "shutdown",           Global::shutdown,		1, 0 },
 //	{ "run",                run,			1, 0 },
 #endif
 
 	{ 0,            TaskBar::calibrate,	0, 0 },
 };
 
 static bool initNumLock()
 {
 #ifdef QPE_INITIAL_NUMLOCK_STATE
     QPE_INITIAL_NUMLOCK_STATE
 #endif
     return FALSE;
 }
 
 class LockKeyState : public QWidget
 {
 public:
     LockKeyState( QWidget *parent ) :
 	QWidget(parent),
 	nl(initNumLock()), cl(FALSE)
     {
 	nl_pm = Resource::loadPixmap("numlock");
 	cl_pm = Resource::loadPixmap("capslock");
     }
     QSize sizeHint() const
     {
 	return QSize(nl_pm.width()+2,nl_pm.width()+nl_pm.height()+1);
     }
     void toggleNumLockState()
     {
 	nl = !nl; repaint();
     }
     void toggleCapsLockState()
     {
 	cl = !cl; repaint();
     }
     void paintEvent( QPaintEvent * )
     {
 	int y = (height()-sizeHint().height())/2;
 	QPainter p(this);
diff --git a/core/opie-login/README b/core/opie-login/README
index ad3b298..4a4234d 100644
--- a/core/opie-login/README
+++ b/core/opie-login/README
@@ -1,78 +1,78 @@
 
 Welcome to LISA System's
 
     QDM - the Login-Dialog for QPE
 
 
 WHAT'S THIS:
 
 This small add-on for the Qtopia Environment (QPE - see
 http://qpe.sourceforge.net for further details) allows You to use your
 handheld computer running QPE and Linux with the typical Un*x user
 handling, i.e. just log in on a graphical environment, as e.g. KDM or
 XDM. This way your personal data can be easily protected against
 unwanted access from others in case you loose your machine.
 
 
 STATUS:
 
 Still in development, but should be useable.
 
 
 REQUIREMENTS:
 
 - QDM needs Linux-PAM (Pluggable Authentication Modules for Linux) for
   proper user validation.
 
 - the /dev/fb0 device has to writeable to everyone ;-(
 
 
 INSTALLATION:
 
 Per default this little add-on is not enabled. You have to do so
 yourself for now, by setting a compile option variable called
 QT_QWS_LOGIN . Furthermore there have to be made some changes in
-taskbar/taskbar.pro :
+launcher/taskbar.pro :
 
 At the section HEADERS insert a line:
 		  ../login/qdmdialogimpl.h \
 
 At the section SOURCES insert a line:
 		  ../login/qdmdialogimpl.cpp \
 
 furthermore serte these lines:	
 
 INCLUDEPATH	+= ../login
 DEPENDPATH	+= ../login
 
 INTERFACES	= ../login/qdmdialog.ui
 
 For unix-login make folloing changes to a line:
 LIBS		= -lqpe -lcrypt
 
 For PAM use the following:
 LIBS		= -lqpe -ldl -lpam
 
 
 
 CONFIGURATION:
 
 Configuration of the 'Look' of QDM is done via Qt Designer. Just open
 the .ui file and edit the look of the dialog as you like. You can, for
 instance, change the logo pixmap. QDM should also be ready for i18n so
 far.
 
 Other configuration stuff, eg welcome string in the upper right, and
 user list can be changed in the qdm_config.h file.
 
 
 USAGE:
 
 The QDM comes up, when the QPE is started, and if the QPE is started
 as 'root'. Being started as any other user, the uid couldn't be
 changed and the login dialog wouldn't be ofg much use.
 
 
 CONTACT:
 
 http://www.lisa.de
diff --git a/core/opie-login/qdmdialogimpl.cpp b/core/opie-login/qdmdialogimpl.cpp
index bb1b453..56f0fc0 100644
--- a/core/opie-login/qdmdialogimpl.cpp
+++ b/core/opie-login/qdmdialogimpl.cpp
@@ -23,97 +23,97 @@
  */
 
 #include "qdm_config.h"
 
 #ifdef QT_QWS_LOGIN
 
 #include <pwd.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <iostream.h>
 #include <assert.h>
 
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qdatetime.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qtranslator.h>
 #include <qpeapplication.h>
 
 #include <qwsdisplay_qws.h>
 
 #include <string.h>                
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
 
 #include <global.h>
 
 #if defined(QT_QWS_LOGIN_USEPAM)
 extern "C" {
 #include <security/pam_appl.h>
 }
 #else
 #define _XOPEN_SOURCE      
 #include <unistd.h>
 #include <crypt.h>
 #endif
 
 
 #include "qdmdialogimpl.h"
-#include "../taskbar/inputmethods.h"
+#include "../launcher/inputmethods.h"
 
 
 //----------------------------------------------------------------------------
 
 //-- taken from semctl man page
 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
 //-- union semun is defined by including <sys/sem.h>
 #else
 //-- according to X/OPEN we have to define it ourselves
 union semun {
   int val;                    // value for SETVAL
   struct semid_ds *buf;       // buffer for IPC_STAT, IPC_SET
   unsigned short int *array;  // array for GETALL, SETALL
   struct seminfo *__buf;      // buffer for IPC_INFO
 };
 #endif
 
 //----------------------------------------------------------------------------
 
 static const int ShowClockFreq = 1;
 
 QDM_SHOWNUSERS;
 
 #ifdef QT_QWS_LOGIN_USEPAM
 
 static const char *_PAM_SERVICE = "xdm";
 static const char *PAM_password;
 
 typedef const struct pam_message pam_message_type;
 
 static int PAM_conv( int, pam_message_type **,  struct pam_response **,  void * );
 
 static struct pam_conv PAM_conversation = {
   &PAM_conv,
   NULL
 };
 
 //----------------------------------------------------------------------------
 
 static char *COPY_STRING( const char * s ) {
   return (s) ? strdup(s) : (char *)NULL;
 }
 
 #define GET_MEM if (reply) realloc(reply, size);\
                      else reply = (struct pam_response *)malloc(size); \
 	             if (!reply) return PAM_CONV_ERR; \
 	             size += sizeof(struct pam_response)