From 281e69e5e141d843e9c4554c50031332b509b485 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Sat, 6 Feb 2016 17:06:54 -0700 Subject: [PATCH] Improved HiDPI support and added Stable Tooltip --- OpenRCT2Launcher/configuration.ui | 23 ++++++++++++++++++++++- OpenRCT2Launcher/mainwindow.cpp | 5 ++++- OpenRCT2Launcher/mainwindow.ui | 23 ++++++++++++++++++++++- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/OpenRCT2Launcher/configuration.ui b/OpenRCT2Launcher/configuration.ui index 83d0e17..9522b13 100644 --- a/OpenRCT2Launcher/configuration.ui +++ b/OpenRCT2Launcher/configuration.ui @@ -7,9 +7,27 @@ 0 0 720 - 471 + 480 + + + 0 + 0 + + + + + 720 + 480 + + + + + 720 + 480 + + Options @@ -88,6 +106,9 @@ false + + Stable is not currently avaiable through the launcher + Stable diff --git a/OpenRCT2Launcher/mainwindow.cpp b/OpenRCT2Launcher/mainwindow.cpp index fd1569b..b8cdc3c 100644 --- a/OpenRCT2Launcher/mainwindow.cpp +++ b/OpenRCT2Launcher/mainwindow.cpp @@ -15,6 +15,10 @@ MainWindow::MainWindow(QWidget *parent) : ui->progressBar->setHidden(true); connect(ui->launchButton, &QPushButton::clicked, this, &MainWindow::launch); +#ifndef Q_OS_OSX + ui->splash->setScaledContents(true); +#endif + connect(&updater, &Updater::installed, [this]{ ui->progressBar->setHidden(true); ui->launchButton->setEnabled(true); }); connect(&updater, &Updater::error, [this](QString error){ ui->errorLabel->setText(error); ui->launchButton->setEnabled(true); }); connect(&updater, &Updater::downloadProgress, [this](qint64 bytesReceived, qint64 bytesTotal){ @@ -28,7 +32,6 @@ MainWindow::~MainWindow() delete ui; } -#include void MainWindow::on_optionsButton_clicked() { QDir dir = QDir::home(); if (dir.cd(OPENRCT2_BASE)) { diff --git a/OpenRCT2Launcher/mainwindow.ui b/OpenRCT2Launcher/mainwindow.ui index 49e3199..2deb74b 100644 --- a/OpenRCT2Launcher/mainwindow.ui +++ b/OpenRCT2Launcher/mainwindow.ui @@ -10,6 +10,24 @@ 280 + + + 0 + 0 + + + + + 420 + 280 + + + + + 420 + 280 + + OpenRCT2 Launcher @@ -31,10 +49,13 @@ 0 - + :/splash.png + + Qt::AlignBottom|Qt::AlignHCenter +