From f1e4bae31ab2bbabccb7b57898bb3d9360ab0e24 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 24 Jan 2018 19:19:51 -0500 Subject: [PATCH] runelite-client: remove version and account name from title Otherwise it shows in screenshots, and on Discord --- .../client/plugins/account/AccountPlugin.java | 9 --------- .../java/net/runelite/client/ui/ClientUI.java | 16 +--------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java index 44e519bd9a..ca0c5c7fff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java @@ -37,7 +37,6 @@ import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.client.account.AccountSession; import net.runelite.client.account.SessionManager; -import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionOpen; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -192,8 +191,6 @@ public class AccountPlugin extends Plugin log.debug("Session opened as {}", session.getUsername()); - ui.setTitle("(" + session.getUsername() + ")"); - replaceLoginWithLogout(); } @@ -205,10 +202,4 @@ public class AccountPlugin extends Plugin navigationPanel.addNavigation(logoutButton); } - @Subscribe - public void onSessionClose(SessionClose sessionClose) - { - ui.setTitle(null); - } - } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 8e2f467351..a82cff3e34 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -24,7 +24,6 @@ */ package net.runelite.client.ui; -import com.google.common.base.Strings; import java.applet.Applet; import java.awt.AWTException; import java.awt.BorderLayout; @@ -142,7 +141,7 @@ public class ClientUI extends JFrame this.trayIcon = setupTrayIcon(); init(); - setTitle(null); + setTitle(properties.getTitle()); setIconImage(ICON); // Prevent substance from using a resize cursor for pointing getLayeredPane().setCursor(Cursor.getDefaultCursor()); @@ -302,19 +301,6 @@ public class ClientUI extends JFrame return trayIcon; } - @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() { assert SwingUtilities.isEventDispatchThread();