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,16 +1,16 @@
 /**********************************************************************
-** 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
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -20,74 +20,77 @@
 
 // WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
 //      have this class.
 #define QTOPIA_INTERNAL_FSLP
 #include "lnkproperties.h"
 #include "lnkproperties.h"
 #include "lnkpropertiesbase_p.h"
 #include "ir.h"
 
 #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>
 #include <qpe/qpemessagebox.h>
 
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qsize.h>
 #include <qcombobox.h>
 #include <qregexp.h>
 
 #include <stdlib.h>
 
 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 );
 
     d->docname->setText(l->name());
     QString inf;
     if ( l->type().isEmpty() ) {
   d->type->hide();
   d->typeLabel->hide();
     } else {
   d->type->setText( l->type() );
     }
 
     if ( l->comment().isEmpty() ) {
   d->comment->hide();
   d->commentLabel->hide();
     } else {
   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();
@@ -108,84 +111,69 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
   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()
 {
 }
 
 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();
-  }
-    }
-}
-
 void LnkProperties::setupLocations()
 {
     QFileInfo fi( lnk->file() );
     fileSize = fi.size();
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     QString s;
     QString homeDir = getenv("HOME");
     QString hardDiskHome;
     QString hardDiskPath;
     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 ( (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;
     }
     index++;
       } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
       homeDir.contains( (*it)->path() ) &&
       (*it)->path().length() > hardDiskHome.length() ) {
     hardDiskHome = (*it)->name();
     hardDiskPath = (*it)->path();
       }
   }
@@ -226,24 +214,26 @@ bool LnkProperties::moveLnk()
   return FALSE;
     }
     // remove old lnk
     lnk->removeFiles();
 
     return TRUE;
 }
 
 void LnkProperties::beamLnk()
 {
     Ir ir;
     DocLnk doc( *((DocLnk *)lnk) );
+    doc.setName(d->docname->text());
+    reject();
     ir.send( doc, doc.comment() );
 }
 
 bool LnkProperties::copyFile( DocLnk &newdoc )
 {
     const char *linkExtn = ".desktop";
     QString fileExtn;
     int extnPos = lnk->file().findRev( '.' );
     if ( extnPos > 0 )
   fileExtn = lnk->file().mid( extnPos );
 
     QString safename = newdoc.name();
@@ -290,26 +280,30 @@ void LnkProperties::done(int ok)
   } 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 );
 }