sheepy-clone: comparison QTfrontend/ui/page/pageoptions.cpp

equal deleted inserted replaced

-:0135e64c6c66
+:c4fd2813b127
 BtnNewTeam = new QPushButton(groupTeams);
 BtnNewTeam->setWhatsThis(tr("New team"));
 BtnNewTeam->setIconSize(pmNew.size());
 BtnNewTeam->setIcon(pmNew);
 BtnNewTeam->setMaximumWidth(pmNew.width() + 6);
+BtnNewTeam->setStyleSheet("padding: 0px;");
 connect(BtnNewTeam, SIGNAL(clicked()), this, SIGNAL(newTeamRequested()));
 groupTeams->layout()->addWidget(BtnNewTeam, 0, 1);
 BtnEditTeam = new QPushButton(groupTeams);
 BtnEditTeam->setWhatsThis(tr("Edit team"));
 BtnEditTeam->setIconSize(pmEdit.size());
 BtnEditTeam->setIcon(pmEdit);
 BtnEditTeam->setMaximumWidth(pmEdit.width() + 6);
+BtnEditTeam->setStyleSheet("padding: 0px;");
 connect(BtnEditTeam, SIGNAL(clicked()), this, SLOT(requestEditSelectedTeam()));
 groupTeams->layout()->addWidget(BtnEditTeam, 0, 2);
 BtnDeleteTeam = new QPushButton(groupTeams);
 BtnDeleteTeam->setWhatsThis(tr("Delete team"));
 BtnDeleteTeam->setIconSize(pmDelete.size());
 BtnDeleteTeam->setIcon(pmDelete);
 BtnDeleteTeam->setMaximumWidth(pmDelete.width() + 6);
+BtnDeleteTeam->setStyleSheet("padding: 0px;");
 connect(BtnDeleteTeam, SIGNAL(clicked()), this, SLOT(requestDeleteSelectedTeam()));
 groupTeams->layout()->addWidget(BtnDeleteTeam, 0, 3);
 LblNoEditTeam = new QLabel(groupTeams);
 LblNoEditTeam->setText(tr("You can't edit teams from team selection. Go back to main menu to add, edit or delete teams."));
 SchemeNew = new QPushButton(groupSchemes);
 SchemeNew->setWhatsThis(tr("New scheme"));
 SchemeNew->setIconSize(pmNew.size());
 SchemeNew->setIcon(pmNew);
 SchemeNew->setMaximumWidth(pmNew.width() + 6);
+SchemeNew->setStyleSheet("padding: 0px;");
 groupSchemes->layout()->addWidget(SchemeNew, 0, 1);
 SchemeEdit = new QPushButton(groupSchemes);
 SchemeEdit->setWhatsThis(tr("Edit scheme"));
 SchemeEdit->setIconSize(pmEdit.size());
 SchemeEdit->setIcon(pmEdit);
 SchemeEdit->setMaximumWidth(pmEdit.width() + 6);
+SchemeEdit->setStyleSheet("padding: 0px;");
 groupSchemes->layout()->addWidget(SchemeEdit, 0, 2);
 SchemeDelete = new QPushButton(groupSchemes);
 SchemeDelete->setWhatsThis(tr("Delete scheme"));
 SchemeDelete->setIconSize(pmDelete.size());
 SchemeDelete->setIcon(pmDelete);
 SchemeDelete->setMaximumWidth(pmDelete.width() + 6);
+SchemeDelete->setStyleSheet("padding: 0px;");
 groupSchemes->layout()->addWidget(SchemeDelete, 0, 3);
 }
 { // group: weapons
 OptionGroupBox * groupWeapons = new OptionGroupBox(":/res/weaponsicon.png", tr("Weapons"), this);
 WeaponNew = new QPushButton(groupWeapons);
 WeaponNew->setWhatsThis(tr("New weapon set"));
 WeaponNew->setIconSize(pmNew.size());
 WeaponNew->setIcon(pmNew);
 WeaponNew->setMaximumWidth(pmNew.width() + 6);
+WeaponNew->setStyleSheet("padding: 0px;");
 groupWeapons->layout()->addWidget(WeaponNew, 0, 1);
 WeaponEdit = new QPushButton(groupWeapons);
 WeaponEdit->setWhatsThis(tr("Edit weapon set"));
 WeaponEdit->setIconSize(pmEdit.size());
 WeaponEdit->setIcon(pmEdit);
 WeaponEdit->setMaximumWidth(pmEdit.width() + 6);
+WeaponEdit->setStyleSheet("padding: 0px;");
 groupWeapons->layout()->addWidget(WeaponEdit, 0, 2);
 WeaponDelete = new QPushButton(groupWeapons);
 WeaponDelete->setWhatsThis(tr("Delete weapon set"));
 WeaponDelete->setIconSize(pmDelete.size());
 WeaponDelete->setIcon(pmDelete);
 WeaponDelete->setMaximumWidth(pmDelete.width() + 6);
+WeaponDelete->setStyleSheet("padding: 0px;");
 groupWeapons->layout()->addWidget(WeaponDelete, 0, 3);
 }
 leftColumn->addStretch(1);
 rightColumn->addStretch(1);
 lblWinScreenRes = new QLabel(groupGame);
 lblWinScreenRes->setText(QLabel::tr("Windowed Resolution"));
 groupGame->layout()->addWidget(lblWinScreenRes, 2, 0);
