• R/O
  • HTTP
  • SSH
  • HTTPS

DelesteRandomSelector: Commit

開発Git


Commit MetaInfo

Revisiondc22cc8b5d951bf810d1415e818d5362f32bef40 (tree)
Time2022-01-11 18:38:54
AuthorReviewer-Ranfa <83933097+Reviewer-Ranfa@user...>
CommiterGitHub

Log Message

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

release/v3.1.0

Change Summary

Incremental Difference

Binary files /dev/null and b/Configurations.jar differ
--- a/generated/settings.json
+++ b/generated/settings.json
@@ -1,8 +1,8 @@
11 {
2- "checkVersion" : true,
32 "checkLibraryUpdates" : true,
4- "windowWidth" : 640,
3+ "checkVersion" : true,
54 "windowHeight" : 360,
65 "songLimit" : 15,
7- "saveScoreLog" : false
6+ "saveScoreLog" : true,
7+ "windowWidth" : 640
88 }
\ No newline at end of file
--- 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.
2727 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:
2828 MSGCurrentAlbumType:\nCurrent MASTER+ ALBUM type(based on simulation):
2929 MSGManualUpdate:<html><body>Manual<br>Update</body></html>
30-MSGManualUpdateNotCompleteYet:Manual Update has not been finished yet. Please wait a moment.
\ No newline at end of file
30+MSGManualUpdateNotCompleteYet:Manual Update has not been finished yet. Please wait a moment.
31+MSGConfigurations:Config
\ No newline at end of file
--- 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
2727 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
2828 MSGCurrentAlbumType:\n\u73fe\u5728\u306eMASTER+\u30a2\u30eb\u30d0\u30e0\u5468\u671f\uff08\u63a8\u5b9a\uff09\uff1a
2929 MSGManualUpdate:<html><body>\u624b\u52d5\u66f4\u65b0</body></html>
30-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
\ No newline at end of file
30+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
31+MSGConfigurations:\u8a2d\u5b9a
\ No newline at end of file
--- a/src/com/ranfa/main/DelesteRandomSelector.java
+++ b/src/com/ranfa/main/DelesteRandomSelector.java
@@ -3,6 +3,7 @@ package com.ranfa.main;
33 import java.awt.BorderLayout;
44 import java.awt.EventQueue;
55 import java.awt.Font;
6+import java.io.IOException;
67 import java.nio.file.Files;
78 import java.nio.file.Paths;
89 import java.util.ArrayList;
@@ -43,7 +44,7 @@ import com.ranfa.lib.Song;
4344 import com.ranfa.lib.TwitterIntegration;
4445 import com.ranfa.lib.Version;
4546
46-@Version(major = 3, minor = 0, patch = 1)
47+@Version(major = 3, minor = 1, patch = 0)
4748 public class DelesteRandomSelector extends JFrame {
4849
4950 private static ArrayList<Song> selectedSongsList = new ArrayList<>();
@@ -80,6 +81,7 @@ public class DelesteRandomSelector extends JFrame {
8081 private Thread manualUpdateThread;
8182 private JButton btnManualUpdate;
8283 private Easter easter;
84+ private JButton btnConfig;
8385
8486 /**
8587 * Launch the application.
@@ -313,6 +315,18 @@ public class DelesteRandomSelector extends JFrame {
313315 DelesteRandomSelector.this.integratorBool = true;
314316 DelesteRandomSelector.this.logger.info("show up completed.");
315317 });
318+
319+ this.btnConfig = new JButton(Messages.MSGConfigurations.toString());
320+ this.btnConfig.addActionListener(e -> {
321+ ProcessBuilder builder = new ProcessBuilder("java", "-jar", "Configurations.jar");
322+ try {
323+ builder.start();
324+ } catch (IOException e1) {
325+ // TODO 自動生成された catch ブロック
326+ e1.printStackTrace();
327+ }
328+ });
329+ this.panelEast.add(this.btnConfig, "1, 5");
316330 this.btnStart.setFont(new Font("UD デジタル 教科書体 NP-B", Font.BOLD, 13));
317331 this.panelEast.add(this.btnStart, "1, 7, fill, fill");
318332
--- a/src/com/ranfa/main/Messages.java
+++ b/src/com/ranfa/main/Messages.java
@@ -39,7 +39,8 @@ public enum Messages {
3939 MSGNarrowDownProcedure,
4040 MSGCurrentAlbumType,
4141 MSGManualUpdate,
42- MSGManualUpdateNotCompleteYet;
42+ MSGManualUpdateNotCompleteYet,
43+ MSGConfigurations;
4344
4445
4546 @Override
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
11 {
22 "major": 3,
3- "minor": 0,
4- "patch": 1
3+ "minor": 1,
4+ "patch": 0
55 }
Show on old repository browser