diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 3b283b3dd..590674a29 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -37,7 +37,7 @@ msgid "&Hide status bar" msgstr "&Masquer la barre de status" msgid "Hide &toolbar" -msgstr "Hide &toolbar" +msgstr "Masquer la &barre d'outils" msgid "&Resizeable window" msgstr "Fenètre &Retaillable" diff --git a/src/qt/qt.c b/src/qt/qt.c index 13ddbf498..a9a6460eb 100644 --- a/src/qt/qt.c +++ b/src/qt/qt.c @@ -54,8 +54,6 @@ plat_vidapi(const char *api) return 4; } else if (!strcasecmp(api, "vnc")) { return 5; - } else if (!strcasecmp(api, "qt_opengl3_pcem")) { - return 6; } return 0; @@ -85,9 +83,6 @@ plat_vidapi_name(int api) case 5: name = "vnc"; break; - case 6: - name = "qt_opengl3_pcem"; - break; default: fatal("Unknown renderer: %i\n", api); break; diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index cdb46cb29..d2c4667cd 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -454,9 +454,6 @@ MainWindow::MainWindow(QWidget *parent) endblit(); } #endif - case 6: - newVidApi = RendererStack::Renderer::OpenGL3PCem; - break; } ui->stackedWidget->switchRenderer(newVidApi); if (!show_second_monitors) @@ -468,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent) }); connect(ui->stackedWidget, &RendererStack::rendererChanged, [this]() { - ui->actionRenderer_options->setVisible(ui->stackedWidget->hasOptions()); + ui->actionRenderer_options->setEnabled(ui->stackedWidget->hasOptions()); }); /* Trigger initial renderer switch */ diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index 43e696085..bd1fd2609 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -339,26 +339,6 @@ RendererStack::createRenderer(Renderer renderer) current.reset(this->createWindowContainer(hw, this)); break; } - case Renderer::OpenGL3PCem: - { - this->createWinId(); - auto hw = new OpenGLRenderer(this); - rendererWindow = hw; - connect(this, &RendererStack::blitToRenderer, hw, &OpenGLRenderer::onBlit, Qt::QueuedConnection); - connect(hw, &OpenGLRenderer::initialized, [=]() { - /* Buffers are available only after initialization. */ - imagebufs = rendererWindow->getBuffers(); - endblit(); - emit rendererChanged(); - }); - connect(hw, &OpenGLRenderer::errorInitializing, [=]() { - /* Renderer not could initialize, fallback to software. */ - imagebufs = {}; - QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); }); - }); - current.reset(this->createWindowContainer(hw, this)); - break; - } case Renderer::OpenGL3: { this->createWinId(); @@ -431,7 +411,7 @@ RendererStack::createRenderer(Renderer renderer) currentBuf = 0; - if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan && renderer != Renderer::OpenGL3PCem) { + if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan) { imagebufs = rendererWindow->getBuffers(); endblit(); emit rendererChanged(); diff --git a/src/qt/qt_rendererstack.hpp b/src/qt/qt_rendererstack.hpp index a84773c72..309cae7f5 100644 --- a/src/qt/qt_rendererstack.hpp +++ b/src/qt/qt_rendererstack.hpp @@ -61,7 +61,6 @@ public: OpenGLES, OpenGL3, Vulkan, - OpenGL3PCem = 6, None = -1 }; void switchRenderer(Renderer renderer);