ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #646 from Abextm/login-title

Browse Source 
Move the Login and Logout buttons to the TitleToolbar
This commit is contained in:
Adam
2018-03-04 10:25:17 -05:00
committed by GitHub
parent 8d4664410e 625a505f08
commit 026b3f214d
2 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
View File

@@ -26,9 +26,12 @@ package net.runelite.client.plugins.account;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import javax.swing.JButton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionClose;
import net.runelite.client.account.AccountSession; import net.runelite.client.account.AccountSession;
@@ -37,8 +40,7 @@ import net.runelite.api.events.SessionOpen;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.TitleToolbar;
import net.runelite.client.ui.PluginToolbar;
import net.runelite.client.util.RunnableExceptionLogger; import net.runelite.client.util.RunnableExceptionLogger;
@PluginDescriptor( @PluginDescriptor(
@@ -57,24 +59,58 @@ public class AccountPlugin extends Plugin
@Inject @Inject
private ScheduledExecutorService executor; private ScheduledExecutorService executor;
private NavigationButton loginButton; private JButton loginButton;
private NavigationButton logoutButton; private JButton logoutButton;
private static final BufferedImage LOGIN_IMAGE, LOGOUT_IMAGE;
static
{
try
{
LOGIN_IMAGE = ImageIO.read(AccountPlugin.class.getResourceAsStream("login_icon.png"));
LOGOUT_IMAGE = ImageIO.read(AccountPlugin.class.getResourceAsStream("logout_icon.png"));
}
catch (IOException e)
{
throw new RuntimeException(e);
}
}
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
loginButton = new NavigationButton("Login", ImageIO.read(getClass().getResourceAsStream("login_icon.png"))); loginButton = new JButton();
logoutButton = new NavigationButton("Logout", ImageIO.read(getClass().getResourceAsStream("logout_icon.png"))); loginButton.setToolTipText("Login");
loginButton.addActionListener(this::loginClick); loginButton.addActionListener(this::loginClick);
logoutButton = new JButton();
logoutButton.setToolTipText("Logout");
logoutButton.addActionListener(this::logoutClick); logoutButton.addActionListener(this::logoutClick);
ui.getPluginToolbar().addNavigation(sessionManager.getAccountSession() != null ? logoutButton : loginButton);
addAndRemoveButtons();
}
private void addAndRemoveButtons()
{
TitleToolbar tb = ui.getTitleToolbar();
tb.remove(loginButton);
tb.remove(logoutButton);
if (sessionManager.getAccountSession() == null)
{
tb.addButton(loginButton, LOGIN_IMAGE, LOGIN_IMAGE);
}
else
{
tb.addButton(logoutButton, LOGOUT_IMAGE, LOGOUT_IMAGE);
}
} }
@Override @Override
protected void shutDown() throws Exception protected void shutDown() throws Exception
{ {
ui.getPluginToolbar().removeNavigation(loginButton); ui.getTitleToolbar().remove(loginButton);
ui.getPluginToolbar().removeNavigation(logoutButton); ui.getTitleToolbar().remove(logoutButton);
} }
private void loginClick(ActionEvent ae) private void loginClick(ActionEvent ae)
@@ -90,11 +126,7 @@ public class AccountPlugin extends Plugin
@Subscribe @Subscribe
public void onSessionClose(SessionClose e) public void onSessionClose(SessionClose e)
{ {
// Replace logout nav button with login addAndRemoveButtons();
PluginToolbar navigationPanel = ui.getPluginToolbar();
navigationPanel.removeNavigation(logoutButton);
navigationPanel.addNavigation(loginButton);
navigationPanel.repaint();
} }
@Subscribe @Subscribe
@@ -109,11 +141,7 @@ public class AccountPlugin extends Plugin
log.debug("Session opened as {}", session.getUsername()); log.debug("Session opened as {}", session.getUsername());
// Replace login nav button with logout addAndRemoveButtons();
PluginToolbar navigationPanel = ui.getPluginToolbar();
navigationPanel.removeNavigation(loginButton);
navigationPanel.addNavigation(logoutButton);
navigationPanel.repaint();
} }
} }

12
runelite-client/src/main/java/net/runelite/client/ui/TitleToolbar.java
View File

@@ -162,7 +162,15 @@ public class TitleToolbar extends JPanel
{ {
final int iconSize = TITLEBAR_SIZE - 6; final int iconSize = TITLEBAR_SIZE - 6;
ImageIcon icon = new ImageIcon(iconImage.getScaledInstance(iconSize, iconSize, Image.SCALE_SMOOTH)); ImageIcon icon = new ImageIcon(iconImage.getScaledInstance(iconSize, iconSize, Image.SCALE_SMOOTH));
ImageIcon invertedIcon = new ImageIcon(invertedIconImage.getScaledInstance(iconSize, iconSize, Image.SCALE_SMOOTH)); ImageIcon invertedIcon;
if (invertedIconImage == null)
{
invertedIcon = icon;
}
else
{
invertedIcon = new ImageIcon(invertedIconImage.getScaledInstance(iconSize, iconSize, Image.SCALE_SMOOTH));
}
button.setIcon(icon); button.setIcon(icon);
button.setRolloverIcon(invertedIcon); button.setRolloverIcon(invertedIcon);
@@ -171,6 +179,7 @@ public class TitleToolbar extends JPanel
add(button); add(button);
revalidate(); revalidate();
repaint();
} }
@Override @Override
@@ -178,5 +187,6 @@ public class TitleToolbar extends JPanel
{ {
super.remove(c); super.remove(c);
revalidate(); revalidate();
repaint();
} }
} }