diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/browser_osx.mm | 2 | ||||
| -rw-r--r-- | gui/options.cpp | 8 | ||||
| -rw-r--r-- | gui/storagewizarddialog.cpp | 4 | ||||
| -rw-r--r-- | gui/themes/translations.dat | bin | 587490 -> 616196 bytes |
4 files changed, 6 insertions, 8 deletions
diff --git a/gui/browser_osx.mm b/gui/browser_osx.mm index 18cbd134f3..cfb70a3f65 100644 --- a/gui/browser_osx.mm +++ b/gui/browser_osx.mm @@ -52,7 +52,7 @@ - (id) init { self = [super init]; _panel = 0; - + return self; } diff --git a/gui/options.cpp b/gui/options.cpp index 35c9864718..1f6683d388 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -238,11 +238,10 @@ void OptionsDialog::open() { #ifdef GUI_ONLY_FULLSCREEN _fullscreenCheckbox->setState(true); _fullscreenCheckbox->setEnabled(false); - _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); - _aspectCheckbox->setEnabled(false); #else // !GUI_ONLY_FULLSCREEN // Fullscreen setting _fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain)); +#endif // GUI_ONLY_FULLSCREEN // Aspect ratio setting if (_guioptions.contains(GUIO_NOASPECT)) { @@ -252,7 +251,6 @@ void OptionsDialog::open() { _aspectCheckbox->setEnabled(true); _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); } -#endif // GUI_ONLY_FULLSCREEN } @@ -435,13 +433,13 @@ void OptionsDialog::close() { if (gfxError & OSystem::kTransactionAspectRatioFailed) { ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain); message += "\n"; - message += _("the fullscreen setting could not be changed"); + message += _("the aspect ratio setting could not be changed"); } if (gfxError & OSystem::kTransactionFullscreenFailed) { ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain); message += "\n"; - message += _("the aspect ratio setting could not be changed"); + message += _("the fullscreen setting could not be changed"); } // And display the error diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp index 22b87f5244..085f901fc4 100644 --- a/gui/storagewizarddialog.cpp +++ b/gui/storagewizarddialog.cpp @@ -69,7 +69,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId): _openUrlWidget = new ButtonWidget(container, "GlobalOptions_Cloud_ConnectionWizard_Container.OpenUrlButton", _("Open URL"), 0, kOpenUrlCmd); _pasteCodeWidget = new ButtonWidget(container, "GlobalOptions_Cloud_ConnectionWizard_Container.PasteCodeButton", _("Paste"), _("Pastes clipboard contents into fields"), kPasteCodeCmd); _connectWidget = new ButtonWidget(container, "GlobalOptions_Cloud_ConnectionWizard_Container.ConnectButton", _("Connect"), 0, kConnectCmd); - + // Initialy the code is empty, so disable the connect button _connectWidget->setEnabled(false); @@ -78,7 +78,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId): _returnLine1->setLabel(_("You will be directed to ScummVM's page where")); _returnLine2->setLabel(_("you should allow it to access your storage.")); } - + _picture = new GraphicsWidget(container, "GlobalOptions_Cloud_ConnectionWizard_Container.Picture"); #ifndef DISABLE_FANCY_THEMES if (g_gui.theme()->supportsImages()) { diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex e942dc8602..6da33d49d0 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat |