Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 145 insertions, 151 deletions

diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index c020328..983c677 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
-** 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
 ** GNU General Public License version 2 as published by the Free Software
@@ -29,7 +29,9 @@
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/categorywidget.h>
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/filemanager.h>
 #include <qpe/config.h>
 #include <qpe/storage.h>
@@ -54,6 +56,8 @@
 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 );
     vbox->add( d );
@@ -61,63 +65,61 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     d->docname->setText(l->name());
     QString inf;
     if ( l->type().isEmpty() ) {
-  d->type->hide();
-  d->typeLabel->hide();
+	d->type->hide();
+	d->typeLabel->hide();
     } else {
-  d->type->setText( l->type() );
+	d->type->setText( l->type() );
     }
 
     if ( l->comment().isEmpty() ) {
-  d->comment->hide();
-  d->commentLabel->hide();
+	d->comment->hide();
+	d->commentLabel->hide();
     } else {
-  d->comment->setText( l->comment() );
+	d->comment->setText( l->comment() );
     }
 
     connect(d->beam,SIGNAL(clicked()),this,SLOT(beamLnk()));
     if ( lnk->type().contains('/') ) { // A document? (#### better predicate needed)
-  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 );
-  d->preload->hide();
-  d->spacer->hide();
-
-  // ### THIS MUST GO, FIX WIERD BUG in QLAYOUT
-  d->categoryEdit->kludge();
-
-  d->categoryEdit->setCategories( lnk->categories(),
-          "Document View",
-          tr("Document View") );
-  setupLocations();
+	connect(d->unlink,SIGNAL(clicked()),this,SLOT(unlinkLnk()));
+	connect(d->duplicate,SIGNAL(clicked()),this,SLOT(duplicateLnk()));
+
+	d->docname->setReadOnly( FALSE );
+	d->preload->hide();
+	d->spacer->hide();
+
+	// ### THIS MUST GO, FIX WIERD BUG in QLAYOUT
+	d->categoryEdit->kludge();
+
+	d->categoryEdit->setCategories( lnk->categories(),
+					"Document View",
+					tr("Document View") );
+	setupLocations();
     } else {
-  d->unlink->hide();
-  d->duplicate->hide();
-  d->beam->hide();
-  d->hline->hide();
-  d->locationLabel->hide();
-  d->locationCombo->hide();
-
-  // Can't edit categories, since the app .desktop files are global,
-  // possibly read-only.
-  d->categoryEdit->hide();
-
-  d->docname->setReadOnly( TRUE );
-
-  if ( l->property("CanFastload") == "0" )
-      d->preload->hide();
-
-  Config cfg("Launcher");
-  cfg.setGroup("Preload");
-  QStringList apps = cfg.readListEntry("Apps",',');
-  d->preload->setChecked( apps.contains(l->exec()) );
-  if ( Global::isBuiltinCommand(lnk->exec()) )
-      d->preload->hide(); // builtins are always fast
-
-  currentLocation = 0; // apps not movable (yet)
+	d->unlink->hide();
+	d->duplicate->hide();
+	d->beam->hide();
+	d->hline->hide();
+ 	d->locationLabel->hide();
+	d->locationCombo->hide();
+
+	// Can't edit categories, since the app .desktop files are global,
+	// possibly read-only.
+ 	d->categoryEdit->hide();
+
+	d->docname->setReadOnly( TRUE );
+
+	if ( l->property("CanFastload") == "0" )
+	    d->preload->hide();
+
+	Config cfg("Launcher");
+	cfg.setGroup("Preload");
+	QStringList apps = cfg.readListEntry("Apps",',');
+	d->preload->setChecked( apps.contains(l->exec()) );
+	if ( Global::isBuiltinCommand(lnk->exec()) )
+	    d->preload->hide(); // builtins are always fast
+
+	currentLocation = 0; // apps not movable (yet)
     }
