summaryrefslogtreecommitdiff
path: root/core/launcher
authorkergoth <kergoth>2002-01-31 18:35:48 (UTC)
committer kergoth <kergoth>2002-01-31 18:35:48 (UTC)
commit2802e5a2b474101a50bf95e707061ca5542876fd (patch) (side-by-side diff)
treea1015514ef9e48df091903cccf0d3174e272f663 /core/launcher
parent48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff)
downloadopie-2802e5a2b474101a50bf95e707061ca5542876fd.zip
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2
*** empty log message ***
Diffstat (limited to 'core/launcher') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/launcherview.cpp27
2 files changed, 19 insertions, 10 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -6,6 +6,7 @@ DESTDIR = $(OPIEDIR)/bin
HEADERS = background.h \
desktop.h \
+ qprocess.h \
info.h \
appicons.h \
taskbar.h \
@@ -46,6 +47,7 @@ HEADERS = background.h \
SOURCES = background.cpp \
desktop.cpp \
+ qprocess.cpp qprocess_unix.cpp \
info.cpp \
appicons.cpp \
taskbar.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -212,10 +212,8 @@ public:
case Name:
return a->name().compare(b->name());
case Date: {
- QFileInfo fa(a->linkFile());
- if ( !fa.exists() ) fa.setFile(a->file());
- QFileInfo fb(b->linkFile());
- if ( !fb.exists() ) fb.setFile(b->file());
+ QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+ QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
return fa.lastModified().secsTo(fb.lastModified());
}
case Type:
@@ -362,6 +360,8 @@ void LauncherIconView::hideOrShowItems(bool resort)
links.append(item->takeAppLnk());
item = (LauncherItem*)item->nextItem();
}
+ bool oldAutoArrange = autoArrange();
+ setAutoArrange( FALSE );
clear();
QListIterator<AppLnk> it(links);
AppLnk* l;
@@ -371,28 +371,35 @@ void LauncherIconView::hideOrShowItems(bool resort)
}
if ( resort )
sort();
+ setAutoArrange( oldAutoArrange );
}
bool LauncherIconView::removeLink(const QString& linkfile)
{
LauncherItem* item = (LauncherItem*)firstItem();
+ AppLnk* l;
+ bool did = FALSE;
+ DocLnk dl(linkfile);
while (item) {
- if ( item->appLnk()->linkFile() == linkfile ) {
+ l = item->appLnk();
+ if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
delete item;
- return TRUE;
+ did = TRUE;
}
item = (LauncherItem*)item->nextItem();
}
QListIterator<AppLnk> it(hidden);
- AppLnk* l;
while ((l=it.current())) {
++it;
- if ( l->linkFile() == linkfile ) {
+ if ( l->linkFileKnown() && l->linkFile() == linkfile
+ || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
hidden.removeRef(l);
- return TRUE;
+ did = TRUE;
}
}
- return FALSE;
+ return did;
}
LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )