diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java index 5d560e0f..ae012210 100644 --- a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java +++ b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java @@ -1,7 +1,7 @@ package com.mercury.platform.core; public class MercuryConstants { - public static final String APP_VERSION = "1.0.1.7.0"; + public static final String APP_VERSION = "1.0.1.8.0"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } diff --git a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/FramesConfigurationServiceImpl.java b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/FramesConfigurationServiceImpl.java index 5ff4bb07..9cd009df 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/FramesConfigurationServiceImpl.java +++ b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/FramesConfigurationServiceImpl.java @@ -68,7 +68,7 @@ private void initMinimumMap() { minimumFrameSize.put("SettingsFrame",new Dimension(600,400)); minimumFrameSize.put("HistoryFrame",new Dimension(280,400)); minimumFrameSize.put("TimerFrame",new Dimension(240,102)); - minimumFrameSize.put("ChatFilterFrame",new Dimension(400,100)); + minimumFrameSize.put("ChatScannerFrame",new Dimension(450,100)); minimumFrameSize.put("ItemsGridFrame",new Dimension(150,150)); minimumFrameSize.put("NotesFrame",new Dimension(540,100)); minimumFrameSize.put("ChatFilterSettingsFrame",new Dimension(300,200)); @@ -85,7 +85,7 @@ private void initDefaultMap() { defaultFramesSettings.put("SettingsFrame", new FrameDescriptor(new Point(600, 600), new Dimension(800,600))); defaultFramesSettings.put("HistoryFrame", new FrameDescriptor(new Point(600, 500), new Dimension(280, 400))); defaultFramesSettings.put("TimerFrame", new FrameDescriptor(new Point(400, 600), new Dimension(240, 102))); - defaultFramesSettings.put("ChatFilterFrame", new FrameDescriptor(new Point(400, 600), new Dimension(500, 300))); + defaultFramesSettings.put("ChatScannerFrame", new FrameDescriptor(new Point(400, 600), new Dimension(550, 220))); defaultFramesSettings.put("ItemsGridFrame", new FrameDescriptor(new Point(12, 79), new Dimension(641, 718))); defaultFramesSettings.put("NotesFrame", new FrameDescriptor(new Point(400, 600), new Dimension(540, 100))); defaultFramesSettings.put("ChatFilterSettingsFrame", new FrameDescriptor(new Point(400, 600), new Dimension(320, 200))); diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/taskbar/MercuryTaskBarController.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/taskbar/MercuryTaskBarController.java index e212e553..c5961698 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/taskbar/MercuryTaskBarController.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/taskbar/MercuryTaskBarController.java @@ -3,7 +3,7 @@ import com.mercury.platform.shared.store.MercuryStoreCore; import com.mercury.platform.ui.frame.movable.ItemsGridFrame; import com.mercury.platform.ui.frame.movable.TaskBarFrame; -import com.mercury.platform.ui.frame.titled.ChatFilterSettingsFrame; +import com.mercury.platform.ui.frame.titled.ChatScannerFrame; import com.mercury.platform.ui.frame.titled.HistoryFrame; import com.mercury.platform.ui.frame.titled.SettingsFrame; import com.mercury.platform.ui.manager.FramesManager; @@ -36,7 +36,7 @@ public void performHideout() { @Override public void showChatFiler() { - FramesManager.INSTANCE.hideOrShowFrame(ChatFilterSettingsFrame.class); + FramesManager.INSTANCE.hideOrShowFrame(ChatScannerFrame.class); } @Override diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatFilterSettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java similarity index 98% rename from app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatFilterSettingsFrame.java rename to app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java index d4bcfed2..a575b510 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatFilterSettingsFrame.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java @@ -24,7 +24,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -public class ChatFilterSettingsFrame extends AbstractTitledComponentFrame { +public class ChatScannerFrame extends AbstractTitledComponentFrame { private PlainConfigurationService scannerService; private PlainConfigurationService notificationConfig; private MessageInterceptor currentInterceptor; @@ -32,7 +32,7 @@ public class ChatFilterSettingsFrame extends AbstractTitledComponentFrame { private HtmlMessageBuilder messageBuilder; private boolean running; - public ChatFilterSettingsFrame() { + public ChatScannerFrame() { super(); this.processingHideEvent = false; this.setFocusableWindowState(true); @@ -219,7 +219,7 @@ private JPanel getMemo(){ @Override protected String getFrameTitle() { - return "Chat filter settings"; + return "Chat scanner"; } @Override diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/NotesFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/NotesFrame.java index bd626745..b234f17d 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/NotesFrame.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/NotesFrame.java @@ -93,7 +93,7 @@ private JPanel getNavBar(){ JButton donate = componentsFactory.getBorderedButton("Donate"); donate.addActionListener(action -> { try { - Desktop.getDesktop().browse(new URI("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=HJVSYP4YR7V88&lc=US&item_name=MercuryTrade¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted")); + Desktop.getDesktop().browse(new URI("https://www.paypal.me/mercurytrade")); } catch (Exception e1) { e1.printStackTrace(); } diff --git a/app-ui/src/main/java/com/mercury/platform/ui/manager/FramesManager.java b/app-ui/src/main/java/com/mercury/platform/ui/manager/FramesManager.java index c20ea5f4..1000f988 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/manager/FramesManager.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/manager/FramesManager.java @@ -20,7 +20,7 @@ import com.mercury.platform.ui.frame.AbstractOverlaidFrame; import com.mercury.platform.ui.frame.setup.location.SetUpLocationCommander; import com.mercury.platform.ui.frame.other.SetUpLocationFrame; -import com.mercury.platform.ui.frame.titled.ChatFilterSettingsFrame; +import com.mercury.platform.ui.frame.titled.ChatScannerFrame; import com.mercury.platform.ui.frame.titled.HistoryFrame; import com.mercury.platform.ui.manager.routing.SettingsRoutManager; import com.mercury.platform.ui.misc.MercuryStoreUI; @@ -80,7 +80,7 @@ public void start(){ this.framesMap.put(TooltipFrame.class,new TooltipFrame()); this.framesMap.put(NotificationAlertFrame.class,new NotificationAlertFrame()); this.framesMap.put(MercuryLoadingFrame.class,new MercuryLoadingFrame()); - this.framesMap.put(ChatFilterSettingsFrame.class,new ChatFilterSettingsFrame()); + this.framesMap.put(ChatScannerFrame.class,new ChatScannerFrame()); this.framesMap.put(UpdateReadyFrame.class,new UpdateReadyFrame()); this.framesMap.put(TaskBarFrame.class,taskBarFrame); this.framesMap.put(SetUpLocationFrame.class,new SetUpLocationFrame()); diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json index dc762584..9e37d271 100644 --- a/app-ui/src/main/resources/notes/patch/patch-notes.json +++ b/app-ui/src/main/resources/notes/patch/patch-notes.json @@ -1,9 +1,9 @@ { - "version":"1.0.1.7.0", + "version":"1.0.1.8.0", "notes":[ { "title" : "Update", - "text" : "More than 5000 unique users this week! Here is an update for you!\n-Completely reworked Settings GUI.\n-All the issues with non-English keyboard layouts should be gone. Also now you can bind absolutely any mouse / keyboard button you have.\n-Fixed an issue when you couldn't close Notification panel.\n-Now components are cleaned up properly on a profile switch.\nCheck out the Overseer channel on Discord - post your setups, share profiles and converse!\n\nStay with us as there are more mind-blowing features to come. And don't forget to support the app, judging from all the activity looks like it's probably worth some!", + "text" : "Just this week we've got more than 6000 new users which is insane. The update we're rolling out today affects every aspect of the application - basically a big rework of the core systems.\n\n- Notification panel rework (more info on reddit)\n- Overseer: new component \"Capture\".\n- All the buttons are now hotkeyable.\n- Chat scanner and history rework.\n- More responsive interface.\n\nA lot of work has been done, but that's it for today. Stay with us!", "image" : "", "layout" : "VERTICAL" }