Skip to content

Commit

Permalink
1.0.1.8 release commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Exslims committed Aug 20, 2017
1 parent 58da887 commit ff2f654
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -36,7 +36,7 @@ public void performHideout() {

@Override
public void showChatFiler() {
FramesManager.INSTANCE.hideOrShowFrame(ChatFilterSettingsFrame.class);
FramesManager.INSTANCE.hideOrShowFrame(ChatScannerFrame.class);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class ChatFilterSettingsFrame extends AbstractTitledComponentFrame {
public class ChatScannerFrame extends AbstractTitledComponentFrame {
private PlainConfigurationService<ScannerDescriptor> scannerService;
private PlainConfigurationService<NotificationSettingsDescriptor> notificationConfig;
private MessageInterceptor currentInterceptor;
private Map<String,String> expiresMessages;
private HtmlMessageBuilder messageBuilder;
private boolean running;

public ChatFilterSettingsFrame() {
public ChatScannerFrame() {
super();
this.processingHideEvent = false;
this.setFocusableWindowState(true);
Expand Down Expand Up @@ -219,7 +219,7 @@ private JPanel getMemo(){

@Override
protected String getFrameTitle() {
return "Chat filter settings";
return "Chat scanner";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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&currency_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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions app-ui/src/main/resources/notes/patch/patch-notes.json
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down

0 comments on commit ff2f654

Please sign in to comment.