| author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
| commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
| tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/lnkproperties.cpp | |
| parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
| download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 | |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
| -rw-r--r-- | library/lnkproperties.cpp | 48 |
1 files changed, 21 insertions, 27 deletions
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp index c020328..983c677 100644 --- a/library/lnkproperties.cpp +++ b/library/lnkproperties.cpp @@ -1,6 +1,6 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the @@ -30,5 +30,7 @@ #include <qpe/global.h> #include <qpe/categorywidget.h> +#ifdef QWS #include <qpe/qcopenvelope_qws.h> +#endif #include <qpe/filemanager.h> #include <qpe/config.h> @@ -55,4 +57,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) : QDialog( parent, 0, TRUE ), lnk(l), fileSize( 0 ) { + setCaption( tr("Properties") ); + QVBoxLayout *vbox = new QVBoxLayout( this ); d = new LnkPropertiesBase( this ); @@ -79,5 +83,4 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk())); connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk())); - connect(d->delicon,SIGNAL(clicked()),this,SLOT(unlinkIcon())); d->docname->setReadOnly( FALSE ); @@ -118,5 +121,4 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent ) currentLocation = 0; // apps not movable (yet) } - setCaption( l->file()); } @@ -128,8 +130,5 @@ void LnkProperties::unlinkLnk() { if ( QPEMessageBox::confirmDelete( this, tr("Delete"), lnk->name() ) ) { - if ( QFile::exists(lnk->file()) ) lnk->removeFiles(); - else - QMessageBox::warning( this, tr("Delete"), tr("File does not exist.") ); if ( QFile::exists(lnk->file()) ) { QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") ); @@ -140,20 +139,4 @@ void LnkProperties::unlinkLnk() } - -/* - * remove only the link from documents, not also the file - */ -void LnkProperties::unlinkIcon() -{ - if ( QPEMessageBox::confirmDelete( this, tr("Delete Icon and leave file"), lnk->name() ) ) { - lnk->removeLinkFile(); - if ( QFile::exists(lnk->linkFile()) ) { - QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") ); - } else { - reject(); - } - } -} - void LnkProperties::setupLocations() { @@ -171,11 +154,16 @@ void LnkProperties::setupLocations() for ( ; it.current(); ++it ) { // we add 10k to the file size so we are sure we can also save the desktop file - if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) { + if ( (ulong)(*it)->availBlocks() * (ulong)(*it)->blockSize() > (ulong)fileSize + 10000 ) { if ( (*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock1" || - (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" || - (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { + (*it)->disk() == "/dev/mtdblock/1" || + (*it)->disk().left(13) == "/dev/mtdblock" || + (*it)->disk() == "/dev/mtdblock6" || + (*it)->disk() == "tmpfs" ) { d->locationCombo->insertItem( (*it)->name(), index ); - locations.append( ((*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ? (*it)->path() : homeDir) ); + locations.append( ( ((*it)->isRemovable() || + (*it)->disk() == "/dev/mtdblock6" || + (*it)->disk() == "tmpfs" ) + ? (*it)->path() : homeDir) ); if ( lnk->file().contains( (*it)->path() ) ) { d->locationCombo->setCurrentItem( index ); @@ -236,4 +224,6 @@ void LnkProperties::beamLnk() Ir ir; DocLnk doc( *((DocLnk *)lnk) ); + doc.setName(d->docname->text()); + reject(); ir.send( doc, doc.comment() ); } @@ -300,10 +290,14 @@ void LnkProperties::done(int ok) if ( d->preload->isChecked() ) { apps.append(exe); +#ifndef QT_NO_COP QCopEnvelope e("QPE/Application/"+exe.local8Bit(), "enablePreload()"); +#endif } else { apps.remove(exe); +#ifndef QT_NO_COP QCopEnvelope e("QPE/Application/"+exe.local8Bit(), "quitIfInvisible()"); +#endif } cfg.writeEntry("Apps",apps,','); |