diff options
author | Alexander Tkachev | 2019-07-21 20:52:16 +0700 |
---|---|---|
committer | Matan Bareket | 2019-07-30 14:51:41 -0400 |
commit | f7902583bc7a3aac702d10488e47805742753d0a (patch) | |
tree | deee81106b4298dedebd8ad390a2fa15560983ca /gui | |
parent | e4da63823ad363cfd24b15bc671aa6cb8f5b43f1 (diff) | |
download | scummvm-rg350-f7902583bc7a3aac702d10488e47805742753d0a.tar.gz scummvm-rg350-f7902583bc7a3aac702d10488e47805742753d0a.tar.bz2 scummvm-rg350-f7902583bc7a3aac702d10488e47805742753d0a.zip |
GUI: Change 'Wi-Fi Sharing' tab name to 'LAN'
Diffstat (limited to 'gui')
-rw-r--r-- | gui/options.cpp | 18 | ||||
-rw-r--r-- | gui/options.h | 6 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 136751 -> 136743 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 265518 -> 265510 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummremastered.zip | bin | 265456 -> 265448 bytes | |||
-rw-r--r-- | gui/themes/scummremastered/remastered_layout.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummremastered/remastered_layout_lowres.stx | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 245b985c43..6be08d40cb 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 10e192d092..a1cdcec6bc 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 Binary files differindex c06cdae6ba..15dd50ac2a 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index dd0ff14655..5dbd4ca320 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -732,7 +732,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'RunServerButton' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 8d014d9060..d849513c1d 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -737,7 +737,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'RunServerButton' diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 794b0d7a95..b998e352be 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index d7c60b66b6..f6d5d6167d 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -746,7 +746,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'RunServerButton' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 558d5dc2d2..e44aaa901e 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -735,7 +735,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'RunServerButton' diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip Binary files differindex 5bd3719d8c..57775abf02 100644 --- a/gui/themes/scummremastered.zip +++ b/gui/themes/scummremastered.zip diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx index d7c60b66b6..f6d5d6167d 100644 --- a/gui/themes/scummremastered/remastered_layout.stx +++ b/gui/themes/scummremastered/remastered_layout.stx @@ -746,7 +746,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'RunServerButton' diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx index 53a1acc717..32191aab76 100644 --- a/gui/themes/scummremastered/remastered_layout_lowres.stx +++ b/gui/themes/scummremastered/remastered_layout_lowres.stx @@ -735,7 +735,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Network' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'RunServerButton' |