mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
Merge pull request #2947 from Laserlicht/enableUiEnhancements_button
enableUiEnhancements button
This commit is contained in:
@@ -91,6 +91,8 @@
|
|||||||
"vcmi.systemOptions.framerateButton.help" : "{Show FPS}\n\nToggle the visibility of the Frames Per Second counter in the corner of the game window.",
|
"vcmi.systemOptions.framerateButton.help" : "{Show FPS}\n\nToggle the visibility of the Frames Per Second counter in the corner of the game window.",
|
||||||
"vcmi.systemOptions.hapticFeedbackButton.hover" : "Haptic feedback",
|
"vcmi.systemOptions.hapticFeedbackButton.hover" : "Haptic feedback",
|
||||||
"vcmi.systemOptions.hapticFeedbackButton.help" : "{Haptic feedback}\n\nToggle the haptic feedback on touch inputs.",
|
"vcmi.systemOptions.hapticFeedbackButton.help" : "{Haptic feedback}\n\nToggle the haptic feedback on touch inputs.",
|
||||||
|
"vcmi.systemOptions.enableUiEnhancementsButton.hover" : "Interface Enhancements",
|
||||||
|
"vcmi.systemOptions.enableUiEnhancementsButton.help" : "{Interface Enhancements}\n\nToggle various quality of life interface improvements. Such as a larger spell book, backpack, etc. Disable to have a more classic experience.",
|
||||||
|
|
||||||
"vcmi.adventureOptions.infoBarPick.hover" : "Show Messages in Info Panel",
|
"vcmi.adventureOptions.infoBarPick.hover" : "Show Messages in Info Panel",
|
||||||
"vcmi.adventureOptions.infoBarPick.help" : "{Show Messages in Info Panel}\n\nWhenever possible, game messages from visiting map objects will be shown in the info panel, instead of popping up in a separate window.",
|
"vcmi.adventureOptions.infoBarPick.help" : "{Show Messages in Info Panel}\n\nWhenever possible, game messages from visiting map objects will be shown in the info panel, instead of popping up in a separate window.",
|
||||||
|
@@ -89,6 +89,8 @@
|
|||||||
"vcmi.systemOptions.framerateButton.help" : "{FPS anzeigen}\n\n Schaltet die Sichtbarkeit des Zählers für die Bilder pro Sekunde in der Ecke des Spielfensters um.",
|
"vcmi.systemOptions.framerateButton.help" : "{FPS anzeigen}\n\n Schaltet die Sichtbarkeit des Zählers für die Bilder pro Sekunde in der Ecke des Spielfensters um.",
|
||||||
"vcmi.systemOptions.hapticFeedbackButton.hover" : "Haptisches Feedback",
|
"vcmi.systemOptions.hapticFeedbackButton.hover" : "Haptisches Feedback",
|
||||||
"vcmi.systemOptions.hapticFeedbackButton.help" : "{Haptisches Feedback}\n\nHaptisches Feedback bei Touch-Eingaben.",
|
"vcmi.systemOptions.hapticFeedbackButton.help" : "{Haptisches Feedback}\n\nHaptisches Feedback bei Touch-Eingaben.",
|
||||||
|
"vcmi.systemOptions.enableUiEnhancementsButton.hover" : "Interface Verbesserungen",
|
||||||
|
"vcmi.systemOptions.enableUiEnhancementsButton.help" : "{Interface Verbesserungen}\n\nSchaltet verschiedene Interface Verbesserungen um. Wie z.B. ein größeres Zauberbuch, Rucksack, etc. Deaktivieren, um ein klassischeres Erlebnis zu haben.",
|
||||||
|
|
||||||
"vcmi.adventureOptions.infoBarPick.hover" : "Meldungen im Infobereich anzeigen",
|
"vcmi.adventureOptions.infoBarPick.hover" : "Meldungen im Infobereich anzeigen",
|
||||||
"vcmi.adventureOptions.infoBarPick.help" : "{Meldungen im Infobereich anzeigen}\n\nWann immer möglich, werden Spielnachrichten von besuchten Kartenobjekten in der Infoleiste angezeigt, anstatt als Popup-Fenster zu erscheinen",
|
"vcmi.adventureOptions.infoBarPick.help" : "{Meldungen im Infobereich anzeigen}\n\nWann immer möglich, werden Spielnachrichten von besuchten Kartenobjekten in der Infoleiste angezeigt, anstatt als Popup-Fenster zu erscheinen",
|
||||||
|
@@ -157,6 +157,10 @@ GeneralOptionsTab::GeneralOptionsTab()
|
|||||||
{
|
{
|
||||||
setBoolSetting("general", "hapticFeedback", value);
|
setBoolSetting("general", "hapticFeedback", value);
|
||||||
});
|
});
|
||||||
|
addCallback("enableUiEnhancementsChanged", [](bool value)
|
||||||
|
{
|
||||||
|
setBoolSetting("general", "enableUiEnhancements", value);
|
||||||
|
});
|
||||||
|
|
||||||
//moved from "other" tab that is disabled for now to avoid excessible tabs with barely any content
|
//moved from "other" tab that is disabled for now to avoid excessible tabs with barely any content
|
||||||
addCallback("availableCreaturesAsDwellingChanged", [=](int value)
|
addCallback("availableCreaturesAsDwellingChanged", [=](int value)
|
||||||
@@ -198,6 +202,10 @@ GeneralOptionsTab::GeneralOptionsTab()
|
|||||||
if (hapticFeedbackCheckbox)
|
if (hapticFeedbackCheckbox)
|
||||||
hapticFeedbackCheckbox->setSelected(settings["general"]["hapticFeedback"].Bool());
|
hapticFeedbackCheckbox->setSelected(settings["general"]["hapticFeedback"].Bool());
|
||||||
|
|
||||||
|
std::shared_ptr<CToggleButton> enableUiEnhancementsCheckbox = widget<CToggleButton>("enableUiEnhancementsCheckbox");
|
||||||
|
if (enableUiEnhancementsCheckbox)
|
||||||
|
enableUiEnhancementsCheckbox->setSelected(settings["general"]["enableUiEnhancements"].Bool());
|
||||||
|
|
||||||
std::shared_ptr<CSlider> musicSlider = widget<CSlider>("musicSlider");
|
std::shared_ptr<CSlider> musicSlider = widget<CSlider>("musicSlider");
|
||||||
musicSlider->scrollTo(CCS->musich->getVolume());
|
musicSlider->scrollTo(CCS->musich->getVolume());
|
||||||
|
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
"name": "lineLabelsEnd",
|
"name": "lineLabelsEnd",
|
||||||
"type": "texture",
|
"type": "texture",
|
||||||
"image": "settingsWindow/lineHorizontal",
|
"image": "settingsWindow/lineHorizontal",
|
||||||
"rect": { "x" : 5, "y" : 289, "w": 365, "h": 3}
|
"rect": { "x" : 5, "y" : 349, "w": 365, "h": 3}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type" : "labelTitle",
|
"type" : "labelTitle",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type" : "labelTitle",
|
"type" : "labelTitle",
|
||||||
"position": {"x": 10, "y": 295},
|
"position": {"x": 10, "y": 355},
|
||||||
"text": "vcmi.systemOptions.townsGroup"
|
"text": "vcmi.systemOptions.townsGroup"
|
||||||
},
|
},
|
||||||
/////////////////////////////////////// Left section - Video Settings
|
/////////////////////////////////////// Left section - Video Settings
|
||||||
@@ -61,6 +61,9 @@
|
|||||||
{
|
{
|
||||||
"text": "vcmi.systemOptions.hapticFeedbackButton.hover",
|
"text": "vcmi.systemOptions.hapticFeedbackButton.hover",
|
||||||
"created" : "mobile"
|
"created" : "mobile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"text": "vcmi.systemOptions.enableUiEnhancementsButton.hover"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -116,6 +119,11 @@
|
|||||||
"help": "vcmi.systemOptions.hapticFeedbackButton",
|
"help": "vcmi.systemOptions.hapticFeedbackButton",
|
||||||
"callback": "hapticFeedbackChanged",
|
"callback": "hapticFeedbackChanged",
|
||||||
"created" : "mobile"
|
"created" : "mobile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "enableUiEnhancementsCheckbox",
|
||||||
|
"help": "vcmi.systemOptions.enableUiEnhancementsButton",
|
||||||
|
"callback": "enableUiEnhancementsChanged"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -168,7 +176,7 @@
|
|||||||
{
|
{
|
||||||
"type" : "verticalLayout",
|
"type" : "verticalLayout",
|
||||||
"customType" : "labelDescription",
|
"customType" : "labelDescription",
|
||||||
"position": {"x": 45, "y": 325},
|
"position": {"x": 45, "y": 385},
|
||||||
"items" : [
|
"items" : [
|
||||||
{
|
{
|
||||||
"text": "vcmi.otherOptions.creatureGrowthAsDwellingLabel.hover",
|
"text": "vcmi.otherOptions.creatureGrowthAsDwellingLabel.hover",
|
||||||
@@ -181,7 +189,7 @@
|
|||||||
{
|
{
|
||||||
"name": "availableCreaturesAsDwellingPicker",
|
"name": "availableCreaturesAsDwellingPicker",
|
||||||
"type": "toggleGroup",
|
"type": "toggleGroup",
|
||||||
"position": {"x": 10, "y": 323},
|
"position": {"x": 10, "y": 383},
|
||||||
"items":
|
"items":
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
@@ -203,7 +211,7 @@
|
|||||||
"name": "compactTownCreatureInfoLabel",
|
"name": "compactTownCreatureInfoLabel",
|
||||||
"type" : "verticalLayout",
|
"type" : "verticalLayout",
|
||||||
"customType" : "labelDescription",
|
"customType" : "labelDescription",
|
||||||
"position": {"x": 45, "y": 385},
|
"position": {"x": 45, "y": 445},
|
||||||
"items" : [
|
"items" : [
|
||||||
{
|
{
|
||||||
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
|
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
|
||||||
@@ -214,7 +222,7 @@
|
|||||||
"name": "compactTownCreatureInfoCheckbox",
|
"name": "compactTownCreatureInfoCheckbox",
|
||||||
"type": "checkbox",
|
"type": "checkbox",
|
||||||
"help": "vcmi.otherOptions.compactTownCreatureInfo",
|
"help": "vcmi.otherOptions.compactTownCreatureInfo",
|
||||||
"position": {"x": 10, "y": 383},
|
"position": {"x": 10, "y": 443},
|
||||||
"callback": "compactTownCreatureInfoChanged"
|
"callback": "compactTownCreatureInfoChanged"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
Reference in New Issue
Block a user