aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/opie-taskbar/opie-taskbar
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/opie-taskbar/opie-taskbar
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/opie-taskbar/opie-taskbar')
-rw-r--r--recipes/opie-taskbar/opie-taskbar/firstuse-path.patch11
-rw-r--r--recipes/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch35
-rw-r--r--recipes/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch11
-rw-r--r--recipes/opie-taskbar/opie-taskbar/nomax.patch30
-rw-r--r--recipes/opie-taskbar/opie-taskbar/restart-from-bindir.patch12
-rw-r--r--recipes/opie-taskbar/opie-taskbar/server.pro84
6 files changed, 183 insertions, 0 deletions
diff --git a/recipes/opie-taskbar/opie-taskbar/firstuse-path.patch b/recipes/opie-taskbar/opie-taskbar/firstuse-path.patch
new file mode 100644
index 0000000000..636eb81675
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/firstuse-path.patch
@@ -0,0 +1,11 @@
+--- launcher/firstuse.cpp 2007-10-14 12:47:55.000000000 +1300
++++ launcher/firstuse.cpp 2007-10-14 13:58:54.000000000 +1300
+@@ -124,7 +124,7 @@
+ #endif
+
+ for ( int i = 0; settingsTable[i].app; i++ ) {
+- QString file = QPEApplication::qpeDir() + "bin/";
++ QString file = OPIE_BINDIR + QString("/");
+ file += settingsTable[i].app;
+ file += exeSuffix;
+ if ( QFile::exists(file) )
diff --git a/recipes/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch b/recipes/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
new file mode 100644
index 0000000000..e356682768
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
@@ -0,0 +1,35 @@
+--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300
++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300
+@@ -84,6 +84,7 @@
+ LockKeyState* lockState;
+ StartMenu *sm;
+ bool resizeRunningApp;
++ bool showKbdLockState;
+ };
+
+
+--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300
++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300
+@@ -213,12 +213,9 @@
+ (void)new SafeMode( this );
+ #endif
+
+- // ## make customizable in some way?
+-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
+- lockState = new LockKeyState( this );
+-#else
+ lockState = 0;
+-#endif
++ if ( showKbdLockState )
++ lockState = new LockKeyState( this );
+
+ #if defined(Q_WS_QWS)
+ #if !defined(QT_NO_COP)
+@@ -388,6 +385,7 @@
+ Config cfg( "Launcher" );
+ cfg.setGroup( "InputMethods" );
+ resizeRunningApp = cfg.readBoolEntry( "Resize", true );
++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true );
+ }
+
+ #include "taskbar.moc"
diff --git a/recipes/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch b/recipes/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch
new file mode 100644
index 0000000000..349b28675b
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch
@@ -0,0 +1,11 @@
+--- launcher/server.cpp.org 2007-05-01 20:55:01.000000000 +0000
++++ launcher/server.cpp 2007-05-03 04:48:45.000000000 +0000
+@@ -1009,6 +1009,8 @@
+ }
+
+ void Server::startSoundServer() {
++ owarn << "Sound server (qss) now needs to be started standalone" << oendl;
++ return;
+ if ( !process ) {
+ process = new Opie::Core::OProcess( this );
+ connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
diff --git a/recipes/opie-taskbar/opie-taskbar/nomax.patch b/recipes/opie-taskbar/opie-taskbar/nomax.patch
new file mode 100644
index 0000000000..468038b377
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/nomax.patch
@@ -0,0 +1,30 @@
+--- opie-x86/core/launcher/server.cpp~nomax
++++ opie-x86/core/launcher/server.cpp
+@@ -76,7 +76,7 @@
+ return 0;
+ #endif
+ }
+-
++#ifndef OPIE_NO_WINDOWED
+ #define FACTORY(T) \
+ static QWidget *new##T( bool maximized ) { \
+ QWidget *w = new T( 0, 0, QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
+@@ -90,7 +90,18 @@
+ w->show(); \
+ return w; \
+ }
++#else
++#define FACTORY(T) \
++ static QWidget *new##T( bool maximized ) { \
++ QWidget *w = new T( 0, 0, QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
++ if ( maximized ) { \
++ w->showMaximized(); \
++} \
++ w->show(); \
++ return w; \
++}
+
++#endif
+
+ #ifdef SINGLE_APP
+ #define APP(a,b,c,d) FACTORY(b)
diff --git a/recipes/opie-taskbar/opie-taskbar/restart-from-bindir.patch b/recipes/opie-taskbar/opie-taskbar/restart-from-bindir.patch
new file mode 100644
index 0000000000..1a73588409
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/restart-from-bindir.patch
@@ -0,0 +1,12 @@
+diff --git a/serverapp.cpp b/serverapp.cpp
+index 0e92040..b933340 100644
+--- a/serverapp.cpp
++++ b/serverapp.cpp
+@@ -763,6 +763,7 @@ void ServerApplication::restart()
+ for ( int fd = 3; fd < 100; fd++ )
+ close( fd );
+ execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
++ execl( OPIE_BINDIR "/qpe", "qpe", NULL );
+ exit( 1 );
+ #endif
+ }
diff --git a/recipes/opie-taskbar/opie-taskbar/server.pro b/recipes/opie-taskbar/opie-taskbar/server.pro
new file mode 100644
index 0000000000..2dee9a973a
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/server.pro
@@ -0,0 +1,84 @@
+TEMPLATE = app
+
+CONFIG += qt warn_on
+
+DESTDIR =
+
+HEADERS += server.h \
+ qrr.h \
+ serverinterface.h \
+ launchertab.h \
+ documentlist.h \
+ appicons.h \
+ taskbar.h \
+ runningappbar.h \
+ applauncher.h \
+ stabmon.h \
+ inputmethods.h \
+ systray.h \
+ wait.h \
+ shutdownimpl.h \
+ launcher.h \
+ launcherview.h \
+ calibrate/calibrate.h \
+ startmenu.h \
+ transferserver.h \
+ qcopbridge.h \
+ packageslave.h \
+ irserver.h \
+ firstuse.h \
+ syncdialog.h \
+ serverapp.h \
+ qprocess.h \
+ screensaver.h \
+ mediummount/mediumwidget.h \
+ mediadlg.h
+
+SOURCES += server.cpp \
+ qrr.cpp \
+ serverinterface.cpp \
+ launchertab.cpp \
+ documentlist.cpp \
+ appicons.cpp \
+ taskbar.cpp \
+ runningappbar.cpp \
+ applauncher.cpp \
+ stabmon.cpp \
+ inputmethods.cpp \
+ systray.cpp \
+ wait.cpp \
+ shutdownimpl.cpp \
+ launcher.cpp \
+ launcherview.cpp \
+ calibrate/calibrate.cpp \
+ transferserver.cpp \
+ packageslave.cpp \
+ irserver.cpp \
+ qcopbridge.cpp \
+ startmenu.cpp \
+ main.cpp \
+ firstuse.cpp \
+ syncdialog.cpp \
+ serverapp.cpp \
+ qprocess.cpp \
+ qprocess_unix.cpp \
+ screensaver.cpp \
+ mediummount/mediumwidget.cc \
+ mediadlg.cpp
+
+
+INCLUDEPATH += calibrate
+DEPENDPATH += calibrate
+
+INCLUDEPATH += $(OPIEDIR)/include rsync
+DEPENDPATH += rsync
+
+INCLUDEPATH += mediummount
+DEPENDPATH += mediummount
+
+
+TARGET = qpe
+
+LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
+
+include ( $(OPIEDIR)/include.pro )