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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -31,3 +31,5 @@
 #include <qpe/categorywidget.h>
+#ifdef QWS
 #include <qpe/qcopenvelope_qws.h>
+#endif
 #include <qpe/filemanager.h>
@@ -56,2 +58,4 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
 {
+    setCaption( tr("Properties") );
+
     QVBoxLayout *vbox = new QVBoxLayout( this );
@@ -63,6 +67,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     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() );
     }
@@ -70,6 +74,6 @@ LnkProperties::LnkProperties( AppLnk* l, QWidget* parent )
     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() );
     }
@@ -78,44 +82,42 @@ 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();
-  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());
 }
@@ -129,27 +131,8 @@ 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();
+        }
     }
@@ -171,30 +154,35 @@ 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 ( (*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;
+        }
     }
@@ -207,9 +195,9 @@ void LnkProperties::duplicateLnk()
     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;
     }
@@ -224,4 +212,4 @@ bool LnkProperties::moveLnk()
     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;
     }
@@ -237,2 +225,4 @@ void LnkProperties::beamLnk()
     DocLnk doc( *((DocLnk *)lnk) );
+    doc.setName(d->docname->text());
+    reject();
     ir.send( doc, doc.comment() );
@@ -246,3 +236,3 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     if ( extnPos > 0 )
-  fileExtn = lnk->file().mid( extnPos );
+        fileExtn = lnk->file().mid( extnPos );
 
@@ -252,11 +242,11 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
      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;
     }
@@ -268,3 +258,3 @@ bool LnkProperties::copyFile( DocLnk &newdoc )
     if ( !fm.copyFile( *lnk, newdoc ) )
-  return FALSE;
+        return FALSE;
     return TRUE;
@@ -275,38 +265,42 @@ 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,',');
+            }
+        }
     }