3 files changed, 52 insertions, 1 deletions

diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index e278cb2..abd430c 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -1,289 +1,310 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of 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
 ** not clear to you.
 **
 **********************************************************************/
 
+// 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>
 #include <qpe/qcopenvelope_qws.h>
 #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 )
 {
     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();
     } 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)
     }
 }
 
 LnkProperties::~LnkProperties()
 {
 }
 
 void LnkProperties::unlinkLnk()
 {
     if ( QPEMessageBox::confirmDelete( this, tr("Delete"), lnk->name() ) ) {
         lnk->removeFiles();
         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 ( (*it)->isRemovable() ||
                  (*it)->disk() == "/dev/mtdblock1" ||
                  (*it)->disk() == "/dev/mtdblock/1" ) {
                 d->locationCombo->insertItem( (*it)->name(), index );
                 locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) );
                 if ( lnk->file().contains( (*it)->path() ) ) {
                      d->locationCombo->setCurrentItem( index );
                      currentLocation = index;
                 }
                 index++;
             } else if ( (*it)->name().contains( "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;
         }
     }
 }
 
 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());
     else
         newdoc.setName(d->docname->text());
 
     if ( !copyFile( newdoc ) ) {
         QMessageBox::warning( this, tr("Duplicate"), tr("File copy failed.") );
         return;
     }
     reject();
 }
 
 bool LnkProperties::moveLnk()
 {
     DocLnk newdoc( *((DocLnk *)lnk) );
     newdoc.setName(d->docname->text());
 
     if ( !copyFile( newdoc ) ) {
         QMessageBox::warning( this, tr("Details"), tr("Moving Document failed.") );
         return FALSE;
     }
     // remove old lnk
     lnk->removeFiles();
 
     return TRUE;
 }
 
 void LnkProperties::beamLnk()
 {
     Ir ir;
     DocLnk doc( *((DocLnk *)lnk) );
     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();
     safename.replace(QRegExp("/"),"_");
 
      QString fn = locations[ d->locationCombo->currentItem() ]
                   + "/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;
     }
     newdoc.setFile( fn + fileExtn );
     newdoc.setLinkFile( fn + linkExtn );
 
     // Copy file
     FileManager fm;
     if ( !fm.copyFile( *lnk, newdoc ) )
         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,',');
             }
         }
     }
     QDialog::done( ok );
 }
 
diff --git a/library/lnkproperties.h b/library/lnkproperties.h
index 501692e..38da5b2 100644
--- a/library/lnkproperties.h
+++ b/library/lnkproperties.h
@@ -1,60 +1,73 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of 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
 ** not clear to you.
 **
 **********************************************************************/
+
+
+//
+//   DO NOT ATTEMPT TO USE THIS CLASS
+//
+
+
+
 #ifndef LNKPROPERTIES_H
 #define LNKPROPERTIES_H
 #include <qstringlist.h>
 #include <qdialog.h>
 
 class AppLnk;
 class QListViewItem;
 class DocLnk;
 
 class LnkPropertiesBase;
 
 class LnkProperties : public QDialog
 {
     Q_OBJECT
 
 public:
+// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
+//      have this class.
+#ifdef QTOPIA_INTERNAL_FSLP
     LnkProperties( AppLnk* lnk, QWidget* parent = 0 );
     ~LnkProperties();
+#endif
 
     void done(int);
 private slots:
     void beamLnk();
     void unlinkLnk();
+    void unlinkIcon();
     void duplicateLnk();
 
 signals:
     void select(const AppLnk *);
 
 private:
     void setupLocations();
     bool moveLnk();
     bool copyFile( DocLnk &newdoc );
 
     AppLnk* lnk;
     int fileSize;
     int currentLocation;
     QStringList locations;
     LnkPropertiesBase *d;
 };
 
 #endif // LNKPROPERTIES_H
diff --git a/library/lnkpropertiesbase_p.ui b/library/lnkpropertiesbase_p.ui
index d99b228..3d35bca 100644
--- a/library/lnkpropertiesbase_p.ui
+++ b/library/lnkpropertiesbase_p.ui
@@ -139,261 +139,278 @@
                     <property>
                         <name>layoutMargin</name>
                     </property>
                     <property>
                         <name>layoutSpacing</name>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QComboBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>locationCombo</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>0</vsizetype>
                         </sizepolicy>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
                     <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>docname</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>7</hsizetype>
                             <vsizetype>0</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string></string>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>TextLabel1</cstring>
                     </property>
                     <property stdset="1">
                         <name>frameShadow</name>
                         <enum>MShadow</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Name:</string>
                     </property>
                 </widget>
                 <widget row="1"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>locationLabel</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>1</hsizetype>
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>caption</name>
                         <string></string>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Location:</string>
                     </property>
                     <property>
                         <name>layoutMargin</name>
                     </property>
                     <property>
                         <name>layoutSpacing</name>
                     </property>
                 </widget>
                 <widget row="2"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>type</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string></string>
                     </property>
                 </widget>
                 <widget row="3"  column="1" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>comment</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string></string>
                     </property>
                 </widget>
                 <widget row="4"  column="0"  rowspan="1"  colspan="2" >
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>preload</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Fast load (consumes memory)</string>
                     </property>
                     <property>
                         <name>layoutMargin</name>
                     </property>
                     <property>
                         <name>layoutSpacing</name>
                     </property>
                 </widget>
             </grid>
         </widget>
         <widget>
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>hline</cstring>
             </property>
             <property stdset="1">
                 <name>frameShadow</name>
                 <enum>Sunken</enum>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
         </widget>
         <widget>
             <class>QFrame</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Frame9</cstring>
             </property>
             <property stdset="1">
                 <name>frameShape</name>
                 <enum>NoFrame</enum>
             </property>
             <property stdset="1">
                 <name>frameShadow</name>
                 <enum>Plain</enum>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>3</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>5</number>
                 </property>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>unlink</cstring>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Delete</string>
                     </property>
                     <property stdset="1">
                         <name>autoDefault</name>
                         <bool>false</bool>
                     </property>
                 </widget>
+        
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>delicon</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Del Icon</string>
+                    </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>false</bool>
+                    </property>
+                        </widget>
+
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>duplicate</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Copy</string>
                     </property>
                     <property stdset="1">
                         <name>autoDefault</name>
                         <bool>false</bool>
                     </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>beam</cstring>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Beam</string>
                     </property>
                     <property stdset="1">
                         <name>autoDefault</name>
                         <bool>false</bool>
                     </property>
                 </widget>
             </hbox>
         </widget>
     </vbox>
 </widget>
 <customwidgets>
     <customwidget>
         <class>CategoryWidget</class>
         <header location="global">qpe/categorywidget.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>7</hordata>
             <verdata>7</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
     </customwidget>
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
 <tabstops>
     <tabstop>docname</tabstop>
     <tabstop>preload</tabstop>
     <tabstop>locationCombo</tabstop>
     <tabstop>unlink</tabstop>
     <tabstop>duplicate</tabstop>
     <tabstop>beam</tabstop>
 </tabstops>
 </UI>