Merge pull request #13908 from Hydrox6/sign-in-wording
client: update various wordings to use "signed in/out" for RL accounts
This commit is contained in:
@@ -186,7 +186,7 @@ public class SessionManager
|
|||||||
}
|
}
|
||||||
catch (IOException ex)
|
catch (IOException ex)
|
||||||
{
|
{
|
||||||
log.warn("Unable to logout of session", ex);
|
log.warn("Unable to sign out of session", ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
accountSession = null; // No more account
|
accountSession = null; // No more account
|
||||||
@@ -225,7 +225,7 @@ public class SessionManager
|
|||||||
@Subscribe
|
@Subscribe
|
||||||
public void onLoginResponse(LoginResponse loginResponse)
|
public void onLoginResponse(LoginResponse loginResponse)
|
||||||
{
|
{
|
||||||
log.debug("Now logged in as {}", loginResponse.getUsername());
|
log.debug("Now signed in as {}", loginResponse.getUsername());
|
||||||
|
|
||||||
AccountSession session = getAccountSession();
|
AccountSession session = getAccountSession();
|
||||||
session.setUsername(loginResponse.getUsername());
|
session.setUsername(loginResponse.getUsername());
|
||||||
|
|||||||
@@ -75,14 +75,14 @@ public class AccountPlugin extends Plugin
|
|||||||
loginButton = NavigationButton.builder()
|
loginButton = NavigationButton.builder()
|
||||||
.tab(false)
|
.tab(false)
|
||||||
.icon(LOGIN_IMAGE)
|
.icon(LOGIN_IMAGE)
|
||||||
.tooltip("Log in to RuneLite")
|
.tooltip("Sign in to RuneLite")
|
||||||
.onClick(this::loginClick)
|
.onClick(this::loginClick)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
logoutButton = NavigationButton.builder()
|
logoutButton = NavigationButton.builder()
|
||||||
.tab(false)
|
.tab(false)
|
||||||
.icon(LOGOUT_IMAGE)
|
.icon(LOGOUT_IMAGE)
|
||||||
.tooltip("Log out of RuneLite")
|
.tooltip("Sign out of RuneLite")
|
||||||
.onClick(this::logoutClick)
|
.onClick(this::logoutClick)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ public class AccountPlugin extends Plugin
|
|||||||
private void logoutClick()
|
private void logoutClick()
|
||||||
{
|
{
|
||||||
if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(null,
|
if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(null,
|
||||||
"Are you sure you want to log out from RuneLite?", "Logout Confirmation",
|
"Are you sure you want to sign out of RuneLite?", "Sign Out Confirmation",
|
||||||
JOptionPane.YES_NO_OPTION))
|
JOptionPane.YES_NO_OPTION))
|
||||||
{
|
{
|
||||||
executor.execute(sessionManager::logout);
|
executor.execute(sessionManager::logout);
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ public class InfoPanel extends PluginPanel
|
|||||||
syncPanel = buildLinkPanel(IMPORT_ICON, "Import signed-out", "settings", () ->
|
syncPanel = buildLinkPanel(IMPORT_ICON, "Import signed-out", "settings", () ->
|
||||||
{
|
{
|
||||||
final int result = JOptionPane.showOptionDialog(syncPanel,
|
final int result = JOptionPane.showOptionDialog(syncPanel,
|
||||||
"<html>This will overwrite your settings with settings from your local profile, which<br/>is the profile used when not logged into RuneLite with a RuneLite account.</html>",
|
"<html>This will overwrite your settings with settings from your local profile, which<br/>is the profile used when not signed into RuneLite with a RuneLite account.</html>",
|
||||||
"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
|
"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
|
||||||
null, new String[]{"Yes", "No"}, "No");
|
null, new String[]{"Yes", "No"}, "No");
|
||||||
|
|
||||||
@@ -298,14 +298,14 @@ public class InfoPanel extends PluginPanel
|
|||||||
{
|
{
|
||||||
emailLabel.setContentType("text/plain");
|
emailLabel.setContentType("text/plain");
|
||||||
emailLabel.setText(name);
|
emailLabel.setText(name);
|
||||||
loggedLabel.setText("Logged in as");
|
loggedLabel.setText("Signed in as");
|
||||||
actionsContainer.add(syncPanel, 0);
|
actionsContainer.add(syncPanel, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
emailLabel.setContentType("text/html");
|
emailLabel.setContentType("text/html");
|
||||||
emailLabel.setText("<a href=\"" + RUNELITE_LOGIN + "\">Login</a> to sync settings to the cloud.");
|
emailLabel.setText("<a href=\"" + RUNELITE_LOGIN + "\">Sign in</a> to sync settings to the cloud.");
|
||||||
loggedLabel.setText("Not logged in");
|
loggedLabel.setText("Not signed in");
|
||||||
actionsContainer.remove(syncPanel);
|
actionsContainer.remove(syncPanel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ public interface LootTrackerConfig extends Config
|
|||||||
@ConfigItem(
|
@ConfigItem(
|
||||||
keyName = "syncPanel",
|
keyName = "syncPanel",
|
||||||
name = "Synchronize panel contents",
|
name = "Synchronize panel contents",
|
||||||
description = "Synchronize your local loot tracker with your server data (requires being logged in).<br/>" +
|
description = "Synchronize your local loot tracker with your server data (requires being signed in).<br/>" +
|
||||||
" This means the panel is filled with portions of your remote data on startup<br/>" +
|
" This means the panel is filled with portions of your remote data on startup<br/>" +
|
||||||
" and deleting data in the panel also deletes it on the server."
|
" and deleting data in the panel also deletes it on the server."
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user