Merge pull request #21 from Zmax0/dev/2.4.3

2.4.3
Zmax0 · Apr 25, 2024 · 6bfeac0 · 6bfeac0
2 parents 349f1d9 + aaa204d
commit 6bfeac0
Show file tree

Hide file tree

Showing 59 changed files with 815 additions and 530 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@
 
 A sock5 proxy
 
-**WARNING**: Be aware of the risk when using this software because neither **Detection Prevention** nor **Replay Protection** is implemented currently
-
 ## Quick start
 
 put *config.json* file into the unpacked folder before running

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>urban-spork</groupId>
   <artifactId>urban-spork</artifactId>
-  <version>2.4.2</version>
+  <version>2.4.3</version>
   <packaging>pom</packaging>
   <modules>
     <module>urban-spork-common</module>
@@ -14,7 +14,7 @@
   </modules>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <urban-spork.version>2.4.2</urban-spork.version>
+    <urban-spork.version>2.4.3</urban-spork.version>
     <maven-surefire-plugin.versioin>3.2.3</maven-surefire-plugin.versioin>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
     <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>

diff --git a/urban-spork-client-gui/pom.xml b/urban-spork-client-gui/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>urban-spork</groupId>
     <artifactId>urban-spork</artifactId>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
   </parent>
   <groupId>urban-spork-client-gui</groupId>
   <artifactId>urban-spork-client-gui</artifactId>
@@ -23,16 +23,11 @@
   </dependencies>
   <build>
     <resources>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          <include>**/*.properties</include><!-- i18n -->
-        </includes>
-      </resource>
       <resource>
         <directory>resource</directory>
         <includes>
           <include>**/*.xml</include>
+          <include>**/*.properties</include><!-- i18n -->
         </includes>
       </resource>
       <resource>

diff --git a/urban-spork-client-gui/resource/console.css b/urban-spork-client-gui/resource/console.css
@@ -1,146 +1,152 @@
 * {
-    -fx-primary-color: #f8f8ff;
-    -fx-primary-text: #000;
-    -fx-secondary-color: derive(#000, 90%);
+  -fx-primary-color: #f8f8ff;
+  -fx-primary-text: #000;
+  -fx-secondary-color: derive(#000, 90%);
+  -jfx-focus-color: -fx-secondary-color;
 }
 
 .root {
-    -fx-font-family: 'Microsoft YaHei UI';
-    -fx-font-size: 12px;
+  -fx-font-family: 'Microsoft YaHei UI';
+  -fx-font-size: 12px;
 }
 
 .jfx-tab-pane {
-    -fx-pref-height: 500;
-    /* -fx-padding: 1px; */
-    /* -fx-background-color: -fx-secondary-color, -fx-primary-color; */
-    /* -fx-background-insets: 0, 1; */
-    -fx-pref-width: 500;
+  -fx-pref-height: 525;
+  /* -fx-padding: 1px; */
+  /* -fx-background-color: -fx-secondary-color, -fx-primary-color; */
+  /* -fx-background-insets: 0, 1; */
+  -fx-pref-width: 500;
 }
 
 .jfx-tab-pane .headers-region {
-    -fx-background-color: -fx-secondary-color;
+  -fx-background-color: -fx-secondary-color;
 }
 
 .jfx-tab-pane .tab-header-background {
-    -fx-background-color: -fx-secondary-color;
+  -fx-background-color: -fx-secondary-color;
 }
 
 .jfx-tab-pane .tab-header-area .jfx-rippler {
-    -jfx-rippler-fill: #000;
+  -jfx-rippler-fill: #000;
 }
 
 .jfx-tab-pane .tab-header-area .tab-selected-line {
-    -fx-background-color: #000;
+  -fx-background-color: #000;
 }
 
 GridPane {
-    /* debug */
-    /* -fx-grid-lines-visible: true;*/
+  /* debug */
+  /* -fx-grid-lines-visible: true;*/
 }
 
 .label {
-    -fx-alignment: center-right;
-    /* -fx-border-color: -fx-secondary-color; */
-    -fx-min-width: 65;
+  -fx-alignment: center-right;
+  /* -fx-border-color: -fx-secondary-color; */
+  -fx-min-width: 65;
 }
 
