author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (unidiff) | |
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 | |||
@@ -30,6 +30,7 @@ | |||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include <opie/odevice.h> | 32 | #include <opie/odevice.h> |
33 | #include <opie/oprocess.h> | ||
33 | 34 | ||
34 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
35 | #include <qfile.h> | 36 | #include <qfile.h> |
@@ -44,8 +45,6 @@ | |||
44 | #include <signal.h> | 45 | #include <signal.h> |
45 | #include <unistd.h> | 46 | #include <unistd.h> |
46 | 47 | ||
47 | #include "../calibrate/calibrate.h" | ||
48 | |||
49 | using namespace Opie; | 48 | using namespace Opie; |
50 | 49 | ||
51 | void initEnvironment() | 50 | void initEnvironment() |
@@ -118,10 +117,14 @@ int initApplication( int argc, char ** argv ) | |||
118 | 117 | ||
119 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 118 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
120 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 119 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
121 | // Make sure calibration widget starts on top. | 120 | OProcess cal; |
122 | Calibrate *cal = new Calibrate; | 121 | cal << "calibrate"; |
123 | cal->exec(); | 122 | |
124 | delete cal; | 123 | if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { |
124 | QMessageBox::warning( 0, "Unable to calibrate", | ||
125 | "Failed to start the calibration tool.\n" | ||
126 | ); | ||
127 | } | ||
125 | } | 128 | } |
126 | } | 129 | } |
127 | 130 | ||