author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (side-by-side diff) | |
tree | b89c424de93f541bc80908c93172eb4e601e8c02 /core/launcher/main.cpp | |
parent | c502394063598e63591e06072802f1c5a9e0c266 (diff) | |
download | opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.zip opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.gz opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.bz2 |
Split calibrate out as a standalone application, and ensure taskbar depends
on it. This makes ts debugging easier, having a seperate calibration tool
around, and as a side affect fixes calibration on the C700, which previously
required a reboot to take effect.
-rw-r--r-- | core/launcher/main.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 20a1ecd..e96eeae 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -29,8 +29,9 @@ #include <qpe/custom.h> #endif #include <opie/odevice.h> +#include <opie/oprocess.h> #include <qmessagebox.h> #include <qfile.h> #include <qimage.h> @@ -43,10 +44,8 @@ #include <stdio.h> #include <signal.h> #include <unistd.h> -#include "../calibrate/calibrate.h" - using namespace Opie; void initEnvironment() { @@ -117,12 +116,16 @@ int initApplication( int argc, char ** argv ) Network::createServer(d); if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { if ( !QFile::exists( "/etc/pointercal" ) ) { - // Make sure calibration widget starts on top. - Calibrate *cal = new Calibrate; - cal->exec(); - delete cal; + OProcess cal; + cal << "calibrate"; + + if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { + QMessageBox::warning( 0, "Unable to calibrate", + "Failed to start the calibration tool.\n" + ); + } } } d->show(); |