diff --git a/gui/options.cpp b/gui/options.cpp index 245b985c43b..6be08d40cb3 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1763,10 +1763,10 @@ void GlobalOptionsDialog::build() { #endif USE_LIBCURL #ifdef USE_SDL_NET // - // 8) The Wi-Fi Sharing tab (local "cloud" webserver) + // 8) The LAN tab (local "cloud" webserver) // - tab->addTab(_c("Wi-Fi Sharing", context)); - addWiFiSharingControls(tab, "GlobalOptions_WiFiSharing.", context); + tab->addTab(_c("LAN", context)); + addNetworkControls(tab, "GlobalOptions_Network.", context); #endif // USE_SDL_NET #endif // USE_CLOUD @@ -1903,7 +1903,7 @@ void GlobalOptionsDialog::addCloudControls(GuiObject *boss, const Common::String #endif // USE_LIBCURL #ifdef USE_SDL_NET -void GlobalOptionsDialog::addWiFiSharingControls(GuiObject *boss, const Common::String &prefix, const char *context) { +void GlobalOptionsDialog::addNetworkControls(GuiObject *boss, const Common::String &prefix, const char *context) { _runServerButton = new ButtonWidget(boss, prefix + "RunServerButton", _("Run server"), _("Run local webserver"), kRunServerCmd); _serverInfoLabel = new StaticTextWidget(boss, prefix + "ServerInfoLabel", _("Not running")); @@ -1918,10 +1918,10 @@ void GlobalOptionsDialog::addWiFiSharingControls(GuiObject *boss, const Common:: _serverPort = new EditTextWidget(boss, prefix + "ServerPortEditText", Common::String::format("%u", port), 0); _serverPortClearButton = addClearButton(boss, prefix + "ServerPortClearButton", kServerPortClearCmd); - _featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", _c("Run server to manage files with browser (in the same Wi-Fi network).", context), "", ThemeEngine::kFontStyleNormal); + _featureDescriptionLine1 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine1", _c("Run server to manage files with browser (in the same network).", context), "", ThemeEngine::kFontStyleNormal); _featureDescriptionLine2 = new StaticTextWidget(boss, prefix + "FeatureDescriptionLine2", _c("Closing options dialog will stop the server.", context), "", ThemeEngine::kFontStyleNormal); - reflowWiFiSharingTabLayout(); + reflowNetworkTabLayout(); } #endif // USE_SDL_NET @@ -2403,7 +2403,7 @@ void GlobalOptionsDialog::handleTickle() { #ifdef USE_SDL_NET if (LocalServer.isRunning() != _serverWasRunning) { _serverWasRunning = !_serverWasRunning; - reflowWiFiSharingTabLayout(); + reflowNetworkTabLayout(); } #endif // USE_SDL_NET #endif // USE_CLOUD @@ -2450,7 +2450,7 @@ void GlobalOptionsDialog::reflowLayout() { setupCloudTab(); #endif // USE_LIBCURL #ifdef USE_SDL_NET - reflowWiFiSharingTabLayout(); + reflowNetworkTabLayout(); #endif // USE_SDL_NET #endif // USE_CLOUD } @@ -2592,7 +2592,7 @@ void GlobalOptionsDialog::shiftWidget(Widget *widget, const char *widgetName, in #endif // USE_LIBCURL #ifdef USE_SDL_NET -void GlobalOptionsDialog::reflowWiFiSharingTabLayout() { +void GlobalOptionsDialog::reflowNetworkTabLayout() { bool serverIsRunning = LocalServer.isRunning(); if (_runServerButton) { diff --git a/gui/options.h b/gui/options.h index 10e192d092f..a1cdcec6bc1 100644 --- a/gui/options.h +++ b/gui/options.h @@ -333,7 +333,7 @@ protected: #ifdef USE_SDL_NET // - // Wi-Fi Sharing controls + // LAN controls // ButtonWidget *_runServerButton; StaticTextWidget *_serverInfoLabel; @@ -347,8 +347,8 @@ protected: StaticTextWidget *_featureDescriptionLine2; bool _serverWasRunning; - void addWiFiSharingControls(GuiObject *boss, const Common::String &prefix, const char *context = nullptr); - void reflowWiFiSharingTabLayout(); + void addNetworkControls(GuiObject *boss, const Common::String &prefix, const char *context = nullptr); + void reflowNetworkTabLayout(); #endif // USE_SDL_NET #endif // USE_CLOUD diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip index c06cdae6ba7..15dd50ac2ae 100644 Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index dd0ff14655d..5dbd4ca320e 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -732,7 +732,7 @@ - + - + - + - + - + - +