Merge pull request #43 from hizumiaoba/release/v3.1.0

release/v3.1.0
hizumiaoba · Jan 11, 2022 · dc22cc8 · dc22cc8
2 parents 208801e + a3a97a5
commit dc22cc8
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/Configurations.jar b/Configurations.jar
diff --git a/generated/settings.json b/generated/settings.json
@@ -1,8 +1,8 @@
 {
-  "checkVersion" : true,
   "checkLibraryUpdates" : true,
-  "windowWidth" : 640,
+  "checkVersion" : true,
   "windowHeight" : 360,
   "songLimit" : 15,
-  "saveScoreLog" : false
+  "saveScoreLog" : true,
+  "windowWidth" : 640
 }
diff --git a/src/com/ranfa/languages/List_en_US.properties b/src/com/ranfa/languages/List_en_US.properties
@@ -27,4 +27,5 @@ MSGInternalYpdateNotDoneYet:Internal update in progress. Please wait a moment.
 MSGNarrowDownProcedure:How to select songs\r\n1.Select difficulty, attribute, and level.\r\n2.Click [Narrow down songs] button.\r\n3.Click [start!] button.\r\n4.Selected songs will be shown here!\r\nThe maximum number of selected songs:
 MSGCurrentAlbumType:\nCurrent MASTER+ ALBUM type(based on simulation):
 MSGManualUpdate:<html><body>Manual<br>Update</body></html>
-MSGManualUpdateNotCompleteYet:Manual Update has not been finished yet. Please wait a moment.
+MSGManualUpdateNotCompleteYet:Manual Update has not been finished yet. Please wait a moment.
+MSGConfigurations:Config
diff --git a/src/com/ranfa/languages/List_ja_JP.properties b/src/com/ranfa/languages/List_ja_JP.properties
@@ -27,4 +27,5 @@ MSGInternalYpdateNotDoneYet:\u5185\u90e8\u66f4\u65b0\u51e6\u7406\u304c\u5b8c\u4e
 MSGNarrowDownProcedure:\u697d\u66f2\u9078\u629e\u306e\u624b\u9806\r\n\uff11\uff0e\u96e3\u6613\u5ea6\u3001\u5c5e\u6027\u3001\u30ec\u30d9\u30eb\u3092\u9078\u629e\u3059\u308b\r\n\uff12\uff0e\u300c\u697d\u66f2\u53d6\u308a\u8fbc\u307f\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3059\uff01\r\n\uff13\uff0e\u300c\u958b\u59cb\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3059\uff01\r\n\uff14\uff0e\u9078\u629e\u3055\u308c\u305f\u697d\u66f2\u304c\u3053\u3053\u306b\u8868\u793a\u3055\u308c\u307e\u3059\uff01\r\n\u73fe\u5728\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u697d\u66f2\u9078\u629e\u306e\u6700\u5927\u6570\uff1a
 MSGCurrentAlbumType:\n\u73fe\u5728\u306eMASTER+\u30a2\u30eb\u30d0\u30e0\u5468\u671f\uff08\u63a8\u5b9a\uff09\uff1a
 MSGManualUpdate:<html><body>\u624b\u52d5\u66f4\u65b0</body></html>
-MSGManualUpdateNotCompleteYet:\u624b\u52d5\u66f4\u65b0\u304c\u5b8c\u4e86\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u3082\u3046\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002
+MSGManualUpdateNotCompleteYet:\u624b\u52d5\u66f4\u65b0\u304c\u5b8c\u4e86\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u3082\u3046\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002
+MSGConfigurations:\u8a2d\u5b9a
diff --git a/src/com/ranfa/main/DelesteRandomSelector.java b/src/com/ranfa/main/DelesteRandomSelector.java
@@ -3,6 +3,7 @@
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
 import java.awt.Font;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -43,7 +44,7 @@
 import com.ranfa.lib.TwitterIntegration;
 import com.ranfa.lib.Version;
 
-@Version(major = 3, minor = 0, patch = 1)
+@Version(major = 3, minor = 1, patch = 0)
 public class DelesteRandomSelector extends JFrame {
 
 	private static ArrayList<Song> selectedSongsList = new ArrayList<>();
@@ -80,6 +81,7 @@ public class DelesteRandomSelector extends JFrame {
 	private Thread manualUpdateThread;
 	private JButton btnManualUpdate;
 	private Easter easter;
+	private JButton btnConfig;
 
 	/**
 	 * Launch the application.
@@ -313,6 +315,18 @@ public DelesteRandomSelector() {
 			DelesteRandomSelector.this.integratorBool = true;
 			DelesteRandomSelector.this.logger.info("show up completed.");
 		});
+
+		this.btnConfig = new JButton(Messages.MSGConfigurations.toString());
+		this.btnConfig.addActionListener(e -> {
+			ProcessBuilder builder = new ProcessBuilder("java", "-jar", "Configurations.jar");
+			try {
+				builder.start();
+			} catch (IOException e1) {
+				// TODO 自動生成された catch ブロック
+				e1.printStackTrace();
+			}
+		});
+		this.panelEast.add(this.btnConfig, "1, 5");
 		this.btnStart.setFont(new Font("UD デジタル 教科書体 NP-B", Font.BOLD, 13));
 		this.panelEast.add(this.btnStart, "1, 7, fill, fill");
 

diff --git a/src/com/ranfa/main/Messages.java b/src/com/ranfa/main/Messages.java
@@ -39,7 +39,8 @@ public enum Messages {
 	MSGNarrowDownProcedure,
 	MSGCurrentAlbumType,
 	MSGManualUpdate,
-	MSGManualUpdateNotCompleteYet;
+	MSGManualUpdateNotCompleteYet,
+	MSGConfigurations;
 
 
 	@Override

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
 		"major": 3,
-		"minor": 0,
-		"patch": 1
+		"minor": 1,
+		"patch": 0
 }