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 9d8470bd..7fa1f0f0 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.2.8";
+ public static final String APP_VERSION = "1.2.9";
public static final String SERVER_HOST = "exslims.ddns.net";
public static final int PORT = 5555;
}
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrManagerFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrManagerFrame.java
index 48ef8ba6..cf9ef7ae 100644
--- a/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrManagerFrame.java
+++ b/app-ui/src/main/java/com/mercury/platform/ui/adr/components/AdrManagerFrame.java
@@ -45,6 +45,8 @@ public AdrManagerFrame(AdrProfileDescriptor selectedProfile) {
super();
this.processingHideEvent = false;
this.setTitle("MercuryTrade ADR");
+ this.setFocusable(true);
+ this.setFocusableWindowState(true);
this.setAlwaysOnTop(false);
this.selectedProfile = selectedProfile;
this.exportDialog = new AdrExportDialog(this, new ArrayList<>());
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java
index 77499e05..27327300 100644
--- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java
+++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/ChatScannerFrame.java
@@ -40,6 +40,8 @@ public class ChatScannerFrame extends AbstractTitledComponentFrame {
public ChatScannerFrame() {
super();
this.processingHideEvent = false;
+ this.setFocusableWindowState(true);
+ this.setFocusable(true);
this.setAlwaysOnTop(false);
}
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java
index 20839f70..0a1f3c0f 100644
--- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java
+++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java
@@ -52,6 +52,8 @@ public SettingsFrame() {
this.setAlwaysOnTop(false);
this.processingHideEvent = false;
this.processHideEffect = false;
+ this.setFocusable(true);
+ this.setFocusableWindowState(true);
this.setPreferredSize(new Dimension(1000, 600));
}
diff --git a/app-ui/src/main/resources/notes/patch/patch-notes-new.json b/app-ui/src/main/resources/notes/patch/patch-notes-new.json
index b6b32235..001c00c7 100644
--- a/app-ui/src/main/resources/notes/patch/patch-notes-new.json
+++ b/app-ui/src/main/resources/notes/patch/patch-notes-new.json
@@ -1,4 +1,15 @@
[
+ {
+ "version": "1.2.9",
+ "fix": [
+ {
+ "changed": "Fixed button customization not working"
+ },
+ {
+ "changed": "Fixed blocked text fields"
+ }
+ ]
+ },
{
"version": "1.2.8",
"fix": [
diff --git a/release_files/MercuryTrade/README.txt b/release_files/MercuryTrade/README.txt
new file mode 100644
index 00000000..c641a4a0
--- /dev/null
+++ b/release_files/MercuryTrade/README.txt
@@ -0,0 +1,15 @@
+Here you can put your own sound files to change existing ones.
+
+Simply put a sound file inside this folder and name it like the one which is used in MT.
+
+
+The list of files which MT uses has names:
+button-pressed.wav
+chat-filter.wav
+icq-message.wav
+notification.wav
+patch_tone.wav
+
+Also if you want to change betrayal image to any you need just replace "helpIGImg.png" with any image with same name
+
+All files that you want to change need to be in location resources/app
\ No newline at end of file
diff --git a/release_files/MercuryTrade/resources/app/helpIGImg.png b/release_files/MercuryTrade/resources/app/helpIGImg.png
new file mode 100644
index 00000000..675c1f5a
Binary files /dev/null and b/release_files/MercuryTrade/resources/app/helpIGImg.png differ
diff --git a/release_files/release_config.xml b/release_files/release_config.xml
index 15062125..7b832eeb 100644
--- a/release_files/release_config.xml
+++ b/release_files/release_config.xml
@@ -30,12 +30,12 @@
-XX:+UseG1GC
- 1.2.8.0
- 1.2.8
+ 1.2.9.0
+ 1.2.9
MercuryTrade
Morph21
- 1.2.8.0
- 1.2.8
+ 1.2.9.0
+ 1.2.9
MercuryTrade
Morph
MercuryTrade