Make renderer options item enabled/disabled instead
Also a missed French translation
This commit is contained in:
@@ -37,7 +37,7 @@ msgid "&Hide status bar"
|
|||||||
msgstr "&Masquer la barre de status"
|
msgstr "&Masquer la barre de status"
|
||||||
|
|
||||||
msgid "Hide &toolbar"
|
msgid "Hide &toolbar"
|
||||||
msgstr "Hide &toolbar"
|
msgstr "Masquer la &barre d'outils"
|
||||||
|
|
||||||
msgid "&Resizeable window"
|
msgid "&Resizeable window"
|
||||||
msgstr "Fenètre &Retaillable"
|
msgstr "Fenètre &Retaillable"
|
||||||
|
|||||||
@@ -54,8 +54,6 @@ plat_vidapi(const char *api)
|
|||||||
return 4;
|
return 4;
|
||||||
} else if (!strcasecmp(api, "vnc")) {
|
} else if (!strcasecmp(api, "vnc")) {
|
||||||
return 5;
|
return 5;
|
||||||
} else if (!strcasecmp(api, "qt_opengl3_pcem")) {
|
|
||||||
return 6;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -85,9 +83,6 @@ plat_vidapi_name(int api)
|
|||||||
case 5:
|
case 5:
|
||||||
name = "vnc";
|
name = "vnc";
|
||||||
break;
|
break;
|
||||||
case 6:
|
|
||||||
name = "qt_opengl3_pcem";
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
fatal("Unknown renderer: %i\n", api);
|
fatal("Unknown renderer: %i\n", api);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -454,9 +454,6 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
endblit();
|
endblit();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
case 6:
|
|
||||||
newVidApi = RendererStack::Renderer::OpenGL3PCem;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
ui->stackedWidget->switchRenderer(newVidApi);
|
ui->stackedWidget->switchRenderer(newVidApi);
|
||||||
if (!show_second_monitors)
|
if (!show_second_monitors)
|
||||||
@@ -468,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
});
|
});
|
||||||
|
|
||||||
connect(ui->stackedWidget, &RendererStack::rendererChanged, [this]() {
|
connect(ui->stackedWidget, &RendererStack::rendererChanged, [this]() {
|
||||||
ui->actionRenderer_options->setVisible(ui->stackedWidget->hasOptions());
|
ui->actionRenderer_options->setEnabled(ui->stackedWidget->hasOptions());
|
||||||
});
|
});
|
||||||
|
|
||||||
/* Trigger initial renderer switch */
|
/* Trigger initial renderer switch */
|
||||||
|
|||||||
@@ -339,26 +339,6 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
current.reset(this->createWindowContainer(hw, this));
|
current.reset(this->createWindowContainer(hw, this));
|
||||||
break;
|
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:
|
case Renderer::OpenGL3:
|
||||||
{
|
{
|
||||||
this->createWinId();
|
this->createWinId();
|
||||||
@@ -431,7 +411,7 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
|
|
||||||
currentBuf = 0;
|
currentBuf = 0;
|
||||||
|
|
||||||
if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan && renderer != Renderer::OpenGL3PCem) {
|
if (renderer != Renderer::OpenGL3 && renderer != Renderer::Vulkan) {
|
||||||
imagebufs = rendererWindow->getBuffers();
|
imagebufs = rendererWindow->getBuffers();
|
||||||
endblit();
|
endblit();
|
||||||
emit rendererChanged();
|
emit rendererChanged();
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ public:
|
|||||||
OpenGLES,
|
OpenGLES,
|
||||||
OpenGL3,
|
OpenGL3,
|
||||||
Vulkan,
|
Vulkan,
|
||||||
OpenGL3PCem = 6,
|
|
||||||
None = -1
|
None = -1
|
||||||
};
|
};
|
||||||
void switchRenderer(Renderer renderer);
|
void switchRenderer(Renderer renderer);
|
||||||
|
|||||||
Reference in New Issue
Block a user