From 12fa896554321892e88ca05407cf125a7ccf92c1 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Tue, 3 Jul 2018 15:47:24 +0200 Subject: [PATCH] [opencl] Add options widget --- src/app/qgsoptions.cpp | 10 +++++----- src/ui/qgsoptionsbase.ui | 30 +----------------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index f80855199756..f4fe9ebe5abf 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -1104,16 +1104,16 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QListsetEnabled( false ); - mGPUInfoTextBrowser->setText( QStringLiteral( "An OpenCL compatible device was not found on your system.
" - "You may need to install additional libraries in order to enable OpenCL.
" - "Please check your logs for further details." ) ); + mGPUInfoTextBrowser->setText( tr( "An OpenCL compatible device was not found on your system.
" + "You may need to install additional libraries in order to enable OpenCL.
" + "Please check your logs for further details." ) ); } #else - mOptionsListWidget->removeItemWidget( mOptionsListWidget->findItems( QStringLiteral( "GPU" ), Qt::MatchExactly ).first() ); - mOptionsStackedWidget->removeWidget( mOptionsPageGPU ); + mOptionsListWidget->removeItemWidget( mOptionsListWidget->findItems( tr( "Acceleration" ), Qt::MatchExactly ).first() ); + mOptionsStackedWidget->removeWidget( mOptionsPageAcceleration ); #endif diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui index 491724b8a8bd..6d9dd07ea4fb 100644 --- a/src/ui/qgsoptionsbase.ui +++ b/src/ui/qgsoptionsbase.ui @@ -5319,7 +5319,7 @@ The bigger the number, the faster zooming with the mouse wheel will be. - + @@ -5739,34 +5739,6 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - - - - - - - - - - - - - - - - - - -