summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-19 07:12:16 (UTC)
committer zecke <zecke>2004-04-19 07:12:16 (UTC)
commit0b59a16b5a5a179c46ddb3f8c585dbca59b2826e (patch) (side-by-side diff)
tree3780a3ae09806e781582aefb23ad3040bc15d816
parent359b681f32d5c3ac2ea3bfd39a3637d211338bf7 (diff)
downloadopie-0b59a16b5a5a179c46ddb3f8c585dbca59b2826e.zip
opie-0b59a16b5a5a179c46ddb3f8c585dbca59b2826e.tar.gz
opie-0b59a16b5a5a179c46ddb3f8c585dbca59b2826e.tar.bz2
Small interface update. If we add doctypes disable the viewport() for
updates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/documentlist.cpp8
-rw-r--r--core/launcher/launcher.cpp10
-rw-r--r--core/launcher/launcher.h2
-rw-r--r--core/launcher/serverinterface.h2
4 files changed, 20 insertions, 2 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 59dd721..19ceb0f 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -59,25 +59,25 @@ class DocumentListPrivate : public QObject {
Q_OBJECT
public:
DocumentListPrivate( ServerInterface *gui );
~DocumentListPrivate();
void initialize();
const QString nextFile();
const DocLnk *iterate();
bool store( DocLnk* dl );
void estimatedPercentScanned();
void appendDocpath(FileSystem*);
-
+
DocLnkSet dls;
QDict<void> reference;
QDictIterator<void> *dit;
enum { Find, RemoveKnownFiles, MakeUnknownFiles, Done } state;
QStringList docPaths;
unsigned int docPathsSearched;
int searchDepth;
QDir *listDirs[MAX_SEARCH_DEPTH];
const QFileInfoList *lists[MAX_SEARCH_DEPTH];
@@ -181,38 +181,42 @@ void DocumentList::rescan()
{
//odebug << "rescan" << oendl;
pause();
d->initialize();
resume();
}
void DocumentList::timerEvent( QTimerEvent *te )
{
if ( te->timerId() == d->tid ) {
// Do 3 at a time
+ if ( d->serverGui )
+ d->serverGui->aboutToAddBegin();
for (int i = 0; i < 3; i++ ) {
const DocLnk *lnk = d->iterate();
if ( lnk ) {
add( *lnk );
} else {
// stop when done
pause();
if ( d->serverGui )
d->serverGui->documentScanningProgress( 100 );
if ( d->needToSendAllDocLinks )
sendAllDocLinks();
break;
}
- }
+ }
+ if ( d->serverGui )
+ d->serverGui->aboutToAddEnd();
}
}
void DocumentList::reloadAppLnks()
{
if ( d->sendAppLnks && d->serverGui ) {
d->serverGui->applicationScanningProgress( 0 );
d->serverGui->allApplicationsRemoved();
}
delete appLnkSet;
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index bf2287d..6afbcd8 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -687,24 +687,34 @@ void Launcher::applicationRemoved( const QString& type, const AppLnk& app )
void Launcher::allApplicationsRemoved()
{
MimeType::clear();
for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it)
tabs->view( (*it) )->removeAllItems();
}
void Launcher::documentAdded( const DocLnk& doc )
{
tabs->docView()->addItem( new DocLnk( doc ), FALSE );
}
+void Launcher::aboutToAddBegin()
+{
+ tabs->docView()->setUpdatesEnabled( false );
+}
+
+void Launcher::aboutToAddEnd()
+{
+ tabs->docView()->setUpdatesEnabled( true );
+}
+
void Launcher::showLoadingDocs()
{
tabs->docView()->hide();
}
void Launcher::showDocTab()
{
if ( tabs->categoryBar->currentView() == tabs->docView() )
tabs->docView()->show();
}
void Launcher::documentRemoved( const DocLnk& doc )
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 4f3ff8c..29bd7db 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -101,24 +101,26 @@ public:
// implementing ServerInterface
void createGUI();
void destroyGUI();
void typeAdded( const QString& type, const QString& name, const QPixmap& pixmap, const QPixmap& bgPixmap );
void typeRemoved( const QString& type );
void applicationAdded( const QString& type, const AppLnk& doc );
void applicationRemoved( const QString& type, const AppLnk& doc );
void allApplicationsRemoved();
void applicationStateChanged( const QString& name, ApplicationState state );
void documentAdded( const DocLnk& doc );
void documentRemoved( const DocLnk& doc );
+ void aboutToAddBegin();
+ void aboutToAddEnd();
void allDocumentsRemoved();
void documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc );
void storageChanged( const QList<FileSystem> & );
void applicationScanningProgress( int percent );
void documentScanningProgress( int percent );
bool requiresApplications() const { return TRUE; }
bool requiresDocuments() const;
void showLoadingDocs();
void showDocTab();
QStringList idList() const { return ids; }
diff --git a/core/launcher/serverinterface.h b/core/launcher/serverinterface.h
index e57ea51..132766f 100644
--- a/core/launcher/serverinterface.h
+++ b/core/launcher/serverinterface.h
@@ -41,24 +41,26 @@ public:
virtual void typeRemoved( const QString& type ) = 0;
// These functions notify when an application is added or removed and to which category it belongs
virtual void applicationAdded( const QString& type, const AppLnk& doc ) = 0;
virtual void applicationRemoved( const QString& type, const AppLnk& doc ) = 0;
virtual void allApplicationsRemoved() = 0;
// Useful for wait icons, or running application lists etc
enum ApplicationState { Launching, Running, Terminated };
virtual void applicationStateChanged( const QString& name, ApplicationState state ) = 0;
static const AppLnkSet& appLnks();
// These functions notify of adding, removal and changes of document links used in the documents tab for example
+ virtual void aboutToAddBegin() {}
+ virtual void aboutToAddEnd() {}
virtual void documentAdded( const DocLnk& doc ) = 0;
virtual void documentRemoved( const DocLnk& doc ) = 0;
virtual void allDocumentsRemoved() = 0;
virtual void documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc ) = 0;
virtual void storageChanged( const QList<FileSystem> & ) = 0;
virtual void applicationScanningProgress( int percent ) = 0;
virtual void documentScanningProgress( int percent ) = 0;
// Tells the server if the GUI needs to be updated about documents or applnks
virtual bool requiresApplications() const = 0;