-winResContainer = new QWidget();
+QHBoxLayout * winResLayout = new QHBoxLayout();
-QHBoxLayout * winResLayout = new QHBoxLayout(winResContainer);
 winResLayout->setSpacing(0);
-groupGame->layout()->addWidget(winResContainer, 2, 1);
+groupGame->layout()->addLayout(winResLayout, 2, 1, 1, 3);
-QLabel *winLabelX = new QLabel(groupGame);
+winLabelX = new QLabel(groupGame);
 //: Multiplication sign, to be used between two numbers. Note the “x” is only a dummy character, we recommend to use “×” if your language permits it
 winLabelX->setText(tr("x"));
 winLabelX->setFixedWidth(40);
 winLabelX->setAlignment(Qt::AlignCenter);
 lblQuality->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 groupGame->layout()->addWidget(lblQuality, 3, 0);
 SLQuality = new QSlider(Qt::Horizontal, groupGame);
 SLQuality->setTickPosition(QSlider::TicksBelow);
+SLQuality->setPageStep(2);
 SLQuality->setMaximum(5);
 SLQuality->setMinimum(0);
 SLQuality->setFixedWidth(150);
 groupGame->layout()->addWidget(SLQuality, 3, 1, Qt::AlignLeft);
+// Zoom
+QLabel * lblZoom = new QLabel(groupGame);
+lblZoom->setText(QLabel::tr("Zoom (%)"));
+lblZoom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+groupGame->layout()->addWidget(lblZoom, 4, 0);
+SLZoom = new QSpinBox(groupGame);
+SLZoom->setSingleStep(5);
+SLZoom->setMaximum(150);
+SLZoom->setMinimum(50);
+groupGame->layout()->addWidget(SLZoom, 4, 1, Qt::AlignLeft);
 // Stereo spacing
 QLabel * lblStereo = new QLabel(groupGame);
 lblStereo->setText(QLabel::tr("Stereoscopy"));
-groupGame->layout()->addWidget(lblStereo, 4, 0);
+groupGame->layout()->addWidget(lblStereo, 5, 0);
 CBStereoMode = new QComboBox(groupGame);
 CBStereoMode->setWhatsThis(QComboBox::tr("Stereoscopy creates an illusion of depth when you wear 3D glasses."));
 CBStereoMode->setMaxVisibleItems(50);
 CBStereoMode->addItem(QComboBox::tr("Disabled"));
 CBStereoMode->addItem(QComboBox::tr("Red/Green grayscale"));
 CBStereoMode->addItem(QComboBox::tr("Green/Red grayscale"));
 CBStereoMode->addItem(QComboBox::tr("Side-by-side"));
 CBStereoMode->addItem(QComboBox::tr("Top-Bottom"));
 CBStereoMode->setFixedWidth(CBResolution->width());
-groupGame->layout()->addWidget(CBStereoMode, 4, 1);
+groupGame->layout()->addWidget(CBStereoMode, 5, 1);
 // Divider
-groupGame->addDivider(); // row 5
+groupGame->addDivider(); // row 6
 // FPS limit
 QHBoxLayout * fpsLayout = new QHBoxLayout();
-groupGame->layout()->addLayout(fpsLayout, 6, 0, 1, 2);
+groupGame->layout()->addLayout(fpsLayout, 7, 0, 1, 2);
 QLabel * maxfps = new QLabel(groupGame);
 maxfps->setText(QLabel::tr("FPS limit"));
 fpsLayout->addWidget(maxfps);
 fpsLayout->addSpacing(30);
 fpsedit = new FPSEdit(groupGame);
 fpsLayout->addWidget(CBShowFPS);
 fpsLayout->addStretch(1);
 // Divider
-groupGame->addDivider(); // row 7
+groupGame->addDivider(); // row 8
 // Alternative damage show
 CBAltDamage = new QCheckBox(groupGame);
 CBAltDamage->setText(QCheckBox::tr("Alternative damage show"));
-groupGame->layout()->addWidget(CBAltDamage, 8, 0, 1, 2);
+groupGame->layout()->addWidget(CBAltDamage, 9, 0, 1, 2);
 // Show ammo menu tooltips
 WeaponTooltip = new QCheckBox(groupGame);
 WeaponTooltip->setText(QCheckBox::tr("Show ammo menu tooltips"));
