Merge pull request #6906 from spycrab/qt_gfx_prettytitle

Qt/GraphicsWindow: Show display name in title
This commit is contained in:
spycrab 2018-05-19 20:50:16 +02:00 committed by GitHub
commit 72d38ac615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -12,6 +12,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "DolphinQt2/Config/Graphics/AdvancedWidget.h" #include "DolphinQt2/Config/Graphics/AdvancedWidget.h"
#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h" #include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
#include "DolphinQt2/Config/Graphics/GeneralWidget.h" #include "DolphinQt2/Config/Graphics/GeneralWidget.h"
@ -19,6 +20,8 @@
#include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h" #include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h"
#include "DolphinQt2/MainWindow.h" #include "DolphinQt2/MainWindow.h"
#include "DolphinQt2/QtUtils/WrapInScrollArea.h" #include "DolphinQt2/QtUtils/WrapInScrollArea.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent) GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent)
@ -93,7 +96,8 @@ void GraphicsWindow::CreateMainLayout()
void GraphicsWindow::OnBackendChanged(const QString& backend) void GraphicsWindow::OnBackendChanged(const QString& backend)
{ {
setWindowTitle(tr("Dolphin %1 Graphics Configuration").arg(backend)); setWindowTitle(tr("%1 Graphics Configuration")
.arg(QString::fromStdString(g_video_backend->GetDisplayName())));
if (backend == QStringLiteral("Software Renderer") && m_tab_widget->count() > 1) if (backend == QStringLiteral("Software Renderer") && m_tab_widget->count() > 1)
{ {
m_tab_widget->clear(); m_tab_widget->clear();