-    setCaption( l->file());
 }
 
 LnkProperties::~LnkProperties()
@@ -127,31 +129,12 @@ LnkProperties::~LnkProperties()
 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.") );
-        } else {
-            reject();
-        }
-    }
-}
-
-
-/*
- * 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();
-  }
+	lnk->removeFiles();
+	if ( QFile::exists(lnk->file()) ) {
+	    QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") );
+	} else {
+	    reject();
+	}
     }
 }
 
@@ -169,34 +152,39 @@ void LnkProperties::setupLocations()
     int index = 0;
     currentLocation = -1;
     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 ( (*it)->isRemovable() ||
-     (*it)->disk() == "/dev/mtdblock1" ||
-     (*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) );
-    if ( lnk->file().contains( (*it)->path() ) ) {
-         d->locationCombo->setCurrentItem( index );
-         currentLocation = index;
-    }
-    index++;
-      } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
-      homeDir.contains( (*it)->path() ) &&
-      (*it)->path().length() > hardDiskHome.length() ) {
-    hardDiskHome = (*it)->name();
-    hardDiskPath = (*it)->path();
-      }
-  }
+	// we add 10k to the file size so we are sure we can also save the desktop file
+	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" ) {
+		d->locationCombo->insertItem( (*it)->name(), index );
+		locations.append( ( ((*it)->isRemovable() || 
+				    (*it)->disk() == "/dev/mtdblock6" ||
+				    (*it)->disk() == "tmpfs" )
+				    ? (*it)->path() : homeDir) );
+		if ( lnk->file().contains( (*it)->path() ) ) {
+		     d->locationCombo->setCurrentItem( index );
+		     currentLocation = index;
+		}
+		index++;
+	    } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
+			homeDir.contains( (*it)->path() ) &&
+			(*it)->path().length() > hardDiskHome.length() ) {
+		hardDiskHome = (*it)->name();
+		hardDiskPath = (*it)->path();
+	    }
+	}
     }
     if ( !hardDiskHome.isEmpty() ) {
-  d->locationCombo->insertItem( hardDiskHome );
-  locations.append( hardDiskPath );
-  if ( currentLocation == -1 ) { // assume it's the hard disk
-      d->locationCombo->setCurrentItem( index );
-      currentLocation = index;
-  }
+	d->locationCombo->insertItem( hardDiskHome );
+	locations.append( hardDiskPath );
+	if ( currentLocation == -1 ) { // assume it's the hard disk
+	    d->locationCombo->setCurrentItem( index );
+	    currentLocation = index;
+	}
     }
 }
 
@@ -205,13 +193,13 @@ void LnkProperties::duplicateLnk()
     // The duplicate takes the new properties.
     DocLnk newdoc( *((DocLnk *)lnk) );
     if ( d->docname->text() == lnk->name() )
-  newdoc.setName(tr("Copy of ")+d->docname->text());
+	newdoc.setName(tr("Copy of ")+d->docname->text());
     else
-  newdoc.setName(d->docname->text());
+	newdoc.setName(d->docname->text());
 
     if ( !copyFile( newdoc ) ) {
-  QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
-  return;
+	QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
+	return;
     }
     reject();
 }
@@ -222,8 +210,8 @@ bool LnkProperties::moveLnk()
     newdoc.setName(d->docname->text());
 
     if ( !copyFile( newdoc ) ) {
-  QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
-  return FALSE;
+	QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
+	return FALSE;
     }
     // remove old lnk
     lnk->removeFiles();
@@ -235,6 +223,8 @@ void LnkProperties::beamLnk()
 {
     Ir ir;
     DocLnk doc( *((DocLnk *)lnk) );
+    doc.setName(d->docname->text());
+    reject();
     ir.send( doc, doc.comment() );
 }
 
@@ -244,21 +234,21 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     QString fileExtn;
     int extnPos = lnk->file().findRev( '.' );
     if ( extnPos > 0 )
-  fileExtn = lnk->file().mid( extnPos );
+	fileExtn = lnk->file().mid( extnPos );
 
     QString safename = newdoc.name();
     safename.replace(QRegExp("/"),"_");
 
      QString fn = locations[ d->locationCombo->currentItem() ]
-      + "/Documents/" + newdoc.type() + "/" + safename;
+		  + "/Documents/" + newdoc.type() + "/" + safename;
     if ( QFile::exists(fn + fileExtn) || QFile::exists(fn + linkExtn) ) {
-  int n=1;
-  QString nn = fn + "_" + QString::number(n);
-  while ( QFile::exists(nn+fileExtn) || QFile::exists(nn+linkExtn) ) {
-      n++;
-      nn = fn + "_" + QString::number(n);
-  }
-  fn = nn;
+	int n=1;
+	QString nn = fn + "_" + QString::number(n);
+	while ( QFile::exists(nn+fileExtn) || QFile::exists(nn+linkExtn) ) {
+	    n++;
+	    nn = fn + "_" + QString::number(n);
+	}
+	fn = nn;
     }
     newdoc.setFile( fn + fileExtn );
     newdoc.setLinkFile( fn + linkExtn );
@@ -266,49 +256,53 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     // Copy file
     FileManager fm;
     if ( !fm.copyFile( *lnk, newdoc ) )
-  return FALSE;
+	return FALSE;
     return TRUE;
 }
 
 void LnkProperties::done(int ok)
 {
     if ( ok ) {
-  bool changed=FALSE;
-  if ( lnk->name() != d->docname->text() ) {
-      lnk->setName(d->docname->text());
-      changed=TRUE;
-  }
-  if ( d->categoryEdit->isVisible() ) {
-      QArray<int> tmp = d->categoryEdit->newCategories();
-      if ( lnk->categories() != tmp ) {
-    lnk->setCategories( tmp );
-    changed = TRUE;
-      }
-  }
-  if ( d->preload->isHidden() && d->locationCombo->currentItem() != currentLocation ) {
-      moveLnk();
-  } else if ( changed ) {
-      lnk->writeLink();
-  }
-
-  if ( !d->preload->isHidden() ) {
-      Config cfg("Launcher");
-      cfg.setGroup("Preload");
-      QStringList apps = cfg.readListEntry("Apps",',');
-      QString exe = lnk->exec();
-      if ( apps.contains(exe) != d->preload->isChecked() ) {
-    if ( d->preload->isChecked() ) {
-        apps.append(exe);
-        QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
-           "enablePreload()");
-    } else {
-        apps.remove(exe);
-        QCopEnvelope e("QPE/Application/"+exe.local8Bit(),
-           "quitIfInvisible()");
-    }
-    cfg.writeEntry("Apps",apps,',');
-      }
-  }
+	bool changed=FALSE;
+	if ( lnk->name() != d->docname->text() ) {
+	    lnk->setName(d->docname->text());
+	    changed=TRUE;
+	}
+	if ( d->categoryEdit->isVisible() ) {
+	    QArray<int> tmp = d->categoryEdit->newCategories();
+	    if ( lnk->categories() != tmp ) {
+		lnk->setCategories( tmp );
+		changed = TRUE;
+	    }
+	}
+	if ( d->preload->isHidden() && d->locationCombo->currentItem() != currentLocation ) {
+	    moveLnk();
+	} else if ( changed ) {
+	    lnk->writeLink();
+	}
+
+	if ( !d->preload->isHidden() ) {
+	    Config cfg("Launcher");
+	    cfg.setGroup("Preload");
+	    QStringList apps = cfg.readListEntry("Apps",',');
+	    QString exe = lnk->exec();
+	    if ( apps.contains(exe) != d->preload->isChecked() ) {
+		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,',');
+	    }
+	}
     }
     QDialog::done( ok );
 }