Skip to content

Commit

Permalink
remove scale
Browse files Browse the repository at this point in the history
  • Loading branch information
@sithlord48
sithlord48 committed Mar 23, 2022
1 parent a2406ff commit d6ede88
Show file tree
Hide file tree
Showing 7 changed files with 213 additions and 455 deletions.
1 change: 0 additions & 1 deletion src/bcsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ void BCSettings::restoreDefaultSettings()
settings->setValue(SETTINGS::WORLDMAPADVANCED, false);
settings->setValue(SETTINGS::REGION, QStringLiteral("NTSC-U"));
settings->setValue(SETTINGS::CUSTOMDEFAULTSAVE, false);
settings->setValue(SETTINGS::SCALE, 1.00);
settings->setValue(SETTINGS::AUTOGROWTH, true);
settings->setValue(SETTINGS::USENATIVEDIALOGS, false);
settings->setValue(SETTINGS::COLORSCHEME, 0);
Expand Down
2 changes: 0 additions & 2 deletions src/bcsettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ namespace SETTINGS {
inline const static QString REGION = QStringLiteral("region");
inline const static QString EMUSAVEPATH = QStringLiteral("save_emu_path");
inline const static QString PCSAVEPATH = QStringLiteral("save_pc_path");
inline const static QString SCALE = QStringLiteral("scale");
inline const static QString ENABLETEST = QStringLiteral("show_test");
inline const static QString WORLDMAPADVANCED = QStringLiteral("worldMapAdvanced");
inline const static QString USENATIVEDIALOGS = QStringLiteral("useNativeDialogs");
Expand Down Expand Up @@ -82,7 +81,6 @@ class BCSettings : public QObject
SETTINGS::REGION,
SETTINGS::EMUSAVEPATH,
SETTINGS::PCSAVEPATH,
SETTINGS::SCALE,
SETTINGS::ENABLETEST,
SETTINGS::WORLDMAPADVANCED,
SETTINGS::USENATIVEDIALOGS,
Expand Down
5 changes: 3 additions & 2 deletions src/errbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ errbox::errbox(QWidget *parent, FF7Save *ff7data, int slot)
lblRegionString->setAlignment(Qt::AlignTop);
lblIcon->setMinimumSize(64, 64);
lblIcon->setMaximumSize(128, 128);
lblIcon->setPixmap(save_icon->icon().scaled(lblIcon->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
lblIcon->setScaledContents(true);
lblIcon->setPixmap(save_icon->icon());

btnPrev->setShortcut(QKeySequence::Back);
btnPrev->setIconSize(iconSize);
Expand Down Expand Up @@ -163,5 +164,5 @@ bool errbox::isSingleSlot()

void errbox::setIcon(QPixmap pix)
{
lblIcon->setPixmap(pix.scaled(lblIcon->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
lblIcon->setPixmap(pix);
}
44 changes: 14 additions & 30 deletions src/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ MainWindow::MainWindow(QWidget *parent)
loadBasicSettings();
detectTranslations();
initDisplay();
setScale(BCSettings::instance()->value(SETTINGS::SCALE).toDouble());
setItemSizes();
populateCombos();
init_style();
loadChildWidgetSettings();
Expand Down Expand Up @@ -237,7 +237,6 @@ void MainWindow::initDisplay()
hexLayout->addWidget(hexEditor);
ui->group_hexedit->setLayout(hexLayout);

double scale = BCSettings::instance()->value(SETTINGS::SCALE).toDouble();
char_editor = new CharEditor(this);
QHBoxLayout *char_editor_layout = new QHBoxLayout;
char_editor_layout->setContentsMargins(0, 0, 0, 0);
Expand Down Expand Up @@ -318,11 +317,10 @@ void MainWindow::initDisplay()
ui->lbl_battle_love_yuffie->setPixmap(FF7Char::instance()->pixmap(FF7Char::Yuffie));
}

void MainWindow::setScale(double scale)
void MainWindow::setItemSizes()
{
scale = std::max(scale, 0.5);
setStyleSheet(QStringLiteral("QListWidget::indicator, QCheckBox::indicator{width: .75em; height: .75em;}\nQListWidget::item{spacing: 1em}"));
const QSize partyButtonSize(int(98 * scale), int(110 * scale));
const QSize partyButtonSize(98, 110);
ui->btnCloud->setFixedSize(partyButtonSize);
ui->btnBarret->setFixedSize(partyButtonSize);
ui->btnTifa->setFixedSize(partyButtonSize);
Expand All @@ -333,7 +331,7 @@ void MainWindow::setScale(double scale)
ui->btnVincent->setFixedSize(partyButtonSize);
ui->btnCid->setFixedSize(partyButtonSize);

const QSize partyIconSize(int(92 * scale), int(104 * scale));
const QSize partyIconSize(92, 104);
ui->btnCloud->setIconSize(partyIconSize);
ui->btnBarret->setIconSize(partyIconSize);
ui->btnTifa->setIconSize(partyIconSize);
Expand All @@ -344,28 +342,28 @@ void MainWindow::setScale(double scale)
ui->btnVincent->setIconSize(partyIconSize);
ui->btnCid->setIconSize(partyIconSize);

const QSize comboPartyIconSize(int(32 * scale), int(32 * scale));
const QSize comboPartyIconSize(32, 32);
ui->comboParty1->setFixedHeight(comboPartyIconSize.height());
ui->comboParty2->setFixedHeight(comboPartyIconSize.height());
ui->comboParty3->setFixedHeight(comboPartyIconSize.height());
ui->comboParty1->setIconSize(comboPartyIconSize);
ui->comboParty2->setIconSize(comboPartyIconSize);
ui->comboParty3->setIconSize(comboPartyIconSize);

ui->groupBox_11->setFixedWidth(int(375 * scale));
ui->groupBox_18->setFixedWidth(int(273 * scale)); //materia table group.
ui->scrollArea->setFixedWidth(int(310 * scale));
ui->groupBox_11->setFixedWidth(375);
ui->groupBox_18->setFixedWidth(273); //materia table group.
ui->scrollArea->setFixedWidth(310);
ui->scrollAreaWidgetContents->adjustSize();
ui->world_map_frame->setFixedSize(int(446 * scale), int(381 * scale));
ui->world_map_frame->setFixedSize(446, 381);

ui->worldMapView->setGeometry(int(5 * scale), int(32 * scale), int(432 * scale), int(336 * scale));
ui->worldMapView->setGeometry(5 , 32, 432, 336);

ui->comboMapControls->setFixedHeight(comboPartyIconSize.height());

ui->slideWorldX->setGeometry(-1, int(369 * scale), int(443 * scale), int(10 * scale));
ui->slideWorldY->setGeometry(int(437 * scale), int(26 * scale), int(10 * scale), int(347 * scale));
ui->slideWorldX->setGeometry(-1, 369, 443, 10);
ui->slideWorldY->setGeometry(437, 26, 10, 347);

const QSize lovePointSize(int(50 * scale), int(68 * scale));
const QSize lovePointSize(50, 68);
ui->lbl_love_aeris->setFixedSize(lovePointSize);
ui->lbl_love_barret->setFixedSize(lovePointSize);
ui->lbl_love_tifa->setFixedSize(lovePointSize);
Expand All @@ -375,7 +373,7 @@ void MainWindow::setScale(double scale)
ui->lbl_battle_love_tifa->setFixedSize(lovePointSize);
ui->lbl_battle_love_yuffie->setFixedSize(lovePointSize);

materia_editor->setStarsSize(int(48 * scale));
materia_editor->setStarsSize(48);
guirefresh(0);
}

Expand Down Expand Up @@ -776,19 +774,6 @@ void MainWindow::init_connections()

void MainWindow::loadBasicSettings()
{
if (BCSettings::instance()->value(SETTINGS::SCALE).isNull()) {
double stdDPI = 96.0;
#ifdef Q_OS_MAC
stdDPI = 72.0;
#endif
QScreen *screen = QGuiApplication::screens().at(0);
double scale = QString::number(screen->logicalDotsPerInch() / stdDPI, 'f', 2).toDouble();
double sy = int(scale * 100) % 25;
scale -= (sy / 100);
scale = ( sy < 12.49) ? scale : scale + 0.25;
BCSettings::instance()->setValue(SETTINGS::SCALE, std::max(scale, 0.5));
}

if (BCSettings::instance()->value(SETTINGS::MAINGEOMETRY).isNull())
saveGeometry();
else
Expand Down Expand Up @@ -1183,7 +1168,6 @@ void MainWindow::actionShowOptions_triggered()
QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, !useNative);
});
if (odialog.exec()) {
setScale(BCSettings::instance()->value(SETTINGS::SCALE).toDouble());
loadChildWidgetSettings();
}
disconnect(&odialog, nullptr, nullptr, nullptr);
Expand Down
2 changes: 1 addition & 1 deletion src/mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class MainWindow : public QMainWindow
QList<fieldItemBitList> *fieldItemBit;
void populateCombos();
void initDisplay();
void setScale(double newScale);
void setItemSizes();
void init_style();
void init_connections();
void loadBasicSettings();
Expand Down
22 changes: 3 additions & 19 deletions src/options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Options::Options(QWidget *parent) : QDialog(parent)
, ui(new Ui::Options)
{
ui->setupUi(this);
ui->lblPixNormal->setFixedSize(64,64);
connect(BCSettings::instance(), &BCSettings::settingsChanged, this, &Options::loadSettings);
initConnections();
int fmh = fontMetrics().height();
Expand All @@ -40,8 +39,6 @@ Options::Options(QWidget *parent) : QDialog(parent)
const QList<QAbstractButton*> buttons = ui->buttonBox->buttons();
for (QAbstractButton *btn : buttons)
btn->setIconSize(iconSize);
ui->lblPixNormal->setPixmap(QPixmap(":/icons/common/blackchocobo"));
ui->lblPixScaled->setPixmap(QPixmap(":/icons/common/blackchocobo"));

QDir dir (BCSettings::instance()->value(SETTINGS::LANGPATH).toString());
QStringList langList = dir.entryList(QStringList("bchoco_*.qm"), QDir::Files, QDir::Name);
Expand All @@ -56,13 +53,6 @@ Options::Options(QWidget *parent) : QDialog(parent)
ui->lblLanguage->setVisible(ui->comboLanguage->count());
ui->comboAppStyle->addItems(QStyleFactory::keys());

connect(ui->sliderScale, &QSlider::valueChanged, this, [this](int value){
value = int(((value * 0.25) + 0.5) * 100);
ui->labelScale->setText(QStringLiteral("%1%").arg(value, 3, 10, QChar('0')));
value = int(64 * (value / 100.0));
ui->lblPixScaled->setFixedSize(QSize(value, value));
});

connect(ui->buttonBox, &QDialogButtonBox::clicked, this, [this](const QAbstractButton * button){
if (button == ui->buttonBox->button(QDialogButtonBox::Apply)) {
disconnect(BCSettings::instance(), &BCSettings::settingsChanged, this, &Options::loadSettings);
Expand Down Expand Up @@ -105,7 +95,7 @@ void Options::changeEvent(QEvent *e)
}
void Options::loadSettings()
{
ui->defaultSaveLayout->setEnabled(false);
ui->defaultSaveLayout->setVisible(false);
ui->line_default_save->setText(BCSettings::instance()->value(SETTINGS::DEFAULTSAVE, QString()).toString());
ui->line_char_stat_folder->setText(BCSettings::instance()->value(SETTINGS::STATFOLDER, QString()).toString());
ui->line_save_pc->setText(BCSettings::instance()->value(SETTINGS::PCSAVEPATH, QString()).toString());
Expand All @@ -121,15 +111,12 @@ void Options::loadSettings()
ui->cbWorldMapAdvanced->setChecked(BCSettings::instance()->value(SETTINGS::WORLDMAPADVANCED, false).toBool());
ui->comboRegion->setCurrentText(BCSettings::instance()->value (SETTINGS::REGION, QStringLiteral("NTSC-U")).toString());
ui->cb_override_def_save->setChecked(BCSettings::instance()->value(SETTINGS::CUSTOMDEFAULTSAVE, false).toBool());
ui->sliderScale->setValue(int((BCSettings::instance()->value(SETTINGS::SCALE, 1.00).toDouble() - 0.50) / 0.25));
ui->cbAutoGrowth->setChecked(BCSettings::instance()->value(SETTINGS::AUTOGROWTH, true).toBool());
ui->comboLanguage->setCurrentIndex(ui->comboLanguage->findData(BCSettings::instance()->value(SETTINGS::LANG)));
ui->cbNativeDialogs->setChecked(BCSettings::instance()->value(SETTINGS::USENATIVEDIALOGS).toBool());
ui->btnEditSideBarItems->setVisible(!ui->cbNativeDialogs->isChecked());
ui->comboColorScheme->setCurrentIndex(BCSettings::instance()->value(SETTINGS::COLORSCHEME).toInt());
ui->comboAppStyle->setCurrentText(BCSettings::instance()->value(SETTINGS::APPSTYLE).toString());
int pixScale = int(64 * (int(((ui->sliderScale->value() * 0.25) + 0.5) * 100) / 100.0));
ui->lblPixScaled->setFixedSize(QSize(pixScale, pixScale));
adjustSize();
}

Expand All @@ -150,7 +137,6 @@ void Options::saveSettings()
BCSettings::instance()->setValue(SETTINGS::WORLDMAPADVANCED, ui->cbWorldMapAdvanced->isChecked());
BCSettings::instance()->setValue(SETTINGS::EDITABLECOMBOS, ui->cbEditableCombos->isChecked());
BCSettings::instance()->setValue(SETTINGS::REGION, ui->comboRegion->currentText());
BCSettings::instance()->setValue(SETTINGS::SCALE, ((ui->sliderScale->value() * 0.25) + 0.5));
BCSettings::instance()->setValue(SETTINGS::AUTOGROWTH, ui->cbAutoGrowth->isChecked());
BCSettings::instance()->setValue(SETTINGS::LANG, ui->comboLanguage->currentData());
BCSettings::instance()->setValue(SETTINGS::USENATIVEDIALOGS, ui->cbNativeDialogs->isChecked());
Expand All @@ -160,7 +146,7 @@ void Options::saveSettings()

void Options::restoreDefaultSettings()
{
ui->defaultSaveLayout->setEnabled(false);
ui->defaultSaveLayout->setVisible(false);
ui->line_default_save->setText(QString());
ui->line_char_stat_folder->setText(QDir::homePath());
ui->line_save_pc->setText(QDir::homePath());
Expand All @@ -176,7 +162,6 @@ void Options::restoreDefaultSettings()
ui->cbWorldMapAdvanced->setChecked(false);
ui->comboRegion->setCurrentText(QStringLiteral("NTSC-U"));
ui->cb_override_def_save->setChecked(false);
ui->sliderScale->setValue(2);
ui->cbAutoGrowth->setChecked(true);
ui->comboLanguage->setCurrentIndex(ui->comboLanguage->findData(QStringLiteral("en")));
ui->cbNativeDialogs->setChecked(false);
Expand All @@ -194,7 +179,7 @@ void Options::initConnections()
connect(ui->cbNativeDialogs, &QCheckBox::toggled, this, &Options::cbNativeDialogs_clicked);
connect(ui->comboColorScheme, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Options::comboColorScheme_currentIndexChanged);
connect(ui->comboAppStyle, &QComboBox::textActivated, this, &Options::comboAppStyle_currentTextChanged);
connect(ui->cb_override_def_save, &QCheckBox::toggled, ui->defaultSaveLayout, &QFrame::setEnabled);
connect(ui->cb_override_def_save, &QCheckBox::toggled, ui->defaultSaveLayout, &QFrame::setVisible);

connect(ui->btnEditSideBarItems, &QPushButton::clicked, this, [this]{
BCDialog::editSideBarPaths(this);
Expand All @@ -211,7 +196,6 @@ void Options::updateText()
ui->buttonBox->button(QDialogButtonBox::Reset)->setToolTip(tr("Reset values to stored settings"));
ui->buttonBox->button(QDialogButtonBox::Apply)->setToolTip(tr("Close and save changes"));
ui->buttonBox->button(QDialogButtonBox::Cancel)->setToolTip(tr("Close and forget changes"));
ui->labelScale->setText(QStringLiteral("%1%").arg(int(BCSettings::instance()->value(SETTINGS::SCALE, 1.00).toDouble() *100), 3, 10, QChar('0')));
}

void Options::btn_set_save_pc_clicked()
Expand Down
Loading

0 comments on commit d6ede88

Please sign in to comment.