-rw-r--r-- | core/launcher/documentlist.cpp | 20 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 16 | ||||
-rw-r--r-- | core/launcher/launcher.h | 2 |
3 files changed, 14 insertions, 24 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index dcea4b9..1a7de33 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp | |||
@@ -98,5 +98,9 @@ DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs, | |||
98 | d = new DocumentListPrivate( serverGui ); | 98 | d = new DocumentListPrivate( serverGui ); |
99 | d->scanDocs = scanDocs; | ||
100 | d->needToSendAllDocLinks = false; | 99 | d->needToSendAllDocLinks = false; |
101 | 100 | ||
101 | Config cfg( "Launcher" ); | ||
102 | cfg.setGroup( "DocTab" ); | ||
103 | d->scanDocs = cfg.readBoolEntry( "Enable", true ); | ||
104 | qDebug( "DocumentList::DocumentList() : scanDocs = %d", d->scanDocs ); | ||
105 | |||
102 | QTimer::singleShot( 10, this, SLOT( startInitialScan() ) ); | 106 | QTimer::singleShot( 10, this, SLOT( startInitialScan() ) ); |
@@ -107,17 +111,3 @@ void DocumentList::startInitialScan() | |||
107 | reloadAppLnks(); | 111 | reloadAppLnks(); |
108 | |||
109 | Config cfg( "Launcher" ); | ||
110 | cfg.setGroup( "DocTab" ); | ||
111 | bool docTabEnabled = cfg.readBoolEntry( "Enable", true ); | ||
112 | if ( docTabEnabled ) | ||
113 | reloadDocLnks(); | 112 | reloadDocLnks(); |
114 | else | ||
115 | { | ||
116 | if ( d->sendDocLnks && d->serverGui ) | ||
117 | { | ||
118 | d->serverGui->documentScanningProgress( 0 ); | ||
119 | d->serverGui->allDocumentsRemoved(); | ||
120 | } | ||
121 | } | ||
122 | |||
123 | } | 113 | } |
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index b312672..344cd46 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -154,2 +154,3 @@ void LauncherTabWidget::createDocLoadingWidget() | |||
154 | docLoadingWidgetProgress->hide(); | 154 | docLoadingWidgetProgress->hide(); |
155 | docLoadingWidgetEnabled = true; | ||
155 | } | 156 | } |
@@ -503,2 +504,9 @@ Launcher::~Launcher() | |||
503 | 504 | ||
505 | bool Launcher::requiresDocuments() const | ||
506 | { | ||
507 | Config cfg( "Launcher" ); | ||
508 | cfg.setGroup( "DocTab" ); | ||
509 | return cfg.readBoolEntry( "Enable", true ); | ||
510 | } | ||
511 | |||
504 | void Launcher::makeVisible() | 512 | void Launcher::makeVisible() |
@@ -751,10 +759,2 @@ void Launcher::documentScanningProgress( int percent ) | |||
751 | { | 759 | { |
752 | if ( !docTabEnabled ) | ||
753 | { | ||
754 | qDebug( "Launcher: document tab disabled!" ); | ||
755 | tabs->setLoadingProgress( 100 ); | ||
756 | tabs->setLoadingWidgetEnabled( TRUE ); | ||
757 | return; | ||
758 | } | ||
759 | |||
760 | switch ( percent ) { | 760 | switch ( percent ) { |
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h index 1d046ee..4f3ff8c 100644 --- a/core/launcher/launcher.h +++ b/core/launcher/launcher.h | |||
@@ -118,3 +118,3 @@ public: | |||
118 | bool requiresApplications() const { return TRUE; } | 118 | bool requiresApplications() const { return TRUE; } |
119 | bool requiresDocuments() const { return TRUE; } | 119 | bool requiresDocuments() const; |
120 | void showLoadingDocs(); | 120 | void showLoadingDocs(); |