From d9f0ed8ea1699998a565d5e68b4443c396049ed8 Mon Sep 17 00:00:00 2001
From: SpikeHD <spikegdofficial@gmail.com>
Date: Fri, 13 May 2022 22:01:14 -0700
Subject: [PATCH] add server icon

---
 lang/en.json                              |  4 +++-
 src/resources/icons/server.svg            | 13 +++++++++++++
 src/ui/components/ServerLaunchSection.tsx | 15 +++++++++++----
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 src/resources/icons/server.svg

diff --git a/lang/en.json b/lang/en.json
index 1a3d70f..78d6146 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -3,7 +3,9 @@
   "main": {
     "title": "Cultivation",
     "launch_button": "Launch",
-    "gc_enable": "Connect via Grasscutter"
+    "gc_enable": "Connect via Grasscutter",
+    "ip_placeholder": "Server Address...",
+    "port_placeholder": "Port..."
   },
   "options": {
     "game_exec": "Set Game Executable",
diff --git a/src/resources/icons/server.svg b/src/resources/icons/server.svg
new file mode 100644
index 0000000..7986164
--- /dev/null
+++ b/src/resources/icons/server.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
+<desc>Created with Fabric.js 1.7.22</desc>
+<defs>
+</defs>
+<g transform="translate(128 128) scale(0.72 0.72)" style="">
+	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
+	<path d="M 43.693 65.492 c 0.195 -1.665 0.618 -3.261 1.231 -4.76 H 4.574 C 2.048 60.732 0 62.78 0 65.306 v 16.314 c 0 2.526 2.048 4.575 4.574 4.575 h 35.242 c -2.61 -2.23 -4.273 -5.539 -4.273 -9.234 C 35.543 71.712 38.907 67.159 43.693 65.492 z M 15.137 79.034 c -3.076 0 -5.57 -2.494 -5.57 -5.57 c 0 -3.076 2.494 -5.57 5.57 -5.57 s 5.57 2.494 5.57 5.57 C 20.707 76.54 18.213 79.034 15.137 79.034 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
+	<path d="M 85.426 3.805 H 4.574 C 2.048 3.805 0 5.853 0 8.379 v 16.314 c 0 2.526 2.048 4.574 4.574 4.574 h 80.851 c 2.526 0 4.574 -2.048 4.574 -4.574 V 8.379 C 90 5.853 87.952 3.805 85.426 3.805 z M 15.137 22.107 c -3.076 0 -5.57 -2.494 -5.57 -5.57 s 2.494 -5.57 5.57 -5.57 s 5.57 2.494 5.57 5.57 S 18.213 22.107 15.137 22.107 z M 80.434 22.287 h -36.5 c -0.829 0 -1.5 -0.671 -1.5 -1.5 s 0.671 -1.5 1.5 -1.5 h 36.5 c 0.828 0 1.5 0.671 1.5 1.5 S 81.262 22.287 80.434 22.287 z M 80.434 13.787 h -36.5 c -0.829 0 -1.5 -0.671 -1.5 -1.5 s 0.671 -1.5 1.5 -1.5 h 36.5 c 0.828 0 1.5 0.671 1.5 1.5 S 81.262 13.787 80.434 13.787 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
+	<path d="M 85.426 32.268 H 4.574 C 2.048 32.268 0 34.316 0 36.843 v 16.314 c 0 2.526 2.048 4.574 4.574 4.574 h 41.908 c 3.264 -5.059 8.949 -8.416 15.405 -8.416 c 6.12 0 11.778 3.04 15.168 8.044 h 0.068 c 1.163 0 2.294 0.134 3.386 0.372 h 4.915 c 2.526 0 4.574 -2.048 4.574 -4.574 V 36.843 C 90 34.316 87.952 32.268 85.426 32.268 z M 15.137 50.57 c -3.076 0 -5.57 -2.494 -5.57 -5.57 c 0 -3.076 2.494 -5.57 5.57 -5.57 s 5.57 2.494 5.57 5.57 C 20.707 48.076 18.213 50.57 15.137 50.57 z M 80.434 42.25 h -36.5 c -0.829 0 -1.5 -0.671 -1.5 -1.5 s 0.671 -1.5 1.5 -1.5 h 36.5 c 0.828 0 1.5 0.671 1.5 1.5 S 81.262 42.25 80.434 42.25 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
+	<path d="M 77.124 60.36 h -1.753 c -2.59 -4.79 -7.656 -8.045 -13.484 -8.045 c -8.461 0 -15.319 6.859 -15.319 15.319 c 0 0.085 0.011 0.166 0.013 0.25 c -4.528 0.551 -8.037 4.4 -8.037 9.077 c 0 5.054 4.097 9.151 9.151 9.151 h 18.043 h 11.02 h 0.366 C 84.235 86.112 90 80.347 90 73.236 C 90 66.125 84.235 60.36 77.124 60.36 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx
index d665890..22f7bc1 100644
--- a/src/ui/components/ServerLaunchSection.tsx
+++ b/src/ui/components/ServerLaunchSection.tsx
@@ -19,6 +19,9 @@ interface IState {
   checkboxLabel: string;
   ip: string;
   port: string;
+
+  ipPlaceholder: string;
+  portPlaceholder: string;
 }
 
 export default class ServerLaunchSection extends React.Component<IProps, IState> {
@@ -30,7 +33,9 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
       buttonLabel: '',
       checkboxLabel: '',
       ip: '',
-      port: ''
+      port: '',
+      ipPlaceholder: '',
+      portPlaceholder: ''
     }
 
     this.toggleGrasscutter = this.toggleGrasscutter.bind(this)
@@ -43,7 +48,9 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
     this.setState({
       grasscutterEnabled: config.toggle_grasscutter,
       buttonLabel: await translate('main.launch_button'),
-      checkboxLabel: await translate('main.gc_enable')
+      checkboxLabel: await translate('main.gc_enable'),
+      ipPlaceholder: await translate('main.ip_placeholder'),
+      portPlaceholder: await translate('main.port_placeholder')
     })
   }
 
@@ -113,8 +120,8 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
         </div>
 
         <div className="ServerConfig">
-          <TextInput readOnly={this.state.grasscutterEnabled} id="ip" key="ip" placeholder="Server Address..." onChange={this.setIp} />,
-          <TextInput readOnly={this.state.grasscutterEnabled} id="port" key="port" placeholder="Port..." onChange={this.setPort}/> 
+          <TextInput readOnly={this.state.grasscutterEnabled} id="ip" key="ip" placeholder={this.state.ipPlaceholder} onChange={this.setIp} />,
+          <TextInput readOnly={this.state.grasscutterEnabled} id="port" key="port" placeholder={this.state.portPlaceholder} onChange={this.setPort}/> 
         </div>
 
         <div className="ServerLaunchButtons">