Skip to content

Commit 1195e78

Browse files
authored
Merge pull request #52 from karpitony/feat/add-server-finder-feature
๋งค์นญ๋œ ์„œ๋ฒ„ ์œ„์น˜ ํ‘œ์‹œํ•˜๋Š” UI ์ถ”๊ฐ€ (v2.3.2)
2 parents f4db108 + 3d28af9 commit 1195e78

9 files changed

Lines changed: 692 additions & 6 deletions

File tree

โ€ŽREADME.mdโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ PR๊ณผ Issue ๊ธฐ์—ฌ๋ฅผ ํ™˜์˜ํ•ฉ๋‹ˆ๋‹ค!
161161

162162
- [Tarkov-Market](https://tarkov-market.com/) โ€” ๋งต ๋ฐ์ดํ„ฐ ๋ฐ UI
163163
- [Tarkov-Client](https://github.com/byeong1/Tarkov-Client) by byeong1 โ€” ๋ฐฉํ–ฅ ํ‘œ์‹œ๊ธฐ ์ฝ”๋“œ (MIT License)
164-
- [Freepik - Flaticon](https://www.flaticon.com/free-icons/map) โ€” ๋งต ์•„์ด์ฝ˜
164+
- [Freepik - Flaticon](https://www.flaticon.com/free-icons/map) โ€” ๋งต ์•„์ด์ฝ˜, [์„œ๋ฒ„ ์•„์ด์ฝ˜](https://www.flaticon.com/free-icon/server_4227991?term=server&page=1&position=8&origin=search&related_id=4227991)
165165
- [Microsoft WebView2](https://developer.microsoft.com/en-us/microsoft-edge/webview2/) โ€” ๋ธŒ๋ผ์šฐ์ € ์ปดํฌ๋„ŒํŠธ
166166

167167
## ๋ผ์ด์„ ์Šค

โ€Žeft-where-am-i/Form1.Designer.csโ€Ž

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

โ€Žeft-where-am-i/Form1.csโ€Ž

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public partial class Form1 : Form
1515
// UserControl์„ ์บ์‹ฑํ•ด์„œ ์ƒํƒœ ์œ ์ง€
1616
private WhereAmI whereAmIControl;
1717
private SettingPage settingPageControl;
18+
private ServerLocation serverLocationControl;
1819

1920
public Form1()
2021
{
@@ -31,20 +32,24 @@ public Form1()
3132

3233
private void InitializeScreens()
3334
{
34-
// ํ™”๋ฉด 2๊ฐœ ์ƒ์„ฑ (๋”ฑ 1๋ฒˆ๋งŒ)
35+
// ํ™”๋ฉด 3๊ฐœ ์ƒ์„ฑ (๋”ฑ 1๋ฒˆ๋งŒ)
3536
whereAmIControl = new WhereAmI();
3637
settingPageControl = new SettingPage();
38+
serverLocationControl = new ServerLocation();
3739

3840
// Panel์— ๋ฏธ๋ฆฌ ์ถ”๊ฐ€
3941
panel1.Controls.Add(whereAmIControl);
4042
panel1.Controls.Add(settingPageControl);
43+
panel1.Controls.Add(serverLocationControl);
4144

4245
whereAmIControl.Dock = DockStyle.Fill;
4346
settingPageControl.Dock = DockStyle.Fill;
47+
serverLocationControl.Dock = DockStyle.Fill;
4448

4549
// ์‹œ์ž‘ ํ™”๋ฉด ์„ค์ •
4650
whereAmIControl.Visible = true;
4751
settingPageControl.Visible = false;
52+
serverLocationControl.Visible = false;
4853
}
4954

5055
const int MAX_SLIDING_WIDTH = 200;
@@ -58,6 +63,8 @@ private void checkBoxHide_CheckedChanged(object sender, EventArgs e)
5863
{
5964
btnSetting.Text = "Setting Page";
6065
btnSetting.Image = null;
66+
btnServerLocation.Text = "Server Location";
67+
btnServerLocation.Image = null;
6168
btnWhereAmI.Text = "Where Am I";
6269
btnWhereAmI.Image = null;
6370
checkBoxHide.Text = "<";
@@ -66,6 +73,8 @@ private void checkBoxHide_CheckedChanged(object sender, EventArgs e)
6673
{
6774
btnSetting.Text = "";
6875
btnSetting.Image = Image.FromFile(@"assets\images\settings_icon2_resize.png");
76+
btnServerLocation.Text = "";
77+
btnServerLocation.Image = Image.FromFile(@"assets\images\server.png");
6978
btnWhereAmI.Text = "";
7079
btnWhereAmI.Image = Image.FromFile(@"assets\images\eft-where-am-i_icon_resize.png");
7180
checkBoxHide.Text = ">";
@@ -160,11 +169,21 @@ private void btnWhereAmI_Click(object sender, EventArgs e)
160169
}
161170
}
162171

172+
private void btnServerLocation_Click(object sender, EventArgs e)
173+
{
174+
if (currentScreen != "ServerLocation")
175+
{
176+
SwitchUserControl(serverLocationControl);
177+
currentScreen = "ServerLocation";
178+
}
179+
}
180+
163181
private void SwitchUserControl(UserControl control)
164182
{
165183
// ๋ชจ๋“  ํ™”๋ฉด ์ˆจ๊ธฐ๊ธฐ
166184
whereAmIControl.Visible = false;
167185
settingPageControl.Visible = false;
186+
serverLocationControl.Visible = false;
168187

169188
// ์ƒˆ ํ™”๋ฉด๋งŒ ๋ณด์ด๊ธฐ
170189
control.Visible = true;

โ€Žeft-where-am-i/UserControls/ServerLocation.Designer.csโ€Ž

Lines changed: 256 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
ย (0)