From dc61e6ba1fb95e182aca9d3fb0346361b3fe86fe Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Sun, 27 Aug 2023 12:54:54 +0200 Subject: [PATCH] 1.11.0b --- CHANGELOG.md | 3 +- .../SandMan/Wizards/BoxAssistant.cpp | 42 +++++++++---------- .../SandMan/Wizards/NewBoxWizard.cpp | 20 ++++----- SandboxiePlus/SandMan/Wizards/SetupWizard.cpp | 16 +++---- .../SandMan/Wizards/TemplateWizard.cpp | 16 +++---- 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb92e063..5bb8f983 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - fixed issue when re creating rambox junction - +- fixed Side logo cut-off in all wizards [#3227](https://github.com/sandboxie-plus/Sandboxie/issues/3227) +- fixed Text cut-off in box creation wizard [#3226](https://github.com/sandboxie-plus/Sandboxie/issues/3226) ## [1.11.0 / 5.66.0] - 2023-08-25 diff --git a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp index 8f51e91e..4c3c7c19 100644 --- a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp +++ b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp @@ -226,10 +226,10 @@ CBeginPage::CBeginPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Troubleshooting Wizard")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; m_pLayout = new QGridLayout; @@ -328,10 +328,10 @@ CGroupPage::CGroupPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Select issue from group")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; m_pLayout = new QGridLayout; @@ -451,10 +451,10 @@ CListPage::CListPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Select issue from full list")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; m_pLayout = new QGridLayout; @@ -807,10 +807,10 @@ CSubmitPage::CSubmitPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Submit Issue Report")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; QGridLayout* pLayout = new QGridLayout; @@ -1060,10 +1060,10 @@ CCompletePage::CCompletePage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Troubleshooting Completed")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); QVBoxLayout *pLayout = new QVBoxLayout; @@ -1082,4 +1082,4 @@ CCompletePage::CCompletePage(QWidget *parent) void CCompletePage::initializePage() { //wizard()->button(QWizard::CancelButton)->setEnabled(false); -} +} \ No newline at end of file diff --git a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp index d88e3f0c..3116b1cc 100644 --- a/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/NewBoxWizard.cpp @@ -31,7 +31,7 @@ CNewBoxWizard::CNewBoxWizard(bool bAlowTemp, QWidget *parent) setWindowTitle(tr("New Box Wizard")); - setMinimumWidth(600); + setMinimumWidth(600 * theConf->GetInt("Options/FontScaling", 100) / 100); } void CNewBoxWizard::showHelp() @@ -208,10 +208,10 @@ CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent) : QWizardPage(parent) { setTitle(tr("Create new Sandbox")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); m_bInstant = theConf->GetBool("Options/InstantBoxWizard", false); @@ -696,10 +696,10 @@ CSummaryPage::CSummaryPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Create the new Sandbox")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; QGridLayout *layout = new QGridLayout; @@ -726,7 +726,7 @@ CSummaryPage::CSummaryPage(QWidget *parent) pSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); layout->addWidget(pSpacer, row++, 1); - m_pSetInstant = new QCheckBox(tr("Don't show the summary page in future (unless advanced options were set)")); + m_pSetInstant = new QCheckBox(tr("Skip this summary page when advanced options are not set")); m_pSetInstant->setChecked(theConf->GetBool("Options/InstantBoxWizard", false)); layout->addWidget(m_pSetInstant, row++, 1, 1, 2); diff --git a/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp b/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp index 6d554917..aefd1736 100644 --- a/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/SetupWizard.cpp @@ -156,10 +156,10 @@ CIntroPage::CIntroPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Introduction")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); QVBoxLayout *layout = new QVBoxLayout; QLabel* pTopLabel = new QLabel(tr("Welcome to the Setup Wizard. This wizard will help you to configure your copy of Sandboxie-Plus. " @@ -709,10 +709,10 @@ CFinishPage::CFinishPage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Complete your configuration")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); QVBoxLayout *layout = new QVBoxLayout; diff --git a/SandboxiePlus/SandMan/Wizards/TemplateWizard.cpp b/SandboxiePlus/SandMan/Wizards/TemplateWizard.cpp index ebcd7367..b97de685 100644 --- a/SandboxiePlus/SandMan/Wizards/TemplateWizard.cpp +++ b/SandboxiePlus/SandMan/Wizards/TemplateWizard.cpp @@ -256,10 +256,10 @@ CTemplateTypePage::CTemplateTypePage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Create new Template")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; QGridLayout *layout = new QGridLayout; @@ -937,10 +937,10 @@ CFinishTemplatePage::CFinishTemplatePage(QWidget *parent) : QWizardPage(parent) { setTitle(tr("Create Web Browser Template")); - if (theGUI->m_DarkTheme) - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); - else - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); + QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png"); + int Scaling = theConf->GetInt("Options/FontScaling", 100); + if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100); + setPixmap(QWizard::WatermarkPixmap, Logo); int row = 0; QGridLayout *layout = new QGridLayout;