diff options
Diffstat (limited to 'recipes-opie/opie-taskbar/opie-taskbar')
7 files changed, 188 insertions, 0 deletions
diff --git a/recipes-opie/opie-taskbar/opie-taskbar/firstuse-path.patch b/recipes-opie/opie-taskbar/opie-taskbar/firstuse-path.patch new file mode 100644 index 0000000..636eb81 --- /dev/null +++ b/recipes-opie/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/opie-taskbar/opie-taskbar/force-firstuse-calibrate.patch b/recipes-opie/opie-taskbar/opie-taskbar/force-firstuse-calibrate.patch new file mode 100644 index 0000000..44d5d25 --- /dev/null +++ b/recipes-opie/opie-taskbar/opie-taskbar/force-firstuse-calibrate.patch @@ -0,0 +1,20 @@ +diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp +index 8c02ab0..cf731c2 100644 +--- launcher/firstuse.cpp ++++ launcher/firstuse.cpp +@@ -175,10 +175,13 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) : + m_calHandler = ( QWSServer::mouseHandler() && QWSServer::mouseHandler()->inherits("QCalibratedMouseHandler") ) ? true : false; + + if ( m_calHandler) { +- if ( !QFile::exists("/etc/pointercal") ) { ++ // Since Angstrom is installing default pointer calibration files ++ // that don't match everyone's devices, we need to force calibration ++ // on first use. ++// if ( !QFile::exists("/etc/pointercal") ) { + needCalibrate = TRUE; + grabMouse(); +- } ++// } + } + + Config config("locale"); diff --git a/recipes-opie/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch b/recipes-opie/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch new file mode 100644 index 0000000..e356682 --- /dev/null +++ b/recipes-opie/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/opie-taskbar/opie-taskbar/no-builtin-qss-startup-2.patch b/recipes-opie/opie-taskbar/opie-taskbar/no-builtin-qss-startup-2.patch new file mode 100644 index 0000000..65b54c9 --- /dev/null +++ b/recipes-opie/opie-taskbar/opie-taskbar/no-builtin-qss-startup-2.patch @@ -0,0 +1,11 @@ +--- launcher/server.cpp ++++ launcher/server.cpp +@@ -1111,6 +1111,8 @@ void Server::finishedQueuedRequests() + + 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/opie-taskbar/opie-taskbar/nomax.patch b/recipes-opie/opie-taskbar/opie-taskbar/nomax.patch new file mode 100644 index 0000000..468038b --- /dev/null +++ b/recipes-opie/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/opie-taskbar/opie-taskbar/restart-from-bindir.patch b/recipes-opie/opie-taskbar/opie-taskbar/restart-from-bindir.patch new file mode 100644 index 0000000..1a73588 --- /dev/null +++ b/recipes-opie/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/opie-taskbar/opie-taskbar/server-pro-cvs.patch b/recipes-opie/opie-taskbar/opie-taskbar/server-pro-cvs.patch new file mode 100644 index 0000000..eb214da --- /dev/null +++ b/recipes-opie/opie-taskbar/opie-taskbar/server-pro-cvs.patch @@ -0,0 +1,69 @@ +--- launcher/server.pro ++++ launcher/server.pro +@@ -2,7 +2,7 @@ TEMPLATE = app + + CONFIG += qt warn_on + +-DESTDIR = $$(OPIEDIR)/bin ++DESTDIR = + + HEADERS += server.h \ + qrr.h \ +@@ -20,7 +20,7 @@ HEADERS += server.h \ + shutdownimpl.h \ + launcher.h \ + launcherview.h \ +- $$(OPIEDIR)/core/apps/calibrate/calibrate.h \ ++ calibrate/calibrate.h \ + startmenu.h \ + transferserver.h \ + qcopbridge.h \ +@@ -31,7 +31,7 @@ HEADERS += server.h \ + serverapp.h \ + qprocess.h \ + screensaver.h \ +- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \ ++ mediummount/mediumwidget.h \ + mediadlg.h \ + virtualfs.h \ + syncaccessmanager.h +@@ -52,7 +52,7 @@ SOURCES += server.cpp \ + shutdownimpl.cpp \ + launcher.cpp \ + launcherview.cpp \ +- $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ ++ calibrate/calibrate.cpp \ + transferserver.cpp \ + packageslave.cpp \ + irserver.cpp \ +@@ -65,22 +65,22 @@ SOURCES += server.cpp \ + qprocess.cpp \ + qprocess_unix.cpp \ + screensaver.cpp \ +- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \ ++ mediummount/mediumwidget.cc \ + mediadlg.cpp \ + virtualfs.cpp \ + syncaccessmanager.cpp + + +-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate +-DEPENDPATH += $(OPIEDIR)/core/apps/calibrate ++INCLUDEPATH += calibrate ++DEPENDPATH += calibrate + +-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync +-DEPENDPATH += $(OPIEDIR)/rsync ++INCLUDEPATH += $(OPIEDIR)/include rsync ++DEPENDPATH += rsync + +-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount +-DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount ++INCLUDEPATH += mediummount ++DEPENDPATH += mediummount + +-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync -lsysfs ++LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync -lsysfs + TARGET = qpe + + ## not ready for use yet |