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

Move setTitle to ClientUI

Browse Source 
Move setTitle method from RuneLite to ClientUI.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2017-12-24 03:34:42 +01:00
parent bd521acbb0
commit 06836b3e1d
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.client; package net.runelite.client;
import com.google.common.base.Strings;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -184,9 +183,7 @@ public class RuneLite
log.warn("unable to set look and feel", ex); log.warn("unable to set look and feel", ex);
} }
gui = new ClientUI(client); gui = new ClientUI(properties, client);
setTitle(null);
setupTrayIcon(); setupTrayIcon();
}); });
@@ -220,18 +217,6 @@ public class RuneLite
pluginManager.watch(); pluginManager.watch();
} }
public void setTitle(String extra)
{
if (!Strings.isNullOrEmpty(extra))
{
gui.setTitle(properties.getTitle() + " " + properties.getVersion() + " " + extra);
}
else
{
gui.setTitle(properties.getTitle() + " " + properties.getVersion());
}
}
private void setupTrayIcon() private void setupTrayIcon()
{ {
if (!SystemTray.isSupported()) if (!SystemTray.isSupported())

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

@@ -35,7 +35,6 @@ import java.util.concurrent.ScheduledExecutorService;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.client.RuneLite;
import net.runelite.client.account.AccountSession; import net.runelite.client.account.AccountSession;
import net.runelite.client.account.SessionManager; import net.runelite.client.account.SessionManager;
import net.runelite.client.events.SessionClose; import net.runelite.client.events.SessionClose;
@@ -56,9 +55,6 @@ import net.runelite.http.api.ws.messages.LoginResponse;
@Slf4j @Slf4j
public class AccountPlugin extends Plugin public class AccountPlugin extends Plugin
{ {
@Inject
RuneLite runelite;
@Inject @Inject
SessionManager sessionManager; SessionManager sessionManager;
@@ -188,7 +184,7 @@ public class AccountPlugin extends Plugin
log.debug("Session opened as {}", session.getUsername()); log.debug("Session opened as {}", session.getUsername());
runelite.setTitle("(" + session.getUsername() + ")"); ui.setTitle("(" + session.getUsername() + ")");
replaceLoginWithLogout(); replaceLoginWithLogout();
} }
@@ -204,7 +200,7 @@ public class AccountPlugin extends Plugin
@Subscribe @Subscribe
public void onSessionClose(SessionClose sessionClose) public void onSessionClose(SessionClose sessionClose)
{ {
runelite.setTitle(null); ui.setTitle(null);
} }
} }

22
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -25,6 +25,7 @@
package net.runelite.client.ui; package net.runelite.client.ui;
import java.applet.Applet; import java.applet.Applet;
import com.google.common.base.Strings;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
@@ -42,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.client.RuneLite; import net.runelite.client.RuneLite;
import net.runelite.client.RuneliteProperties;
import org.pushingpixels.substance.internal.ui.SubstanceRootPaneUI; import org.pushingpixels.substance.internal.ui.SubstanceRootPaneUI;
@Slf4j @Slf4j
@@ -52,21 +54,23 @@ public class ClientUI extends JFrame
private static final int EXPANDED_WIDTH = CLIENT_WIDTH + PluginPanel.PANEL_WIDTH + SCROLLBAR_WIDTH; private static final int EXPANDED_WIDTH = CLIENT_WIDTH + PluginPanel.PANEL_WIDTH + SCROLLBAR_WIDTH;
private final Applet client; private final Applet client;
private final RuneliteProperties properties;
private JPanel container; private JPanel container;
private JPanel navContainer; private JPanel navContainer;
private ClientPanel panel; private ClientPanel panel;
private PluginToolbar pluginToolbar; private PluginToolbar pluginToolbar;
private PluginPanel pluginPanel; private PluginPanel pluginPanel;
public ClientUI(Applet client) public ClientUI(RuneliteProperties properties, Applet client)
{ {
this.properties = properties;
this.client = client; this.client = client;
setUIFont(new FontUIResource(FontManager.getRunescapeFont())); setUIFont(new FontUIResource(FontManager.getRunescapeFont()));
init(); init();
pack(); pack();
TitleBarPane titleBarPane = new TitleBarPane(this.getRootPane(), (SubstanceRootPaneUI)this.getRootPane().getUI()); TitleBarPane titleBarPane = new TitleBarPane(this.getRootPane(), (SubstanceRootPaneUI)this.getRootPane().getUI());
titleBarPane.editTitleBar(this); titleBarPane.editTitleBar(this);
setTitle("RuneLite"); setTitle(null);
setIconImage(RuneLite.ICON); setIconImage(RuneLite.ICON);
setLocationRelativeTo(getOwner()); setLocationRelativeTo(getOwner());
setResizable(true); setResizable(true);
@@ -89,6 +93,20 @@ public class ClientUI extends JFrame
} }
} }
@Override
public void setTitle(String extra)
{
if (!Strings.isNullOrEmpty(extra))
{
super.setTitle(properties.getTitle() + " " + properties.getVersion() + " " + extra);
}
else
{
super.setTitle(properties.getTitle() + " " + properties.getVersion());
}
}
private void init() private void init()
{ {
assert SwingUtilities.isEventDispatchThread(); assert SwingUtilities.isEventDispatchThread();