-rw-r--r-- | core/launcher/launcher.cpp | 296 | ||||
-rw-r--r-- | core/launcher/packageslave.cpp | 191 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 3 |
3 files changed, 244 insertions, 246 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 6afbcd8..779fe54 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -89,25 +89,25 @@ LauncherTabWidget::LauncherTabWidget( Launcher* parent ) : | |||
89 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); | 89 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); |
90 | categoryBar->setPalette( pal ); | 90 | categoryBar->setPalette( pal ); |
91 | stack = new QWidgetStack(this); | 91 | stack = new QWidgetStack(this); |
92 | connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) ); | 92 | connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) ); |
93 | categoryBar->show(); | 93 | categoryBar->show(); |
94 | stack->show(); | 94 | stack->show(); |
95 | 95 | ||
96 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 96 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
97 | QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); | 97 | QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); |
98 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | 98 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), |
99 | this, SLOT(launcherMessage(const QCString&,const QByteArray&)) ); | 99 | this, SLOT(launcherMessage(const QCString&,const QByteArray&)) ); |
100 | connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), | 100 | connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), |
101 | this, SLOT(appMessage(const QCString&,const QByteArray&))); | 101 | this, SLOT(appMessage(const QCString&,const QByteArray&))); |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | createDocLoadingWidget(); | 104 | createDocLoadingWidget(); |
105 | } | 105 | } |
106 | 106 | ||
107 | void LauncherTabWidget::createDocLoadingWidget() | 107 | void LauncherTabWidget::createDocLoadingWidget() |
108 | { | 108 | { |
109 | // Construct the 'doc loading widget' shown when finding documents | 109 | // Construct the 'doc loading widget' shown when finding documents |
110 | 110 | ||
111 | // ### LauncherView class needs changing to be more generic so | 111 | // ### LauncherView class needs changing to be more generic so |
112 | // this widget can change its background similar to the iconviews | 112 | // this widget can change its background similar to the iconviews |
113 | // so the background for this matches | 113 | // so the background for this matches |
@@ -160,270 +160,270 @@ void LauncherTabWidget::createDocLoadingWidget() | |||
160 | } | 160 | } |
161 | 161 | ||
162 | void LauncherTabWidget::initLayout() | 162 | void LauncherTabWidget::initLayout() |
163 | { | 163 | { |
164 | layout()->activate(); | 164 | layout()->activate(); |
165 | docView()->setFocus(); | 165 | docView()->setFocus(); |
166 | categoryBar->showTab("Documents"); | 166 | categoryBar->showTab("Documents"); |
167 | } | 167 | } |
168 | 168 | ||
169 | void LauncherTabWidget::appMessage(const QCString& message, const QByteArray&) | 169 | void LauncherTabWidget::appMessage(const QCString& message, const QByteArray&) |
170 | { | 170 | { |
171 | if ( message == "nextView()" ) | 171 | if ( message == "nextView()" ) |
172 | categoryBar->nextTab(); | 172 | categoryBar->nextTab(); |
173 | } | 173 | } |
174 | 174 | ||
175 | void LauncherTabWidget::raiseTabWidget() | 175 | void LauncherTabWidget::raiseTabWidget() |
176 | { | 176 | { |
177 | if ( categoryBar->currentView() == docView() | 177 | if ( categoryBar->currentView() == docView() |
178 | && docLoadingWidgetEnabled ) { | 178 | && docLoadingWidgetEnabled ) { |
179 | stack->raiseWidget( docLoadingWidget ); | 179 | stack->raiseWidget( docLoadingWidget ); |
180 | docLoadingWidget->updateGeometry(); | 180 | docLoadingWidget->updateGeometry(); |
181 | } else { | 181 | } else { |
182 | stack->raiseWidget( categoryBar->currentView() ); | 182 | stack->raiseWidget( categoryBar->currentView() ); |
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | void LauncherTabWidget::tabProperties() | 186 | void LauncherTabWidget::tabProperties() |
187 | { | 187 | { |
188 | LauncherView *view = categoryBar->currentView(); | 188 | LauncherView *view = categoryBar->currentView(); |
189 | QPopupMenu *m = new QPopupMenu( this ); | 189 | QPopupMenu *m = new QPopupMenu( this ); |
190 | m->insertItem( tr("Icon View"), LauncherView::Icon ); | 190 | m->insertItem( tr("Icon View"), LauncherView::Icon ); |
191 | m->insertItem( tr("List View"), LauncherView::List ); | 191 | m->insertItem( tr("List View"), LauncherView::List ); |
192 | m->setItemChecked( (int)view->viewMode(), TRUE ); | 192 | m->setItemChecked( (int)view->viewMode(), TRUE ); |
193 | int rv = m->exec( QCursor::pos() ); | 193 | int rv = m->exec( QCursor::pos() ); |
194 | if ( rv >= 0 && rv != view->viewMode() ) { | 194 | if ( rv >= 0 && rv != view->viewMode() ) { |
195 | view->setViewMode( (LauncherView::ViewMode)rv ); | 195 | view->setViewMode( (LauncherView::ViewMode)rv ); |
196 | } | 196 | } |
197 | 197 | ||
198 | delete m; | 198 | delete m; |
199 | } | 199 | } |
200 | 200 | ||
201 | void LauncherTabWidget::deleteView( const QString& id ) | 201 | void LauncherTabWidget::deleteView( const QString& id ) |
202 | { | 202 | { |
203 | LauncherTab *t = categoryBar->launcherTab(id); | 203 | LauncherTab *t = categoryBar->launcherTab(id); |
204 | if ( t ) { | 204 | if ( t ) { |
205 | stack->removeWidget( t->view ); | 205 | stack->removeWidget( t->view ); |
206 | delete t->view; | 206 | delete t->view; |
207 | categoryBar->removeTab( t ); | 207 | categoryBar->removeTab( t ); |
208 | } | 208 | } |
209 | } | 209 | } |
210 | 210 | ||
211 | LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label ) | 211 | LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label ) |
212 | { | 212 | { |
213 | LauncherView* view = new LauncherView( stack ); | 213 | LauncherView* view = new LauncherView( stack ); |
214 | connect( view, SIGNAL(clicked(const AppLnk*)), | 214 | connect( view, SIGNAL(clicked(const AppLnk*)), |
215 | this, SIGNAL(clicked(const AppLnk*))); | 215 | this, SIGNAL(clicked(const AppLnk*))); |
216 | connect( view, SIGNAL(rightPressed(AppLnk*)), | 216 | connect( view, SIGNAL(rightPressed(AppLnk*)), |
217 | this, SIGNAL(rightPressed(AppLnk*))); | 217 | this, SIGNAL(rightPressed(AppLnk*))); |
218 | 218 | ||
219 | int n = categoryBar->count(); | 219 | int n = categoryBar->count(); |
220 | stack->addWidget( view, n ); | 220 | stack->addWidget( view, n ); |
221 | 221 | ||
222 | LauncherTab *tab = new LauncherTab( id, view, pm, label ); | 222 | LauncherTab *tab = new LauncherTab( id, view, pm, label ); |
223 | categoryBar->insertTab( tab, n-1 ); | 223 | categoryBar->insertTab( tab, n-1 ); |
224 | 224 | ||
225 | if ( id == "Documents" ) | 225 | if ( id == "Documents" ) |
226 | docview = view; | 226 | docview = view; |
227 | 227 | ||
228 | odebug << "inserting " << id << " at " << n-1 << "" << oendl; | 228 | odebug << "inserting " << id << " at " << n-1 << "" << oendl; |
229 | 229 | ||
230 | Config cfg("Launcher"); | 230 | Config cfg("Launcher"); |
231 | setTabAppearance( tab, cfg ); | 231 | setTabAppearance( tab, cfg ); |
232 | 232 | ||
233 | cfg.setGroup( "GUI" ); | 233 | cfg.setGroup( "GUI" ); |
234 | view->setBusyIndicatorType( cfg.readEntry( "BusyType", QString::null ) ); | 234 | view->setBusyIndicatorType( cfg.readEntry( "BusyType", QString::null ) ); |
235 | 235 | ||
236 | return view; | 236 | return view; |
237 | } | 237 | } |
238 | 238 | ||
239 | LauncherView *LauncherTabWidget::view( const QString &id ) | 239 | LauncherView *LauncherTabWidget::view( const QString &id ) |
240 | { | 240 | { |
241 | LauncherTab *t = categoryBar->launcherTab(id); | 241 | LauncherTab *t = categoryBar->launcherTab(id); |
242 | if ( !t ) | 242 | if ( !t ) |
243 | return 0; | 243 | return 0; |
244 | return t->view; | 244 | return t->view; |
245 | } | 245 | } |
246 | 246 | ||
247 | LauncherView *LauncherTabWidget::docView() | 247 | LauncherView *LauncherTabWidget::docView() |
248 | { | 248 | { |
249 | return docview; | 249 | return docview; |
250 | } | 250 | } |
251 | 251 | ||
252 | void LauncherTabWidget::setLoadingWidgetEnabled( bool v ) | 252 | void LauncherTabWidget::setLoadingWidgetEnabled( bool v ) |
253 | { | 253 | { |
254 | if ( v != docLoadingWidgetEnabled && docLoadingWidget ) { | 254 | if ( v != docLoadingWidgetEnabled && docLoadingWidget ) { |
255 | docLoadingWidgetEnabled = v; | 255 | docLoadingWidgetEnabled = v; |
256 | raiseTabWidget(); | 256 | raiseTabWidget(); |
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||
260 | void LauncherTabWidget::setLoadingProgress( int percent ) | 260 | void LauncherTabWidget::setLoadingProgress( int percent ) |
261 | { | 261 | { |
262 | docLoadingWidgetProgress->setProgress( (percent / 4) * 4 ); | 262 | docLoadingWidgetProgress->setProgress( (percent / 4) * 4 ); |
263 | } | 263 | } |
264 | 264 | ||
265 | // ### this function could more to LauncherView | 265 | // ### this function could more to LauncherView |
266 | void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg ) | 266 | void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg ) |
267 | { | 267 | { |
268 | // View | 268 | // View |
269 | QString view = cfg.readEntry( "View", "Icon" ); | 269 | QString view = cfg.readEntry( "View", "Icon" ); |
270 | if ( view == "List" ) // No tr | 270 | if ( view == "List" ) // No tr |
271 | v->setViewMode( LauncherView::List ); | 271 | v->setViewMode( LauncherView::List ); |
272 | QString bgType = cfg.readEntry( "BackgroundType", "Image" ); | 272 | QString bgType = cfg.readEntry( "BackgroundType", "Image" ); |
273 | if ( bgType == "Image" ) { // No tr | 273 | if ( bgType == "Image" ) { // No tr |
274 | QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" ); | 274 | QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" ); |
275 | v->setBackgroundType( LauncherView::Image, pm ); | 275 | v->setBackgroundType( LauncherView::Image, pm ); |
276 | } else if ( bgType == "SolidColor" ) { | 276 | } else if ( bgType == "SolidColor" ) { |
277 | QString c = cfg.readEntry( "BackgroundColor" ); | 277 | QString c = cfg.readEntry( "BackgroundColor" ); |
278 | v->setBackgroundType( LauncherView::SolidColor, c ); | 278 | v->setBackgroundType( LauncherView::SolidColor, c ); |
279 | } else { | 279 | } else { |
280 | v->setBackgroundType( LauncherView::Ruled, QString::null ); | 280 | v->setBackgroundType( LauncherView::Ruled, QString::null ); |
281 | } | 281 | } |
282 | QString textCol = cfg.readEntry( "TextColor" ); | 282 | QString textCol = cfg.readEntry( "TextColor" ); |
283 | if ( textCol.isEmpty() ) | 283 | if ( textCol.isEmpty() ) |
284 | v->setTextColor( QColor() ); | 284 | v->setTextColor( QColor() ); |
285 | else | 285 | else |
286 | v->setTextColor( QColor(textCol) ); | 286 | v->setTextColor( QColor(textCol) ); |
287 | // bool customFont = cfg.readBoolEntry( "CustomFont", FALSE ); | 287 | // bool customFont = cfg.readBoolEntry( "CustomFont", FALSE ); |
288 | 288 | ||
289 | 289 | ||
290 | QStringList font = cfg.readListEntry( "Font", ',' ); | 290 | QStringList font = cfg.readListEntry( "Font", ',' ); |
291 | if ( font.count() == 4 ) | 291 | if ( font.count() == 4 ) |
292 | v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) ); | 292 | v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) ); |
293 | 293 | ||
294 | // ### FIXME TabColor TabTextColor | 294 | // ### FIXME TabColor TabTextColor |
295 | 295 | ||
296 | } | 296 | } |
297 | 297 | ||
298 | // ### Could move to LauncherTab | 298 | // ### Could move to LauncherTab |
299 | void LauncherTabWidget::setTabAppearance( LauncherTab *tab, Config &cfg ) | 299 | void LauncherTabWidget::setTabAppearance( LauncherTab *tab, Config &cfg ) |
300 | { | 300 | { |
301 | cfg.setGroup( QString( "Tab %1" ).arg(tab->type) ); // No tr | 301 | cfg.setGroup( QString( "Tab %1" ).arg(tab->type) ); // No tr |
302 | 302 | ||
303 | setTabViewAppearance( tab->view, cfg ); | 303 | setTabViewAppearance( tab->view, cfg ); |
304 | 304 | ||
305 | // Tabs | 305 | // Tabs |
306 | QString tabCol = cfg.readEntry( "TabColor" ); | 306 | QString tabCol = cfg.readEntry( "TabColor" ); |
307 | if ( tabCol.isEmpty() ) | 307 | if ( tabCol.isEmpty() ) |
308 | tab->bgColor = QColor(); | 308 | tab->bgColor = QColor(); |
309 | else | 309 | else |
310 | tab->bgColor = QColor(tabCol); | 310 | tab->bgColor = QColor(tabCol); |
311 | QString tabTextCol = cfg.readEntry( "TabTextColor" ); | 311 | QString tabTextCol = cfg.readEntry( "TabTextColor" ); |
312 | if ( tabTextCol.isEmpty() ) | 312 | if ( tabTextCol.isEmpty() ) |
313 | tab->fgColor = QColor(); | 313 | tab->fgColor = QColor(); |
314 | else | 314 | else |
315 | tab->fgColor = QColor(tabTextCol); | 315 | tab->fgColor = QColor(tabTextCol); |
316 | } | 316 | } |
317 | 317 | ||
318 | void LauncherTabWidget::paletteChange( const QPalette &p ) | 318 | void LauncherTabWidget::paletteChange( const QPalette &p ) |
319 | { | 319 | { |
320 | QVBox::paletteChange( p ); | 320 | QVBox::paletteChange( p ); |
321 | QPalette pal = palette(); | 321 | QPalette pal = palette(); |
322 | pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) ); | 322 | pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) ); |
323 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); | 323 | pal.setColor( QColorGroup::Background, pal.active().background().light(110) ); |
324 | categoryBar->setPalette( pal ); | 324 | categoryBar->setPalette( pal ); |
325 | categoryBar->update(); | 325 | categoryBar->update(); |
326 | } | 326 | } |
327 | 327 | ||
328 | void LauncherTabWidget::styleChange( QStyle & ) | 328 | void LauncherTabWidget::styleChange( QStyle & ) |
329 | { | 329 | { |
330 | QTimer::singleShot( 0, this, SLOT(setProgressStyle()) ); | 330 | QTimer::singleShot( 0, this, SLOT(setProgressStyle()) ); |
331 | } | 331 | } |
332 | 332 | ||
333 | void LauncherTabWidget::setProgressStyle() | 333 | void LauncherTabWidget::setProgressStyle() |
334 | { | 334 | { |
335 | if (docLoadingWidgetProgress) { | 335 | if (docLoadingWidgetProgress) { |
336 | docLoadingWidgetProgress->setFrameShape( QProgressBar::Box ); | 336 | docLoadingWidgetProgress->setFrameShape( QProgressBar::Box ); |
337 | docLoadingWidgetProgress->setFrameShadow( QProgressBar::Plain ); | 337 | docLoadingWidgetProgress->setFrameShadow( QProgressBar::Plain ); |
338 | docLoadingWidgetProgress->setMargin( 1 ); | 338 | docLoadingWidgetProgress->setMargin( 1 ); |
339 | docLoadingWidgetProgress->setLineWidth( 1 ); | 339 | docLoadingWidgetProgress->setLineWidth( 1 ); |
340 | } | 340 | } |
341 | } | 341 | } |
342 | 342 | ||
343 | void LauncherTabWidget::setBusy(bool on) | 343 | void LauncherTabWidget::setBusy(bool on) |
344 | { | 344 | { |
345 | if ( on ) | 345 | if ( on ) |
346 | currentView()->setBusy(TRUE); | 346 | currentView()->setBusy(TRUE); |
347 | else { | 347 | else { |
348 | for ( int i = 0; i < categoryBar->count(); i++ ) { | 348 | for ( int i = 0; i < categoryBar->count(); i++ ) { |
349 | LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view; | 349 | LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view; |
350 | view->setBusy( FALSE ); | 350 | view->setBusy( FALSE ); |
351 | } | 351 | } |
352 | } | 352 | } |
353 | } | 353 | } |
354 | 354 | ||
355 | void LauncherTabWidget::setBusyIndicatorType( const QString& str ) { | 355 | void LauncherTabWidget::setBusyIndicatorType( const QString& str ) { |
356 | for (int i = 0; i < categoryBar->count(); i++ ) { | 356 | for (int i = 0; i < categoryBar->count(); i++ ) { |
357 | LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view; | 357 | LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view; |
358 | view->setBusyIndicatorType( str ); | 358 | view->setBusyIndicatorType( str ); |
359 | } | 359 | } |
360 | } | 360 | } |
361 | 361 | ||
362 | LauncherView *LauncherTabWidget::currentView(void) | 362 | LauncherView *LauncherTabWidget::currentView(void) |
363 | { | 363 | { |
364 | return (LauncherView*)stack->visibleWidget(); | 364 | return (LauncherView*)stack->visibleWidget(); |
365 | } | 365 | } |
366 | 366 | ||
367 | 367 | ||
368 | 368 | ||
369 | void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &data) | 369 | void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &data) |
370 | { | 370 | { |
371 | QDataStream stream( data, IO_ReadOnly ); | 371 | QDataStream stream( data, IO_ReadOnly ); |
372 | if ( msg == "setTabView(QString,int)" ) { | 372 | if ( msg == "setTabView(QString,int)" ) { |
373 | QString id; | 373 | QString id; |
374 | stream >> id; | 374 | stream >> id; |
375 | int mode; | 375 | int mode; |
376 | stream >> mode; | 376 | stream >> mode; |
377 | if ( view(id) ) | 377 | if ( view(id) ) |
378 | view(id)->setViewMode( (LauncherView::ViewMode)mode ); | 378 | view(id)->setViewMode( (LauncherView::ViewMode)mode ); |
379 | } else if ( msg == "setTabBackground(QString,int,QString)" ) { | 379 | } else if ( msg == "setTabBackground(QString,int,QString)" ) { |
380 | QString id; | 380 | QString id; |
381 | stream >> id; | 381 | stream >> id; |
382 | int mode; | 382 | int mode; |
383 | stream >> mode; | 383 | stream >> mode; |
384 | QString pixmapOrColor; | 384 | QString pixmapOrColor; |
385 | stream >> pixmapOrColor; | 385 | stream >> pixmapOrColor; |
386 | if ( view(id) ) | 386 | if ( view(id) ) |
387 | view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor ); | 387 | view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor ); |
388 | if ( id == "Documents" ) | 388 | if ( id == "Documents" ) |
389 | docLoadingWidget->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor ); | 389 | docLoadingWidget->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor ); |
390 | } else if ( msg == "setTextColor(QString,QString)" ) { | 390 | } else if ( msg == "setTextColor(QString,QString)" ) { |
391 | QString id; | 391 | QString id; |
392 | stream >> id; | 392 | stream >> id; |
393 | QString color; | 393 | QString color; |
394 | stream >> color; | 394 | stream >> color; |
395 | if ( view(id) ) | 395 | if ( view(id) ) |
396 | view(id)->setTextColor( QColor(color) ); | 396 | view(id)->setTextColor( QColor(color) ); |
397 | if ( id == "Documents" ) | 397 | if ( id == "Documents" ) |
398 | docLoadingWidget->setTextColor( QColor(color) ); | 398 | docLoadingWidget->setTextColor( QColor(color) ); |
399 | } else if ( msg == "setFont(QString,QString,int,int,int)" ) { | 399 | } else if ( msg == "setFont(QString,QString,int,int,int)" ) { |
400 | QString id; | 400 | QString id; |
401 | stream >> id; | 401 | stream >> id; |
402 | QString fam; | 402 | QString fam; |
403 | stream >> fam; | 403 | stream >> fam; |
404 | int size; | 404 | int size; |
405 | stream >> size; | 405 | stream >> size; |
406 | int weight; | 406 | int weight; |
407 | stream >> weight; | 407 | stream >> weight; |
408 | int italic; | 408 | int italic; |
409 | stream >> italic; | 409 | stream >> italic; |
410 | if ( view(id) ) { | 410 | if ( view(id) ) { |
411 | if ( !fam.isEmpty() ) { | 411 | if ( !fam.isEmpty() ) { |
412 | view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); | 412 | view(id)->setViewFont( QFont(fam, size, weight, italic!=0) ); |
413 | odebug << "setFont: " << fam << ", " << size << ", " << weight << ", " << italic << "" << oendl; | 413 | odebug << "setFont: " << fam << ", " << size << ", " << weight << ", " << italic << "" << oendl; |
414 | } else { | 414 | } else { |
415 | view(id)->clearViewFont(); | 415 | view(id)->clearViewFont(); |
416 | } | 416 | } |
417 | } | 417 | } |
418 | }else if ( msg == "setBusyIndicatorType(QString)" ) { | 418 | }else if ( msg == "setBusyIndicatorType(QString)" ) { |
419 | QString type; | 419 | QString type; |
420 | stream >> type; | 420 | stream >> type; |
421 | setBusyIndicatorType( type ); | 421 | setBusyIndicatorType( type ); |
422 | }else if ( msg == "home()" ) { | 422 | }else if ( msg == "home()" ) { |
423 | if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) { | 423 | if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) { |
424 | if (categoryBar) | 424 | if (categoryBar) |
425 | categoryBar->nextTab(); | 425 | categoryBar->nextTab(); |
426 | }else | 426 | }else |
427 | static_cast<QWidget*>(parent())->raise(); | 427 | static_cast<QWidget*>(parent())->raise(); |
428 | } | 428 | } |
429 | } | 429 | } |
@@ -455,55 +455,55 @@ void Launcher::createGUI() | |||
455 | 455 | ||
456 | ServerInterface::dockWidget( tb, ServerInterface::Bottom ); | 456 | ServerInterface::dockWidget( tb, ServerInterface::Bottom ); |
457 | tb->show(); | 457 | tb->show(); |
458 | 458 | ||
459 | qApp->installEventFilter( this ); | 459 | qApp->installEventFilter( this ); |
460 | 460 | ||
461 | 461 | ||
462 | connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) ); | 462 | connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) ); |
463 | connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) ); | 463 | connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) ); |
464 | connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) ); | 464 | connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) ); |
465 | 465 | ||
466 | connect( tb, SIGNAL(tabSelected(const QString&)), | 466 | connect( tb, SIGNAL(tabSelected(const QString&)), |
467 | this, SLOT(showTab(const QString&)) ); | 467 | this, SLOT(showTab(const QString&)) ); |
468 | connect( tabs, SIGNAL(selected(const QString&)), | 468 | connect( tabs, SIGNAL(selected(const QString&)), |
469 | this, SLOT(viewSelected(const QString&)) ); | 469 | this, SLOT(viewSelected(const QString&)) ); |
470 | connect( tabs, SIGNAL(clicked(const AppLnk*)), | 470 | connect( tabs, SIGNAL(clicked(const AppLnk*)), |
471 | this, SLOT(select(const AppLnk*))); | 471 | this, SLOT(select(const AppLnk*))); |
472 | connect( tabs, SIGNAL(rightPressed(AppLnk*)), | 472 | connect( tabs, SIGNAL(rightPressed(AppLnk*)), |
473 | this, SLOT(properties(AppLnk*))); | 473 | this, SLOT(properties(AppLnk*))); |
474 | 474 | ||
475 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 475 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
476 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); | 476 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); |
477 | connect( sysChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 477 | connect( sysChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
478 | this, SLOT(systemMessage(const QCString&,const QByteArray&)) ); | 478 | this, SLOT(systemMessage(const QCString&,const QByteArray&)) ); |
479 | #endif | 479 | #endif |
480 | 480 | ||
481 | // all documents | 481 | // all documents |
482 | QImage img( Resource::loadImage( "DocsIcon" ) ); | 482 | QImage img( Resource::loadImage( "DocsIcon" ) ); |
483 | QPixmap pm; | 483 | QPixmap pm; |
484 | pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 484 | pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
485 | // It could add this itself if it handles docs | 485 | // It could add this itself if it handles docs |
486 | 486 | ||
487 | tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE ); | 487 | tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE ); |
488 | 488 | ||
489 | QTimer::singleShot( 0, tabs, SLOT( initLayout() ) ); | 489 | QTimer::singleShot( 0, tabs, SLOT( initLayout() ) ); |
490 | qApp->setMainWidget( this ); | 490 | qApp->setMainWidget( this ); |
491 | QTimer::singleShot( 500, this, SLOT( makeVisible() ) ); | 491 | QTimer::singleShot( 500, this, SLOT( makeVisible() ) ); |
492 | } | 492 | } |
493 | 493 | ||
494 | Launcher::~Launcher() | 494 | Launcher::~Launcher() |
495 | { | 495 | { |
496 | if ( tb ) | 496 | if ( tb ) |
497 | destroyGUI(); | 497 | destroyGUI(); |
498 | } | 498 | } |
499 | 499 | ||
500 | bool Launcher::requiresDocuments() const | 500 | bool Launcher::requiresDocuments() const |
501 | { | 501 | { |
502 | Config cfg( "Launcher" ); | 502 | Config cfg( "Launcher" ); |
503 | cfg.setGroup( "DocTab" ); | 503 | cfg.setGroup( "DocTab" ); |
504 | return cfg.readBoolEntry( "Enable", true ); | 504 | return cfg.readBoolEntry( "Enable", true ); |
505 | } | 505 | } |
506 | 506 | ||
507 | void Launcher::makeVisible() | 507 | void Launcher::makeVisible() |
508 | { | 508 | { |
509 | showMaximized(); | 509 | showMaximized(); |
@@ -512,35 +512,35 @@ void Launcher::makeVisible() | |||
512 | void Launcher::destroyGUI() | 512 | void Launcher::destroyGUI() |
513 | { | 513 | { |
514 | delete tb; | 514 | delete tb; |
515 | tb = 0; | 515 | tb = 0; |
516 | delete tabs; | 516 | delete tabs; |
517 | tabs =0; | 517 | tabs =0; |
518 | } | 518 | } |
519 | 519 | ||
520 | bool Launcher::eventFilter( QObject*, QEvent *ev ) | 520 | bool Launcher::eventFilter( QObject*, QEvent *ev ) |
521 | { | 521 | { |
522 | #ifdef QT_QWS_CUSTOM | 522 | #ifdef QT_QWS_CUSTOM |
523 | if ( ev->type() == QEvent::KeyPress ) { | 523 | if ( ev->type() == QEvent::KeyPress ) { |
524 | QKeyEvent *ke = (QKeyEvent *)ev; | 524 | QKeyEvent *ke = (QKeyEvent *)ev; |
525 | if ( ke->key() == Qt::Key_F11 ) { // menu key | 525 | if ( ke->key() == Qt::Key_F11 ) { // menu key |
526 | QWidget *active = qApp->activeWindow(); | 526 | QWidget *active = qApp->activeWindow(); |
527 | if ( active && active->isPopup() ) | 527 | if ( active && active->isPopup() ) |
528 | active->close(); | 528 | active->close(); |
529 | else { | 529 | else { |
530 | Global::terminateBuiltin("calibrate"); // No tr | 530 | Global::terminateBuiltin("calibrate"); // No tr |
531 | tb->launchStartMenu(); | 531 | tb->launchStartMenu(); |
532 | } | 532 | } |
533 | return TRUE; | 533 | return TRUE; |
534 | } | 534 | } |
535 | } | 535 | } |
536 | #else | 536 | #else |
537 | Q_UNUSED(ev); | 537 | Q_UNUSED(ev); |
538 | #endif | 538 | #endif |
539 | return FALSE; | 539 | return FALSE; |
540 | } | 540 | } |
541 | 541 | ||
542 | void Launcher::toggleSymbolInput() | 542 | void Launcher::toggleSymbolInput() |
543 | { | 543 | { |
544 | tb->toggleSymbolInput(); | 544 | tb->toggleSymbolInput(); |
545 | } | 545 | } |
546 | 546 | ||
@@ -551,153 +551,153 @@ void Launcher::toggleNumLockState() | |||
551 | 551 | ||
552 | void Launcher::toggleCapsLockState() | 552 | void Launcher::toggleCapsLockState() |
553 | { | 553 | { |
554 | tb->toggleCapsLockState(); | 554 | tb->toggleCapsLockState(); |
555 | } | 555 | } |
556 | 556 | ||
557 | static bool isVisibleWindow(int wid) | 557 | static bool isVisibleWindow(int wid) |
558 | { | 558 | { |
559 | #ifdef Q_WS_QWS | 559 | #ifdef Q_WS_QWS |
560 | const QList<QWSWindow> &list = qwsServer->clientWindows(); | 560 | const QList<QWSWindow> &list = qwsServer->clientWindows(); |
561 | QWSWindow* w; | 561 | QWSWindow* w; |
562 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { | 562 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { |
563 | if ( w->winId() == wid ) | 563 | if ( w->winId() == wid ) |
564 | return !w->isFullyObscured(); | 564 | return !w->isFullyObscured(); |
565 | } | 565 | } |
566 | #endif | 566 | #endif |
567 | return FALSE; | 567 | return FALSE; |
568 | } | 568 | } |
569 | 569 | ||
570 | void Launcher::viewSelected(const QString& s) | 570 | void Launcher::viewSelected(const QString& s) |
571 | { | 571 | { |
572 | setCaption( s + tr(" - Launcher") ); | 572 | setCaption( s + tr(" - Launcher") ); |
573 | } | 573 | } |
574 | 574 | ||
575 | void Launcher::showTab(const QString& id) | 575 | void Launcher::showTab(const QString& id) |
576 | { | 576 | { |
577 | tabs->categoryBar->showTab(id); | 577 | tabs->categoryBar->showTab(id); |
578 | raise(); | 578 | raise(); |
579 | } | 579 | } |
580 | 580 | ||
581 | void Launcher::select( const AppLnk *appLnk ) | 581 | void Launcher::select( const AppLnk *appLnk ) |
582 | { | 582 | { |
583 | if ( appLnk->type() == "Folder" ) { // No tr | 583 | if ( appLnk->type() == "Folder" ) { // No tr |
584 | // Not supported: flat is simpler for the user | 584 | // Not supported: flat is simpler for the user |
585 | } else { | 585 | } else { |
586 | if ( appLnk->exec().isNull() ) { | 586 | if ( appLnk->exec().isNull() ) { |
587 | int i = QMessageBox::information(this,tr("No application"), | 587 | int i = QMessageBox::information(this,tr("No application"), |
588 | tr("<p>No application is defined for this document." | 588 | tr("<p>No application is defined for this document." |
589 | "<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1); | 589 | "<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1); |
590 | 590 | ||
591 | /* ### Fixme */ | 591 | /* ### Fixme */ |
592 | if ( i == 1 ) | 592 | if ( i == 1 ) |
593 | Global::execute("textedit",appLnk->file()); | 593 | Global::execute("textedit",appLnk->file()); |
594 | 594 | ||
595 | return; | 595 | return; |
596 | } | 596 | } |
597 | tabs->setBusy(TRUE); | 597 | tabs->setBusy(TRUE); |
598 | emit executing( appLnk ); | 598 | emit executing( appLnk ); |
599 | appLnk->execute(); | 599 | appLnk->execute(); |
600 | } | 600 | } |
601 | } | 601 | } |
602 | 602 | ||
603 | void Launcher::properties( AppLnk *appLnk ) | 603 | void Launcher::properties( AppLnk *appLnk ) |
604 | { | 604 | { |
605 | if ( appLnk->type() == "Folder" ) { // No tr | 605 | if ( appLnk->type() == "Folder" ) { // No tr |
606 | // Not supported: flat is simpler for the user | 606 | // Not supported: flat is simpler for the user |
607 | } else { | 607 | } else { |
608 | /* ### libqtopia FIXME also moving docLnks... */ | 608 | /* ### libqtopia FIXME also moving docLnks... */ |
609 | LnkProperties prop(appLnk,0 ); | 609 | LnkProperties prop(appLnk,0 ); |
610 | 610 | ||
611 | QPEApplication::execDialog( &prop ); | 611 | QPEApplication::execDialog( &prop ); |
612 | } | 612 | } |
613 | } | 613 | } |
614 | 614 | ||
615 | void Launcher::storageChanged( const QList<FileSystem> &fs ) | 615 | void Launcher::storageChanged( const QList<FileSystem> &fs ) |
616 | { | 616 | { |
617 | // ### update combo boxes if we had a combo box for the storage type | 617 | // ### update combo boxes if we had a combo box for the storage type |
618 | } | 618 | } |
619 | 619 | ||
620 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | 620 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) |
621 | { | 621 | { |
622 | QDataStream stream( data, IO_ReadOnly ); | 622 | QDataStream stream( data, IO_ReadOnly ); |
623 | if ( msg == "busy()" ) { | 623 | if ( msg == "busy()" ) { |
624 | tb->startWait(); | 624 | tb->startWait(); |
625 | } else if ( msg == "notBusy(QString)" ) { | 625 | } else if ( msg == "notBusy(QString)" ) { |
626 | QString app; | 626 | QString app; |
627 | stream >> app; | 627 | stream >> app; |
628 | tabs->setBusy(FALSE); | 628 | tabs->setBusy(FALSE); |
629 | tb->stopWait(app); | 629 | tb->stopWait(app); |
630 | } else if (msg == "applyStyle()") { | 630 | } else if (msg == "applyStyle()") { |
631 | tabs->currentView()->relayout(); | 631 | tabs->currentView()->relayout(); |
632 | } | 632 | } |
633 | } | 633 | } |
634 | 634 | ||
635 | // These are the update functions from the server | 635 | // These are the update functions from the server |
636 | void Launcher::typeAdded( const QString& type, const QString& name, | 636 | void Launcher::typeAdded( const QString& type, const QString& name, |
637 | const QPixmap& pixmap, const QPixmap& ) | 637 | const QPixmap& pixmap, const QPixmap& ) |
638 | { | 638 | { |
639 | tabs->newView( type, pixmap, name ); | 639 | tabs->newView( type, pixmap, name ); |
640 | ids.append( type ); | 640 | ids.append( type ); |
641 | /* this will be called in applicationScanningProgress with value 100! */ | 641 | /* this will be called in applicationScanningProgress with value 100! */ |
642 | // tb->refreshStartMenu(); | 642 | // tb->refreshStartMenu(); |
643 | 643 | ||
644 | static bool first = TRUE; | 644 | static bool first = TRUE; |
645 | if ( first ) { | 645 | if ( first ) { |
646 | first = FALSE; | 646 | first = FALSE; |
647 | tabs->categoryBar->showTab(type); | 647 | tabs->categoryBar->showTab(type); |
648 | } | 648 | } |
649 | 649 | ||
650 | tabs->view( type )->setUpdatesEnabled( FALSE ); | 650 | tabs->view( type )->setUpdatesEnabled( FALSE ); |
651 | tabs->view( type )->setSortEnabled( FALSE ); | 651 | tabs->view( type )->setSortEnabled( FALSE ); |
652 | } | 652 | } |
653 | 653 | ||
654 | void Launcher::typeRemoved( const QString& type ) | 654 | void Launcher::typeRemoved( const QString& type ) |
655 | { | 655 | { |
656 | tabs->view( type )->removeAllItems(); | 656 | tabs->view( type )->removeAllItems(); |
657 | tabs->deleteView( type ); | 657 | tabs->deleteView( type ); |
658 | ids.remove( type ); | 658 | ids.remove( type ); |
659 | /* this will be called in applicationScanningProgress with value 100! */ | 659 | /* this will be called in applicationScanningProgress with value 100! */ |
660 | // tb->refreshStartMenu(); | 660 | // tb->refreshStartMenu(); |
661 | } | 661 | } |
662 | 662 | ||
663 | void Launcher::applicationAdded( const QString& type, const AppLnk& app ) | 663 | void Launcher::applicationAdded( const QString& type, const AppLnk& app ) |
664 | { | 664 | { |
665 | if ( app.type() == "Separator" ) // No tr | 665 | if ( app.type() == "Separator" ) // No tr |
666 | return; | 666 | return; |
667 | 667 | ||
668 | LauncherView *view = tabs->view( type ); | 668 | LauncherView *view = tabs->view( type ); |
669 | if ( view ) | 669 | if ( view ) |
670 | view->addItem( new AppLnk( app ), FALSE ); | 670 | view->addItem( new AppLnk( app ), FALSE ); |
671 | else | 671 | else |
672 | qWarning("addAppLnk: No view for type %s. Can't add app %s!", | 672 | owarn << "addAppLnk: No view for type " << type.latin1() << ". Can't add app " |
673 | type.latin1(),app.name().latin1() ); | 673 | << app.name().latin1() << "!", |
674 | 674 | ||
675 | MimeType::registerApp( app ); | 675 | MimeType::registerApp( app ); |
676 | } | 676 | } |
677 | 677 | ||
678 | void Launcher::applicationRemoved( const QString& type, const AppLnk& app ) | 678 | void Launcher::applicationRemoved( const QString& type, const AppLnk& app ) |
679 | { | 679 | { |
680 | LauncherView *view = tabs->view( type ); | 680 | LauncherView *view = tabs->view( type ); |
681 | if ( view ) | 681 | if ( view ) |
682 | view->removeLink( app.linkFile() ); | 682 | view->removeLink( app.linkFile() ); |
683 | else | 683 | else |
684 | owarn << "removeAppLnk: No view for " << type << "!" << oendl; | 684 | owarn << "removeAppLnk: No view for " << type << "!" << oendl; |
685 | } | 685 | } |
686 | 686 | ||
687 | void Launcher::allApplicationsRemoved() | 687 | void Launcher::allApplicationsRemoved() |
688 | { | 688 | { |
689 | MimeType::clear(); | 689 | MimeType::clear(); |
690 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) | 690 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) |
691 | tabs->view( (*it) )->removeAllItems(); | 691 | tabs->view( (*it) )->removeAllItems(); |
692 | } | 692 | } |
693 | 693 | ||
694 | void Launcher::documentAdded( const DocLnk& doc ) | 694 | void Launcher::documentAdded( const DocLnk& doc ) |
695 | { | 695 | { |
696 | tabs->docView()->addItem( new DocLnk( doc ), FALSE ); | 696 | tabs->docView()->addItem( new DocLnk( doc ), FALSE ); |
697 | } | 697 | } |
698 | 698 | ||
699 | void Launcher::aboutToAddBegin() | 699 | void Launcher::aboutToAddBegin() |
700 | { | 700 | { |
701 | tabs->docView()->setUpdatesEnabled( false ); | 701 | tabs->docView()->setUpdatesEnabled( false ); |
702 | } | 702 | } |
703 | 703 | ||
@@ -705,25 +705,25 @@ void Launcher::aboutToAddEnd() | |||
705 | { | 705 | { |
706 | tabs->docView()->setUpdatesEnabled( true ); | 706 | tabs->docView()->setUpdatesEnabled( true ); |
707 | } | 707 | } |
708 | 708 | ||
709 | void Launcher::showLoadingDocs() | 709 | void Launcher::showLoadingDocs() |
710 | { | 710 | { |
711 | tabs->docView()->hide(); | 711 | tabs->docView()->hide(); |
712 | } | 712 | } |
713 | 713 | ||
714 | void Launcher::showDocTab() | 714 | void Launcher::showDocTab() |
715 | { | 715 | { |
716 | if ( tabs->categoryBar->currentView() == tabs->docView() ) | 716 | if ( tabs->categoryBar->currentView() == tabs->docView() ) |
717 | tabs->docView()->show(); | 717 | tabs->docView()->show(); |
718 | } | 718 | } |
719 | 719 | ||
720 | void Launcher::documentRemoved( const DocLnk& doc ) | 720 | void Launcher::documentRemoved( const DocLnk& doc ) |
721 | { | 721 | { |
722 | tabs->docView()->removeLink( doc.linkFile() ); | 722 | tabs->docView()->removeLink( doc.linkFile() ); |
723 | } | 723 | } |
724 | 724 | ||
725 | void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc ) | 725 | void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc ) |
726 | { | 726 | { |
727 | documentRemoved( oldDoc ); | 727 | documentRemoved( oldDoc ); |
728 | documentAdded( newDoc ); | 728 | documentAdded( newDoc ); |
729 | } | 729 | } |
@@ -733,54 +733,54 @@ void Launcher::allDocumentsRemoved() | |||
733 | tabs->docView()->removeAllItems(); | 733 | tabs->docView()->removeAllItems(); |
734 | } | 734 | } |
735 | 735 | ||
736 | void Launcher::applicationStateChanged( const QString& name, ApplicationState state ) | 736 | void Launcher::applicationStateChanged( const QString& name, ApplicationState state ) |
737 | { | 737 | { |
738 | tb->setApplicationState( name, state ); | 738 | tb->setApplicationState( name, state ); |
739 | } | 739 | } |
740 | 740 | ||
741 | void Launcher::applicationScanningProgress( int percent ) | 741 | void Launcher::applicationScanningProgress( int percent ) |
742 | { | 742 | { |
743 | switch ( percent ) { | 743 | switch ( percent ) { |
744 | case 0: { | 744 | case 0: { |
745 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) { | 745 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) { |
746 | tabs->view( (*it) )->setUpdatesEnabled( FALSE ); | 746 | tabs->view( (*it) )->setUpdatesEnabled( FALSE ); |
747 | tabs->view( (*it) )->setSortEnabled( FALSE ); | 747 | tabs->view( (*it) )->setSortEnabled( FALSE ); |
748 | } | 748 | } |
749 | break; | 749 | break; |
750 | } | 750 | } |
751 | case 100: { | 751 | case 100: { |
752 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) { | 752 | for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) { |
753 | tabs->view( (*it) )->setUpdatesEnabled( TRUE ); | 753 | tabs->view( (*it) )->setUpdatesEnabled( TRUE ); |
754 | tabs->view( (*it) )->setSortEnabled( TRUE ); | 754 | tabs->view( (*it) )->setSortEnabled( TRUE ); |
755 | } | 755 | } |
756 | tb->refreshStartMenu(); | 756 | tb->refreshStartMenu(); |
757 | break; | 757 | break; |
758 | } | 758 | } |
759 | default: | 759 | default: |
760 | break; | 760 | break; |
761 | } | 761 | } |
762 | } | 762 | } |
763 | 763 | ||
764 | void Launcher::documentScanningProgress( int percent ) | 764 | void Launcher::documentScanningProgress( int percent ) |
765 | { | 765 | { |
766 | switch ( percent ) { | 766 | switch ( percent ) { |
767 | case 0: { | 767 | case 0: { |
768 | tabs->setLoadingProgress( 0 ); | 768 | tabs->setLoadingProgress( 0 ); |
769 | tabs->setLoadingWidgetEnabled( TRUE ); | 769 | tabs->setLoadingWidgetEnabled( TRUE ); |
770 | tabs->docView()->setUpdatesEnabled( FALSE ); | 770 | tabs->docView()->setUpdatesEnabled( FALSE ); |
771 | tabs->docView()->setSortEnabled( FALSE ); | 771 | tabs->docView()->setSortEnabled( FALSE ); |
772 | break; | 772 | break; |
773 | } | 773 | } |
774 | case 100: { | 774 | case 100: { |
775 | tabs->docView()->updateTools(); | 775 | tabs->docView()->updateTools(); |
776 | tabs->docView()->setSortEnabled( TRUE ); | 776 | tabs->docView()->setSortEnabled( TRUE ); |
777 | tabs->docView()->setUpdatesEnabled( TRUE ); | 777 | tabs->docView()->setUpdatesEnabled( TRUE ); |
778 | tabs->setLoadingWidgetEnabled( FALSE ); | 778 | tabs->setLoadingWidgetEnabled( FALSE ); |
779 | break; | 779 | break; |
780 | } | 780 | } |
781 | default: | 781 | default: |
782 | tabs->setLoadingProgress( percent ); | 782 | tabs->setLoadingProgress( percent ); |
783 | break; | 783 | break; |
784 | } | 784 | } |
785 | } | 785 | } |
786 | 786 | ||
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp index a11ac86..0461432 100644 --- a/core/launcher/packageslave.cpp +++ b/core/launcher/packageslave.cpp | |||
@@ -44,73 +44,73 @@ using namespace Opie::Core; | |||
44 | #elif defined(Q_OS_MACX) | 44 | #elif defined(Q_OS_MACX) |
45 | #include <unistd.h> | 45 | #include <unistd.h> |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | 48 | ||
49 | PackageHandler::PackageHandler( QObject *parent, char* name ) | 49 | PackageHandler::PackageHandler( QObject *parent, char* name ) |
50 | : QObject( parent, name ), packageChannel( 0 ), currentProcess( 0 ), mNoSpaceLeft( FALSE ) | 50 | : QObject( parent, name ), packageChannel( 0 ), currentProcess( 0 ), mNoSpaceLeft( FALSE ) |
51 | { | 51 | { |
52 | // setup qcop channel | 52 | // setup qcop channel |
53 | #ifndef QT_NO_COP | 53 | #ifndef QT_NO_COP |
54 | packageChannel = new QCopChannel( "QPE/Package", this ); | 54 | packageChannel = new QCopChannel( "QPE/Package", this ); |
55 | connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 55 | connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
56 | this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) ); | 56 | this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) ); |
57 | #endif | 57 | #endif |
58 | } | 58 | } |
59 | 59 | ||
60 | void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) | 60 | void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data ) |
61 | { | 61 | { |
62 | QDataStream stream( data, IO_ReadOnly ); | 62 | QDataStream stream( data, IO_ReadOnly ); |
63 | 63 | ||
64 | if ( msg == "installPackage(QString)" ) { | 64 | if ( msg == "installPackage(QString)" ) { |
65 | QString file; | 65 | QString file; |
66 | stream >> file; | 66 | stream >> file; |
67 | installPackage( file ); | 67 | installPackage( file ); |
68 | } else if ( msg == "removePackage(QString)" ) { | 68 | } else if ( msg == "removePackage(QString)" ) { |
69 | QString file; | 69 | QString file; |
70 | stream >> file; | 70 | stream >> file; |
71 | removePackage( file ); | 71 | removePackage( file ); |
72 | } else if ( msg == "addPackageFiles(QString,QString)" ) { | 72 | } else if ( msg == "addPackageFiles(QString,QString)" ) { |
73 | QString location, listfile; | 73 | QString location, listfile; |
74 | stream >> location >> listfile; | 74 | stream >> location >> listfile; |
75 | addPackageFiles( location, listfile); | 75 | addPackageFiles( location, listfile); |
76 | } else if ( msg == "addPackages(QString)" ) { | 76 | } else if ( msg == "addPackages(QString)" ) { |
77 | QString location; | 77 | QString location; |
78 | stream >> location; | 78 | stream >> location; |
79 | addPackages( location ); | 79 | addPackages( location ); |
80 | } else if ( msg == "cleanupPackageFiles(QString)" ) { | 80 | } else if ( msg == "cleanupPackageFiles(QString)" ) { |
81 | QString listfile; | 81 | QString listfile; |
82 | stream >> listfile; | 82 | stream >> listfile; |
83 | cleanupPackageFiles( listfile ); | 83 | cleanupPackageFiles( listfile ); |
84 | } else if ( msg == "cleanupPackages(QString)" ) { | 84 | } else if ( msg == "cleanupPackages(QString)" ) { |
85 | QString location; | 85 | QString location; |
86 | stream >> location; | 86 | stream >> location; |
87 | cleanupPackages( location ); | 87 | cleanupPackages( location ); |
88 | } else if ( msg == "prepareInstall(QString,QString)" ) { | 88 | } else if ( msg == "prepareInstall(QString,QString)" ) { |
89 | QString size, path; | 89 | QString size, path; |
90 | stream >> size; | 90 | stream >> size; |
91 | stream >> path; | 91 | stream >> path; |
92 | prepareInstall( size, path ); | 92 | prepareInstall( size, path ); |
93 | } | 93 | } |
94 | } | 94 | } |
95 | 95 | ||
96 | void PackageHandler::installPackage( const QString &package ) | 96 | void PackageHandler::installPackage( const QString &package ) |
97 | { | 97 | { |
98 | if ( mNoSpaceLeft ) { | 98 | if ( mNoSpaceLeft ) { |
99 | mNoSpaceLeft = FALSE; | 99 | mNoSpaceLeft = FALSE; |
100 | // Don't emit that for now, I still couldn't test it (Wener) | 100 | // Don't emit that for now, I still couldn't test it (Wener) |
101 | //sendReply( "installFailed(QString)", package ); | 101 | //sendReply( "installFailed(QString)", package ); |
102 | //return; | 102 | //return; |
103 | } | 103 | } |
104 | 104 | ||
105 | currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr | 105 | currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr |
106 | connect( currentProcess, SIGNAL( processExited() ), SLOT( iProcessExited() ) ); | 106 | connect( currentProcess, SIGNAL( processExited() ), SLOT( iProcessExited() ) ); |
107 | connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) ); | 107 | connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) ); |
108 | connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) ); | 108 | connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) ); |
109 | currentPackage = package; | 109 | currentPackage = package; |
110 | 110 | ||
111 | currentProcessError=""; | 111 | currentProcessError=""; |
112 | sendReply( "installStarted(QString)", package ); | 112 | sendReply( "installStarted(QString)", package ); |
113 | currentProcess->start(); | 113 | currentProcess->start(); |
114 | } | 114 | } |
115 | 115 | ||
116 | void PackageHandler::removePackage( const QString &package ) | 116 | void PackageHandler::removePackage( const QString &package ) |
@@ -125,215 +125,214 @@ void PackageHandler::removePackage( const QString &package ) | |||
125 | sendReply( "removeStarted(QString)", package ); | 125 | sendReply( "removeStarted(QString)", package ); |
126 | currentProcess->start(); | 126 | currentProcess->start(); |
127 | } | 127 | } |
128 | 128 | ||
129 | void PackageHandler::sendReply( const QCString& msg, const QString& arg ) | 129 | void PackageHandler::sendReply( const QCString& msg, const QString& arg ) |
130 | { | 130 | { |
131 | #ifndef QT_NO_COP | 131 | #ifndef QT_NO_COP |
132 | QCopEnvelope e( "QPE/Desktop", msg ); | 132 | QCopEnvelope e( "QPE/Desktop", msg ); |
133 | e << arg; | 133 | e << arg; |
134 | #endif | 134 | #endif |
135 | } | 135 | } |
136 | 136 | ||
137 | void PackageHandler::addPackageFiles( const QString &location, | 137 | void PackageHandler::addPackageFiles( const QString &location, |
138 | const QString &listfile ) | 138 | const QString &listfile ) |
139 | { | 139 | { |
140 | QFile f(listfile); | 140 | QFile f(listfile); |
141 | #ifndef Q_OS_WIN32 | 141 | #ifndef Q_OS_WIN32 |
142 | //make a copy so we can remove the symlinks later | 142 | //make a copy so we can remove the symlinks later |
143 | mkdir( ("/usr/lib/ipkg/info/"+location).ascii(), 0777 ); | 143 | mkdir( ("/usr/lib/ipkg/info/"+location).ascii(), 0777 ); |
144 | system(("cp " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); | 144 | system(("cp " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); |
145 | #else | 145 | #else |
146 | QDir d; | 146 | QDir d; |
147 | //#### revise | 147 | //#### revise |
148 | odebug << "Copy file at " << __FILE__ << ": " << __LINE__ << "" << oendl; | 148 | odebug << "Copy file at " << __FILE__ << ": " << __LINE__ << "" << oendl; |
149 | d.mkdir(("/usr/lib/ipkg/info/" + location).ascii()); | 149 | d.mkdir(("/usr/lib/ipkg/info/" + location).ascii()); |
150 | system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); | 150 | system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii()); |
151 | #endif | 151 | #endif |
152 | 152 | ||
153 | |||
154 | if ( f.open(IO_ReadOnly) ) { | ||
155 | QTextStream ts(&f); | ||
156 | 153 | ||
157 | QString s; | 154 | if ( f.open(IO_ReadOnly) ) { |
158 | while ( !ts.eof() ) { // until end of file... | 155 | QTextStream ts(&f); |
159 | s = ts.readLine(); // line of text excluding '\n' | 156 | |
160 | // for s, do link/mkdir. | 157 | QString s; |
161 | if ( s.right(1) == "/" ) { | 158 | while ( !ts.eof() ) { // until end of file... |
159 | s = ts.readLine(); // line of text excluding '\n' | ||
160 | // for s, do link/mkdir. | ||
161 | if ( s.right(1) == "/" ) { | ||
162 | odebug << "do mkdir for " << s.ascii() << "" << oendl; | 162 | odebug << "do mkdir for " << s.ascii() << "" << oendl; |
163 | #ifndef Q_OS_WIN32 | 163 | #ifndef Q_OS_WIN32 |
164 | mkdir( s.ascii(), 0777 ); | 164 | mkdir( s.ascii(), 0777 ); |
165 | //possible optimization: symlink directories | 165 | //possible optimization: symlink directories |
166 | //that don't exist already. -- Risky. | 166 | //that don't exist already. -- Risky. |
167 | #else | 167 | #else |
168 | d.mkdir( s.ascii()); | 168 | d.mkdir( s.ascii()); |
169 | #endif | 169 | #endif |
170 | 170 | ||
171 | } else { | 171 | } else { |
172 | #ifndef Q_OS_WIN32 | 172 | #ifndef Q_OS_WIN32 |
173 | odebug << "do symlink for " << s.ascii() << "" << oendl; | 173 | odebug << "do symlink for " << s.ascii() << "" << oendl; |
174 | symlink( (location + s).ascii(), s.ascii() ); | 174 | symlink( (location + s).ascii(), s.ascii() ); |
175 | #else | 175 | #else |
176 | odebug << "Copy file instead of a symlink for WIN32" << oendl; | 176 | odebug << "Copy file instead of a symlink for WIN32" << oendl; |
177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) | 177 | if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE)) |
178 | qWarning("Unable to create symlinkfor %s", | 178 | owarn << "Unable to create symlinkfor " << (location + s).ascii() << oendl; |
179 | (location + s).ascii()); | ||
180 | #endif | 179 | #endif |
181 | } | 180 | } |
182 | } | 181 | } |
183 | f.close(); | 182 | f.close(); |
184 | } | 183 | } |
185 | } | 184 | } |
186 | 185 | ||
187 | void PackageHandler::addPackages( const QString &location ) | 186 | void PackageHandler::addPackages( const QString &location ) |
188 | { | 187 | { |
189 | // get list of *.list in location/usr/lib/ipkg/info/*.list | 188 | // get list of *.list in location/usr/lib/ipkg/info/*.list |
190 | QDir dir(location + "/usr/lib/ipkg/info", "*.list", // No tr | 189 | QDir dir(location + "/usr/lib/ipkg/info", "*.list", // No tr |
191 | QDir::Name, QDir::Files); | 190 | QDir::Name, QDir::Files); |
192 | if ( !dir.exists() ) | 191 | if ( !dir.exists() ) |
193 | return; | 192 | return; |
194 | 193 | ||
195 | QStringList packages = dir.entryList(); | 194 | QStringList packages = dir.entryList(); |
196 | for ( QStringList::Iterator it = packages.begin(); | 195 | for ( QStringList::Iterator it = packages.begin(); |
197 | it != packages.end(); ++it ) { | 196 | it != packages.end(); ++it ) { |
198 | addPackageFiles( location, *it ); | 197 | addPackageFiles( location, *it ); |
199 | } | 198 | } |
200 | } | 199 | } |
201 | 200 | ||
202 | 201 | ||
203 | void PackageHandler::cleanupPackageFiles( const QString &listfile ) | 202 | void PackageHandler::cleanupPackageFiles( const QString &listfile ) |
204 | { | 203 | { |
205 | QFile f(listfile); | 204 | QFile f(listfile); |
206 | 205 | ||
207 | if ( f.open(IO_ReadOnly) ) { | 206 | if ( f.open(IO_ReadOnly) ) { |
208 | QTextStream ts(&f); | 207 | QTextStream ts(&f); |
209 | 208 | ||
210 | QString s; | 209 | QString s; |
211 | while ( !ts.eof() ) { // until end of file... | 210 | while ( !ts.eof() ) { // until end of file... |
212 | s = ts.readLine(); // line of text excluding '\n' | 211 | s = ts.readLine(); // line of text excluding '\n' |
213 | // for s, do link/mkdir. | 212 | // for s, do link/mkdir. |
214 | if ( s.right(1) == "/" ) { | 213 | if ( s.right(1) == "/" ) { |
215 | //should rmdir if empty, after all files have been removed | 214 | //should rmdir if empty, after all files have been removed |
216 | } else { | 215 | } else { |
217 | #ifndef Q_OS_WIN32 | 216 | #ifndef Q_OS_WIN32 |
218 | odebug << "remove symlink for " << s.ascii() << "" << oendl; | 217 | odebug << "remove symlink for " << s.ascii() << "" << oendl; |
219 | //check if it is a symlink first (don't remove /etc/passwd...) | 218 | //check if it is a symlink first (don't remove /etc/passwd...) |
220 | char buf[10]; //we don't care about the contents | 219 | char buf[10]; //we don't care about the contents |
221 | if ( ::readlink( s.ascii(),buf, 10 >= 0 ) ) | 220 | if ( ::readlink( s.ascii(),buf, 10 >= 0 ) ) |
222 | ::unlink( s.ascii() ); | 221 | ::unlink( s.ascii() ); |
223 | #else | 222 | #else |
224 | // ### revise | 223 | // ### revise |
225 | owarn << "Unable to remove symlink " << __FILE__ << ":" << __LINE__ << "" << oendl; | 224 | owarn << "Unable to remove symlink " << __FILE__ << ":" << __LINE__ << "" << oendl; |
226 | #endif | 225 | #endif |
227 | } | 226 | } |
228 | } | 227 | } |
229 | f.close(); | 228 | f.close(); |
230 | 229 | ||
231 | //remove the list file | 230 | //remove the list file |
232 | ::unlink( listfile.ascii() ); | 231 | ::unlink( listfile.ascii() ); |
233 | 232 | ||
234 | } | 233 | } |
235 | } | 234 | } |
236 | 235 | ||
237 | void PackageHandler::cleanupPackages( const QString &location ) | 236 | void PackageHandler::cleanupPackages( const QString &location ) |
238 | { | 237 | { |
239 | // get list of *.list in location/usr/lib/ipkg/info/*.list | 238 | // get list of *.list in location/usr/lib/ipkg/info/*.list |
240 | QDir dir( "/usr/lib/ipkg/info/"+location, "*.list", // No tr | 239 | QDir dir( "/usr/lib/ipkg/info/"+location, "*.list", // No tr |
241 | QDir::Name, QDir::Files); | 240 | QDir::Name, QDir::Files); |
242 | if ( !dir.exists() ) | 241 | if ( !dir.exists() ) |
243 | return; | 242 | return; |
244 | 243 | ||
245 | QStringList packages = dir.entryList(); | 244 | QStringList packages = dir.entryList(); |
246 | for ( QStringList::Iterator it = packages.begin(); | 245 | for ( QStringList::Iterator it = packages.begin(); |
247 | it != packages.end(); ++it ) { | 246 | it != packages.end(); ++it ) { |
248 | cleanupPackageFiles( *it ); | 247 | cleanupPackageFiles( *it ); |
249 | } | 248 | } |
250 | 249 | ||
251 | //remove the backup directory | 250 | //remove the backup directory |
252 | //### | 251 | //### |
253 | } | 252 | } |
254 | 253 | ||
255 | void PackageHandler::prepareInstall( const QString& size, const QString& path ) | 254 | void PackageHandler::prepareInstall( const QString& size, const QString& path ) |
256 | { | 255 | { |
257 | // Check whether there will be enough space to install the next package. | 256 | // Check whether there will be enough space to install the next package. |
258 | bool ok; | 257 | bool ok; |
259 | unsigned int s = size.toUInt( &ok ); | 258 | unsigned int s = size.toUInt( &ok ); |
260 | 259 | ||
261 | if ( !ok ) | 260 | if ( !ok ) |
262 | return; | 261 | return; |
263 | 262 | ||
264 | // Shamelessly stolen from the sysinfo application (Werner) | 263 | // Shamelessly stolen from the sysinfo application (Werner) |
265 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 264 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
266 | struct statfs fs; | 265 | struct statfs fs; |
267 | if ( statfs( path.latin1(), &fs ) == 0 ) | 266 | if ( statfs( path.latin1(), &fs ) == 0 ) |
268 | if ( s > fs.f_bsize * fs.f_bavail ) { | 267 | if ( s > fs.f_bsize * fs.f_bavail ) { |
269 | //odebug << "############### Not enough space left ###############" << oendl; | 268 | //odebug << "############### Not enough space left ###############" << oendl; |
270 | mNoSpaceLeft = TRUE; | 269 | mNoSpaceLeft = TRUE; |
271 | } | 270 | } |
272 | #endif | 271 | #endif |
273 | } | 272 | } |
274 | 273 | ||
275 | void PackageHandler::iProcessExited() | 274 | void PackageHandler::iProcessExited() |
276 | { | 275 | { |
277 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) | 276 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) |
278 | sendReply( "installDone(QString)", currentPackage ); | 277 | sendReply( "installDone(QString)", currentPackage ); |
279 | else { | 278 | else { |
280 | #ifndef QT_NO_COP | 279 | #ifndef QT_NO_COP |
281 | QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" ); | 280 | QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" ); |
282 | e << currentPackage << currentProcess->exitStatus() | 281 | e << currentPackage << currentProcess->exitStatus() |
283 | << currentProcessError; | 282 | << currentProcessError; |
284 | #endif | 283 | #endif |
285 | } | 284 | } |
286 | 285 | ||
287 | delete currentProcess; | 286 | delete currentProcess; |
288 | currentProcess = 0; | 287 | currentProcess = 0; |
289 | 288 | ||
290 | #ifndef QT_NO_COP | 289 | #ifndef QT_NO_COP |
291 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 290 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
292 | QString lf = QString::null; | 291 | QString lf = QString::null; |
293 | e << lf; | 292 | e << lf; |
294 | #endif | 293 | #endif |
295 | unlink( currentPackage ); | 294 | unlink( currentPackage ); |
296 | } | 295 | } |
297 | 296 | ||
298 | void PackageHandler::rmProcessExited() | 297 | void PackageHandler::rmProcessExited() |
299 | { | 298 | { |
300 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) | 299 | if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 ) |
301 | sendReply( "removeDone(QString)", currentPackage ); | 300 | sendReply( "removeDone(QString)", currentPackage ); |
302 | else | 301 | else |
303 | sendReply( "removeFailed(QString)", currentPackage ); | 302 | sendReply( "removeFailed(QString)", currentPackage ); |
304 | 303 | ||
305 | #ifndef QT_NO_COP | 304 | #ifndef QT_NO_COP |
306 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 305 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
307 | QString lf = QString::null; | 306 | QString lf = QString::null; |
308 | e << lf; | 307 | e << lf; |
309 | #endif | 308 | #endif |
310 | } | 309 | } |
311 | 310 | ||
312 | void PackageHandler::readyReadStdout() | 311 | void PackageHandler::readyReadStdout() |
313 | { | 312 | { |
314 | while ( currentProcess->canReadLineStdout() ) { | 313 | while ( currentProcess->canReadLineStdout() ) { |
315 | QString line = currentProcess->readLineStdout(); | 314 | QString line = currentProcess->readLineStdout(); |
316 | currentProcessError.append("OUT:"+line); | 315 | currentProcessError.append("OUT:"+line); |
317 | if ( line.contains( "Unpacking" ) ) // No tr | 316 | if ( line.contains( "Unpacking" ) ) // No tr |
318 | sendReply( "installStep(QString)", "one" ); // No tr | 317 | sendReply( "installStep(QString)", "one" ); // No tr |
319 | else if ( line.contains( "Configuring" ) ) // No tr | 318 | else if ( line.contains( "Configuring" ) ) // No tr |
320 | sendReply( "installStep(QString)", "two" ); // No tr | 319 | sendReply( "installStep(QString)", "two" ); // No tr |
321 | } | 320 | } |
322 | } | 321 | } |
323 | 322 | ||
324 | void PackageHandler::readyReadStderr() | 323 | void PackageHandler::readyReadStderr() |
325 | { | 324 | { |
326 | while ( currentProcess->canReadLineStderr() ) { | 325 | while ( currentProcess->canReadLineStderr() ) { |
327 | QString line = currentProcess->readLineStderr(); | 326 | QString line = currentProcess->readLineStderr(); |
328 | currentProcessError.append("ERR:"+line); | 327 | currentProcessError.append("ERR:"+line); |
329 | } | 328 | } |
330 | } | 329 | } |
331 | 330 | ||
332 | void PackageHandler::redoPackages() | 331 | void PackageHandler::redoPackages() |
333 | { | 332 | { |
334 | //get list of filesystems | 333 | //get list of filesystems |
335 | 334 | ||
336 | //call cleanupPackages for the ones that have disappeared | 335 | //call cleanupPackages for the ones that have disappeared |
337 | 336 | ||
338 | //call addPackageFiles for the new ones | 337 | //call addPackageFiles for the new ones |
339 | } | 338 | } |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index c3f936e..1d4ca40 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -1147,26 +1147,25 @@ void ServerDTP::connected() | |||
1147 | } | 1147 | } |
1148 | break; | 1148 | break; |
1149 | case SendGzipFile: | 1149 | case SendGzipFile: |
1150 | if ( createTargzProc->isRunning() ) { | 1150 | if ( createTargzProc->isRunning() ) { |
1151 | // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY | 1151 | // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY |
1152 | owarn << "Previous tar --gzip process is still running; killing it..." << oendl; | 1152 | owarn << "Previous tar --gzip process is still running; killing it..." << oendl; |
1153 | createTargzProc->kill(); | 1153 | createTargzProc->kill(); |
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | bytes_written = 0; | 1156 | bytes_written = 0; |
1157 | odebug << "==>start send tar process" << oendl; | 1157 | odebug << "==>start send tar process" << oendl; |
1158 | if ( !createTargzProc->start() ) | 1158 | if ( !createTargzProc->start() ) |
1159 | qWarning("Error starting %s", | 1159 | owarn << "Error starting " << createTargzProc->arguments().join(" ").latin1() << oendl; |
1160 | createTargzProc->arguments().join(" ").latin1()); | ||
1161 | break; | 1160 | break; |
1162 | case SendBuffer: | 1161 | case SendBuffer: |
1163 | if ( !buf.open( IO_ReadOnly) ) { | 1162 | if ( !buf.open( IO_ReadOnly) ) { |
1164 | emit failed(); | 1163 | emit failed(); |
1165 | mode = Idle; | 1164 | mode = Idle; |
1166 | return; | 1165 | return; |
1167 | } | 1166 | } |
1168 | 1167 | ||
1169 | // odebug << "Debug: Sending byte array" << oendl; | 1168 | // odebug << "Debug: Sending byte array" << oendl; |
1170 | bytes_written = 0; | 1169 | bytes_written = 0; |
1171 | while( !buf.atEnd() ) | 1170 | while( !buf.atEnd() ) |
1172 | putch( buf.getch() ); | 1171 | putch( buf.getch() ); |