-groupGame->layout()->addWidget(WeaponTooltip, 9, 0, 1, 2);
+groupGame->layout()->addWidget(WeaponTooltip, 10, 0, 1, 2);
 groupGame->addDivider();
 lblTags = new QLabel(groupGame);
 lblTags->setText(QLabel::tr("Displayed tags above hogs and translucent tags"));
-groupGame->layout()->addWidget(lblTags, 11, 0, 1, 2);
+groupGame->layout()->addWidget(lblTags, 12, 0, 1, 2);
 tagsContainer = new QWidget();
 QHBoxLayout * tagsLayout = new QHBoxLayout(tagsContainer);
 tagsLayout->setSpacing(0);
-groupGame->layout()->addWidget(tagsContainer, 12, 0, 1, 2);
+groupGame->layout()->addWidget(tagsContainer, 13, 0, 1, 2);
 CBTeamTag = new QCheckBox(groupGame);
 CBTeamTag->setText(QCheckBox::tr("Team"));
 CBTeamTag->setWhatsThis(QCheckBox::tr("Enable team tags by default"));
 CBMusic = new QCheckBox(groupGame);
 CBMusic->setText(QCheckBox::tr("Music"));
 CBMusic->setWhatsThis(QCheckBox::tr("In-game music"));
 groupGame->layout()->addWidget(CBMusic, 1, 2, 1, 2, Qt::AlignLeft);
+// Dampen
+CBDampenAudio = new QCheckBox(groupGame);
+//: Checkbox text. If checked, the in-game audio volume is reduced (=dampened) when the game window loses its focus
+CBDampenAudio->setText(QCheckBox::tr("Dampen when losing focus"));
+CBDampenAudio->setWhatsThis(QCheckBox::tr("Reduce the game audio volume if the game window has lost its focus"));
+groupGame->layout()->addWidget(CBDampenAudio, 2, 1, 1, 3, Qt::AlignLeft);
 }
 { // group: frontend
 OptionGroupBox * groupFrontend = new OptionGroupBox(":/res/audio.png", tr("Frontend audio"), this);
 rightColumn->addWidget(groupFrontend);
 }
 // Fallback code, if language name is empty for some reason. This should normally not happen
 if(entryName.isEmpty())
 {
 // Show error and the locale identifier
+//: In the case of an error, this is shown in the language selection for a language with unknown name. %1 = language code
 entryName = tr("MISSING LANGUAGE NAME [%1]").arg(lname);
 }
 CBLanguage->addItem(entryName, lname);
 }
 Q_UNUSED(state);
 lblFullScreenRes->setVisible(state);
 CBResolution->setVisible(state);
 lblWinScreenRes->setVisible(!state);
-winResContainer->setVisible(!state);
+windowWidthEdit->setVisible(!state);
+windowHeightEdit->setVisible(!state);
+winLabelX->setVisible(!state);
 int index = this->CBStereoMode->currentIndex();
 if (index != 7 && index != 8 && index != 9)
 previousFullscreenValue = this->CBFullscreen->isChecked();
 }
 {
 QString value = config->bind(i);
 QModelIndexList mdl = binds->match(binds->index(0, 0), Qt::UserRole + 1, value, 1, Qt::MatchExactly);
 if(mdl.size() == 1) binder->setBindIndex(i, mdl[0].row());
 }
+binder->checkConflicts();
 }
 currentTab = index;
 }
 // Changes a key bind (bindID) to its default value. This updates the bind's combo-box in the UI.
 // Returns: The bind model index of the default.
 int PageOptions::resetBindToDefault(int bindID)
 {
+if (QString(cbinds[bindID].action) == QString("!MULTI"))
+return -1;
 QStandardItemModel * binds = DataManager::instance().bindsModel();
 QModelIndexList mdl = binds->match(binds->index(0, 0), Qt::UserRole + 1, cbinds[bindID].strbind, 1, Qt::MatchExactly);
-if(mdl.size() == 1) binder->setBindIndex(bindID, mdl[0].row());
+if(mdl.size() == 1)
+binder->setBindIndex(bindID, mdl[0].row());
 return mdl[0].row();
 }
 // Called when "reset all binds" button is pressed
 void PageOptions::resetAllBinds()
 {
 for (int i = 0; i < BINDS_NUMBER; i++)
 {
-resetBindToDefault(i);
+int ret = resetBindToDefault(i);
-bindUpdated(i);
+if(ret != -1)
-}
+bindUpdated(i);
 }
+binder->checkConflicts();
+}

branch	ui-scaling
changeset 15288	c4fd2813b127
parent 13395	0135e64c6c66
parent 15252	647157250713