Qtopia1-6 merge

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

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,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 );
@@ -78,7 +82,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     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();
@@ -117,7 +120,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
 
   currentLocation = 0; // apps not movable (yet)
     }
-    setCaption( l->file());
 }
 
 LnkProperties::~LnkProperties()
@@ -127,10 +129,7 @@ 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 {
@@ -139,22 +138,6 @@ 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()
 {
     QFileInfo fi( lnk->file() );
@@ -170,13 +153,18 @@ void LnkProperties::setupLocations()
     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 ( (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 );
          currentLocation = index;
@@ -235,6 +223,8 @@ void LnkProperties::beamLnk()
 {
     Ir ir;
     DocLnk doc( *((DocLnk *)lnk) );
+    doc.setName(d->docname->text());
+    reject();
     ir.send( doc, doc.comment() );
 }
 
@@ -299,12 +289,16 @@ void LnkProperties::done(int ok)
       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,',');
       }