From cbb794f676771c50ee9506faa3208d6968d6de8f Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Fri, 1 Nov 2019 20:53:52 +0000
Subject: [PATCH] login info text

---
 .../voxygen/element/frames/banner_bottom.vox  | Bin 0 -> 62420 bytes
 voxygen/src/menu/main/ui.rs                   |  34 ++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 assets/voxygen/element/frames/banner_bottom.vox

diff --git a/assets/voxygen/element/frames/banner_bottom.vox b/assets/voxygen/element/frames/banner_bottom.vox
new file mode 100644
index 0000000000000000000000000000000000000000..eed0b7614fe4d428f08ed38411867e35581871d3
GIT binary patch
literal 62420
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
HfT8~d8>NSu

literal 0
HcmV?d00001

diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index 72ee215e5b..eed12ae3a6 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -60,6 +60,10 @@ widget_ids! {
         error_frame,
         button_ok,
         version,
+        // Info Window
+        info_frame,
+        info_text,
+        info_bottom
     }
 }
 
@@ -75,6 +79,7 @@ image_ids! {
         info_frame: "voxygen.element.frames.info_frame_2",
         banner: "voxygen.element.frames.banner",
         banner_top: "voxygen.element.frames.banner_top",
+        banner_bottom: "voxygen.element.frames.banner_bottom",
 
         <ImageGraphic>
         bg: "voxygen.background.bg_main",
@@ -186,6 +191,19 @@ impl MainMenuUi {
         );
         const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
         const TEXT_COLOR_2: Color = Color::Rgba(1.0, 1.0, 1.0, 0.2);
+        let intro_text: &'static str = "Information on the Login Process:\n\
+                                        \n\
+                                        Choose whatever Username and Password you want.\n\
+                                        (The middle box is for Password input)\n\
+                                        They will be saved until server restart.\n\
+                                        \n\
+                                        The name you put in will be your character name ingame.\n\
+                                        \n\
+                                        Starting Singleplayer needs some time to load.\n\
+                                        During this time the game may appear unresponsive.\n\
+                                        \n\
+                                        As of now you can't save your characters.\n\
+                                        Changing their appearance is possible though.";
 
         // Tooltip
         let _tooltip = Tooltip::new({
@@ -312,6 +330,22 @@ impl MainMenuUi {
                     });
                 };
             }
+            // Info Window
+            Rectangle::fill_with([550.0, 280.0], color::BLACK)
+                .top_left_with_margins_on(ui_widgets.window, 40.0, 40.0)
+                .color(Color::Rgba(0.0, 0.0, 0.0, 0.95))
+                .set(self.ids.info_frame, ui_widgets);
+            Image::new(self.imgs.banner_bottom)
+                .mid_bottom_with_margin_on(self.ids.info_frame, -50.0)
+                .w_h(550.0, 50.0)
+                .color(Some(Color::Rgba(0.0, 0.0, 0.0, 0.95)))
+                .set(self.ids.info_bottom, ui_widgets);
+            Text::new(intro_text)
+                .top_left_with_margins_on(self.ids.info_frame, 15.0, 15.0)
+                .font_size(20)
+                .font_id(self.fonts.cyri)
+                .color(TEXT_COLOR)
+                .set(self.ids.info_text, ui_widgets);
 
             // Singleplayer
             // Used when the singleplayer button is pressed