diff --git a/conf/dlgperformancebase.ui b/conf/dlgperformancebase.ui index 8d58c9418..3a9f9aac4 100644 --- a/conf/dlgperformancebase.ui +++ b/conf/dlgperformancebase.ui @@ -52,13 +52,6 @@ - - - - Enable &background generation - - - diff --git a/conf/okular.kcfg b/conf/okular.kcfg index 22783c7c7..91747337b 100644 --- a/conf/okular.kcfg +++ b/conf/okular.kcfg @@ -65,9 +65,6 @@ true - - true - Enabled diff --git a/core/document.cpp b/core/document.cpp index 4803f5276..7f006e664 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -2363,7 +2363,6 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests, } // 2. [ADD TO STACK] add requests to stack - bool threadingDisabled = !Settings::enableThreading(); QLinkedList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd(); for ( ; rIt != rEnd; ++rIt ) { @@ -2382,9 +2381,6 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests, if ( !request->asynchronous() ) request->d->mPriority = 0; - if ( request->asynchronous() && threadingDisabled ) - request->d->mAsynchronous = false; - // add request to the 'stack' at the right place if ( !request->priority() ) // add priority zero requests to the top of the stack diff --git a/doc/index.docbook b/doc/index.docbook index 06c3247fb..90fba8360 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1580,14 +1580,6 @@ Add a 'Find Previous' entry outline or opaque fill styles and increase speed on selections. - - Enable background generation - - Use a background thread to generate the pages. By disabling - this option the user interface will become less reactive (will be blocked - if necessary), but pages will be displayed a bit faster. - - Memory Usage diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 205a9fa9f..496abdc07 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -4001,8 +4001,7 @@ void PageView::slotRequestVisiblePixmaps( int newValue ) // if preloading is enabled, add the pages before and after in preloading if ( !d->visibleItems.isEmpty() && - Okular::Settings::memoryLevel() != Okular::Settings::EnumMemoryLevel::Low && - Okular::Settings::enableThreading() ) + Okular::Settings::memoryLevel() != Okular::Settings::EnumMemoryLevel::Low ) { // as the requests are done in the order as they appear in the list, // request first the next page and then the previous diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp index 96b555fa6..9ba942b2b 100644 --- a/ui/presentationwidget.cpp +++ b/ui/presentationwidget.cpp @@ -1227,7 +1227,7 @@ void PresentationWidget::requestPixmaps() // restore cursor QApplication::restoreOverrideCursor(); // ask for next and previous page if not in low memory usage setting - if ( Okular::Settings::memoryLevel() != Okular::Settings::EnumMemoryLevel::Low && Okular::Settings::enableThreading() ) + if ( Okular::Settings::memoryLevel() != Okular::Settings::EnumMemoryLevel::Low ) { int pagesToPreload = 1;