This commit is contained in:
DavidXanatos 2023-08-27 12:54:54 +02:00
parent 938e0a8c8d
commit dc61e6ba1f
5 changed files with 49 additions and 48 deletions

View File

@ -14,7 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- fixed issue when re creating rambox junction - 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 ## [1.11.0 / 5.66.0] - 2023-08-25

View File

@ -226,10 +226,10 @@ CBeginPage::CBeginPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Troubleshooting Wizard")); setTitle(tr("Troubleshooting Wizard"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
m_pLayout = new QGridLayout; m_pLayout = new QGridLayout;
@ -328,10 +328,10 @@ CGroupPage::CGroupPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Select issue from group")); setTitle(tr("Select issue from group"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
m_pLayout = new QGridLayout; m_pLayout = new QGridLayout;
@ -451,10 +451,10 @@ CListPage::CListPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Select issue from full list")); setTitle(tr("Select issue from full list"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
m_pLayout = new QGridLayout; m_pLayout = new QGridLayout;
@ -807,10 +807,10 @@ CSubmitPage::CSubmitPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Submit Issue Report")); setTitle(tr("Submit Issue Report"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
QGridLayout* pLayout = new QGridLayout; QGridLayout* pLayout = new QGridLayout;
@ -1060,10 +1060,10 @@ CCompletePage::CCompletePage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Troubleshooting Completed")); setTitle(tr("Troubleshooting Completed"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
QVBoxLayout *pLayout = new QVBoxLayout; QVBoxLayout *pLayout = new QVBoxLayout;

View File

@ -31,7 +31,7 @@ CNewBoxWizard::CNewBoxWizard(bool bAlowTemp, QWidget *parent)
setWindowTitle(tr("New Box Wizard")); setWindowTitle(tr("New Box Wizard"));
setMinimumWidth(600); setMinimumWidth(600 * theConf->GetInt("Options/FontScaling", 100) / 100);
} }
void CNewBoxWizard::showHelp() void CNewBoxWizard::showHelp()
@ -208,10 +208,10 @@ CBoxTypePage::CBoxTypePage(bool bAlowTemp, QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Create new Sandbox")); setTitle(tr("Create new Sandbox"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
m_bInstant = theConf->GetBool("Options/InstantBoxWizard", false); m_bInstant = theConf->GetBool("Options/InstantBoxWizard", false);
@ -696,10 +696,10 @@ CSummaryPage::CSummaryPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Create the new Sandbox")); setTitle(tr("Create the new Sandbox"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
QGridLayout *layout = new QGridLayout; QGridLayout *layout = new QGridLayout;
@ -726,7 +726,7 @@ CSummaryPage::CSummaryPage(QWidget *parent)
pSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); pSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
layout->addWidget(pSpacer, row++, 1); 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)); m_pSetInstant->setChecked(theConf->GetBool("Options/InstantBoxWizard", false));
layout->addWidget(m_pSetInstant, row++, 1, 1, 2); layout->addWidget(m_pSetInstant, row++, 1, 1, 2);

View File

@ -156,10 +156,10 @@ CIntroPage::CIntroPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Introduction")); setTitle(tr("Introduction"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
QLabel* pTopLabel = new QLabel(tr("Welcome to the Setup Wizard. This wizard will help you to configure your copy of <b>Sandboxie-Plus</b>. " QLabel* pTopLabel = new QLabel(tr("Welcome to the Setup Wizard. This wizard will help you to configure your copy of <b>Sandboxie-Plus</b>. "
@ -709,10 +709,10 @@ CFinishPage::CFinishPage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Complete your configuration")); setTitle(tr("Complete your configuration"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;

View File

@ -256,10 +256,10 @@ CTemplateTypePage::CTemplateTypePage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Create new Template")); setTitle(tr("Create new Template"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
QGridLayout *layout = new QGridLayout; QGridLayout *layout = new QGridLayout;
@ -937,10 +937,10 @@ CFinishTemplatePage::CFinishTemplatePage(QWidget *parent)
: QWizardPage(parent) : QWizardPage(parent)
{ {
setTitle(tr("Create Web Browser Template")); setTitle(tr("Create Web Browser Template"));
if (theGUI->m_DarkTheme) QPixmap Logo = QPixmap(theGUI->m_DarkTheme ? ":/SideLogoDM.png" : ":/SideLogo.png");
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogoDM.png")); int Scaling = theConf->GetInt("Options/FontScaling", 100);
else if(Scaling != 100) Logo = Logo.scaled(Logo.width() * Scaling / 100, Logo.height() * Scaling / 100);
setPixmap(QWizard::WatermarkPixmap, QPixmap(":/SideLogo.png")); setPixmap(QWizard::WatermarkPixmap, Logo);
int row = 0; int row = 0;
QGridLayout *layout = new QGridLayout; QGridLayout *layout = new QGridLayout;