-.jfx-button {
-    -fx-background-color: -fx-secondary-color;
-    -fx-background-radius: 5px;
-    -fx-border-radius: 5px;
-    -jfx-button-type: RAISED;
-    -fx-content-display: center;
-    -fx-graphic-text-gap: 20;
-    -fx-pref-height: 30;
-    -fx-pref-width: 70;
-    /* -fx-border-color: -fx-secondary-color; */
-    -fx-text-alignment: center;
-    -fx-text-fill: -fx-primary-text;
+.jfx-button, .lite-button {
+  -fx-background-color: -fx-secondary-color;
+  -fx-background-radius: 5px;
+  -fx-border-radius: 5px;
+  -jfx-button-type: RAISED;
+  -fx-content-display: center;
+  -fx-graphic-text-gap: 20;
+  -fx-pref-height: 30;
+  -fx-pref-width: 70;
+  /* -fx-border-color: -fx-secondary-color; */
+  -fx-text-alignment: center;
+  -fx-text-fill: -fx-primary-text;
+}
+
+.lite-button {
+  -fx-background-color: -fx-primary-color;
 }
 
 .hide-show.toggle-button {
-    -fx-background-image: url('image/eye.png');
-    -fx-background-position: 100% 50%;
-    -fx-background-repeat: no-repeat;
+  -fx-background-image: url('image/eye.png');
+  -fx-background-position: 100% 50%;
+  -fx-background-repeat: no-repeat;
 }
 
 .hide-show.toggle-button:selected {
-    -fx-background-image: url('image/eye-close.png');
+  -fx-background-image: url('image/eye-close.png');
 }
 
 .choice-box .label {
-    -fx-alignment: center-left;
-    /* -fx-font-family: 'Georgia'; */
-    -fx-font-size: 13px;
-    -fx-font-weight: bold;
-    /* -fx-background-color: #000000; */
-    /* -fx-mark-color: orange; */
+  -fx-alignment: center-left;
+  /* -fx-font-family: 'Georgia'; */
+  -fx-font-size: 13px;
+  -fx-font-weight: bold;
+  /* -fx-background-color: #000000; */
+  /* -fx-mark-color: orange; */
 }
 
 .list-view {
-    -fx-background-color: transparent, #fff, transparent, #fff;
-    -fx-background-insets: 0;
-    -fx-border-color: #d3d3d3;
+  -fx-background-color: transparent, #fff, transparent, #fff;
+  -fx-background-insets: 0;
+  -fx-border-color: #d3d3d3;
 }
 
 .list-view:focused {
-    -fx-background-color: transparent, #fff, transparent, #fff;
+  -fx-background-color: transparent, #fff, transparent, #fff;
 }
 
 .list-view .list-cell:selected {
-    -fx-font-weight: 700;
+  -fx-font-weight: 700;
+  -fx-background-color: -fx-secondary-color;
 }
 
 .jfx-list-view .scroll-bar:horizontal .track,
 .jfx-list-view .scroll-bar:vertical .track {
-    -fx-background-color: transparent;
-    -fx-background-radius: 0;
-    -fx-border-color: transparent;
-    -fx-border-radius: 2em;
+  -fx-background-color: transparent;
+  -fx-background-radius: 0;
+  -fx-border-color: transparent;
+  -fx-border-radius: 2em;
 }
 
 .jfx-list-view .scroll-bar:horizontal .increment-button,
 .jfx-list-view .scroll-bar:horizontal .decrement-button {
-    -fx-background-color: transparent;
-    -fx-background-radius: 0;
-    -fx-padding: 0 0 10;
+  -fx-background-color: transparent;
+  -fx-background-radius: 0;
+  -fx-padding: 0 0 10;
 }
 
 .jfx-list-view .scroll-bar:vertical .increment-button,
 .jfx-list-view .scroll-bar:vertical .decrement-button {
-    -fx-background-color: transparent;
-    -fx-background-radius: 0;
-    -fx-padding: 0 10 0 0;
+  -fx-background-color: transparent;
+  -fx-background-radius: 0;
+  -fx-padding: 0 10 0 0;
 }
 
 .jfx-list-view .scroll-bar .increment-arrow,
 .jfx-list-view .scroll-bar .decrement-arrow {
-    -fx-padding: 0;
-    -fx-shape: ' ';
+  -fx-padding: 0;
+  -fx-shape: ' ';
 }
 
 .jfx-list-view .scroll-bar:horizontal .thumb,
 .jfx-list-view .scroll-bar:vertical .thumb {
-    -fx-background-color: derive(#000, 90%);
-    -fx-background-insets: 2, 0, 0;
-    -fx-background-radius: 2em;
+  -fx-background-color: derive(#000, 90%);
+  -fx-background-insets: 2, 0, 0;
+  -fx-background-radius: 2em;
 }
 
 .text-area {
-    -fx-background-color: transparent, #fff, transparent, #fff;
-    -fx-background-insets: 0;
-    -fx-font-family: 'Consolas';
-    -fx-font-size: 13px;
-    -fx-font-weight: 800;
-    -fx-highlight-fill: #0f0;
-    -fx-highlight-text-fill: #000;
-    -fx-text-fill: #0f0;
+  -fx-background-color: transparent, #fff, transparent, #fff;
+  -fx-background-insets: 0;
+  -fx-font-family: 'Consolas';
+  -fx-font-size: 13px;
+  -fx-font-weight: 800;
+  -fx-highlight-fill: #0f0;
+  -fx-highlight-text-fill: #000;
+  -fx-text-fill: #0f0;
 }
 
 .text-area:focused {
-    -fx-background-color: transparent, #fff, transparent, #fff;
+  -fx-background-color: transparent, #fff, transparent, #fff;
 }
 
 .text-area .content {
-    -fx-background-color: #000;
+  -fx-background-color: #000;
 }
diff --git a/...rk/client/gui/i18n/language_en.properties → ...lient-gui/resource/language_en.properties b/...rk/client/gui/i18n/language_en.properties → ...lient-gui/resource/language_en.properties
@@ -6,7 +6,9 @@ tray.menu.language=Language
 tray.menu.servers=Servers
 console.tab0.text=Server Configuration
 console.tab1.text=Log
-console.button.add=Add...
+console.button.new=New
+console.button.import=Import...
+console.button.share=Share...
 console.button.del=Delete
 console.button.copy=Copy
 console.button.up=Up

diff --git a/...rk/client/gui/i18n/language_zh.properties → ...lient-gui/resource/language_zh.properties b/...rk/client/gui/i18n/language_zh.properties → ...lient-gui/resource/language_zh.properties
@@ -3,10 +3,12 @@ tray.tooltip=Urban Spork
 tray.exit=\u9000\u51FA
 tray.menu.console=\u63A7\u5236\u53F0
 tray.menu.language=\u8BED\u8A00
-tray.menu.servers=\u670d\u52a1\u5668
+tray.menu.servers=\u670D\u52A1\u5668
 console.tab0.text=\u914D\u7F6E\u670D\u52A1\u5668
 console.tab1.text=\u67E5\u770B\u65E5\u5FD7
-console.button.add=\u65B0\u589E
+console.button.new=\u65B0\u5EFA
+console.button.import=\u5BFC\u5165
+console.button.share=\u5206\u4EAB
 console.button.del=\u5220\u9664
 console.button.copy=\u590D\u5236
 console.button.up=\u4E0A\u79FB
@@ -17,7 +19,7 @@ console.label.host=\u5730\u5740
 console.label.port=\u7AEF\u53E3
 console.label.password=\u5BC6\u7801
 console.label.cipher=\u52A0\u5BC6
-console.label.protocol=\u534f\u8bae
+console.label.protocol=\u534F\u8BAE
 console.label.remark=\u5907\u6CE8
 console.label.proxy.port=\u4EE3\u7406\u7AEF\u53E3
 console.validator.required.field.message=\u5FC5\u8F93\u9879
diff --git a/urban-spork-client-gui/src/com/urbanspork/client/gui/Resource.java b/urban-spork-client-gui/src/com/urbanspork/client/gui/Resource.java
@@ -35,7 +35,7 @@ public class Resource {
         }
         String language = config.getLanguage();
         ResourceBundle bundle;
-        String baseName = "com.urbanspork.client.gui.i18n.language";
+        String baseName = "language";
         try {
             if (language == null) {
                 Locale locale = Locale.getDefault();