added filepath to titlebar

1 files changed, 135 insertions, 134 deletions

diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index abd430c..ebfd4bf 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -61,62 +61,63 @@ 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()));
+  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)
+  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()
@@ -126,12 +127,12 @@ 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();
-	}
+  lnk->removeFiles();
+  if ( QFile::exists(lnk->file()) ) {
+      QMessageBox::warning( this, tr("Delete"), tr("File deletion failed.") );
+  } else {
+      reject();
+  }
     }
 }
 
@@ -142,12 +143,12 @@ void LnkProperties::unlinkLnk()
 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->removeLinkFile();
+        if ( QFile::exists(lnk->linkFile()) ) {
+      QMessageBox::warning( this, tr("Delete"), tr("Icon deletion failed.") );
+  } else {
+      reject();
+  }
     }
 }
 
@@ -165,33 +166,33 @@ 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" ) {
-		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();
-	    }
-	}
+  // 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;
-	}
+  d->locationCombo->insertItem( hardDiskHome );
+  locations.append( hardDiskPath );
+  if ( currentLocation == -1 ) { // assume it's the hard disk
+      d->locationCombo->setCurrentItem( index );
+      currentLocation = index;
+  }
     }
 }
 
@@ -200,13 +201,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();
 }
@@ -217,8 +218,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();
@@ -239,21 +240,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 );
@@ -261,49 +262,49 @@ 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);
+        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 );
 }