Merge pull request #2366 from TOMATO-ONE/new_loginscreen

Redesign the login screen

6 files changed, 30 insertions, 15 deletions

diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index dd2d7fa8..b7d71c88 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -98,6 +98,8 @@ dist_xrdppkgdata_DATA = \
   xrdp24b.bmp \
   xrdp256.bmp \
   xrdp_logo.bmp \
+  xrdp_logo.png \
+  README.logo \
   sans-10.fv1 \
   sans-18.fv1 \
   cursor0.cur \
diff --git a/xrdp/README.logo b/xrdp/README.logo
new file mode 100644
index 00000000..1477fab2
--- /dev/null
+++ b/xrdp/README.logo
@@ -0,0 +1,6 @@
+About xrdp_logo.png / xrdp_logo.bmp
+
+These new xrdp logo files were created by processing vector image files by @metalefty.
+
+The base images can be found at
+https://github.com/metalefty/xrdp-logo
diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
index 48329f91..70d62cde 100644
--- a/xrdp/xrdp.ini.in
+++ b/xrdp/xrdp.ini.in
@@ -95,12 +95,11 @@ use_fastpath=both
 ;
 ; colors used by windows in RGB format
 ;
-blue=009cb5
-grey=dedede
 #black=000000
-#dark_grey=808080
-#blue=08246b
-#dark_blue=08246b
+grey=e1e1e1
+dark_grey=b4b4b4
+blue=0078d7
+dark_blue=0078d7
 #white=ffffff
 #red=ff0000
 #green=00ff00
@@ -125,7 +124,7 @@ grey=dedede
 #ls_title=My Login Title
 
 ; top level window background color in RGB format
-ls_top_window_bg_color=009cb5
+ls_top_window_bg_color=003057
 
 ; width and height of login screen
 ;
@@ -139,10 +138,10 @@ ls_top_window_bg_color=009cb5
 ; below
 ;
 ls_width=350
-ls_height=430
+ls_height=360
 
 ; login screen background color in RGB format
-ls_bg_color=dedede
+ls_bg_color=f0f0f0
 
 ; optional background image filename. BMP format is always supported,
 ; but other formats will be supported if xrdp is build with imlib2
@@ -163,10 +162,10 @@ ls_bg_color=dedede
 ; logo height are ignored for a transform of 'none'.
 ls_logo_filename=
 ls_logo_transform=scale
-ls_logo_width=240
-ls_logo_height=140
+ls_logo_width=250
+ls_logo_height=110
 ls_logo_x_pos=55
-ls_logo_y_pos=50
+ls_logo_y_pos=35
 
 ; for positioning labels such as username, password etc
 ls_label_x_pos=30
@@ -177,17 +176,17 @@ ls_input_x_pos=110
 ls_input_width=210
 
 ; y pos for first label and combo box
-ls_input_y_pos=220
+ls_input_y_pos=158
 
 ; OK button
 ls_btn_ok_x_pos=142
-ls_btn_ok_y_pos=370
+ls_btn_ok_y_pos=308
 ls_btn_ok_width=85
 ls_btn_ok_height=30
 
 ; Cancel button
 ls_btn_cancel_x_pos=237
-ls_btn_cancel_y_pos=370
+ls_btn_cancel_y_pos=308
 ls_btn_cancel_width=85
 ls_btn_cancel_height=30
 
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index 5afd730c..17b15422 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -910,7 +910,13 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
         /* if logo image not specified, use default */
         if (globals->ls_logo_filename[0] == 0)
         {
-            g_snprintf(globals->ls_logo_filename, 255, "%s/xrdp_logo.bmp", XRDP_SHARE_PATH);
+#ifdef USE_IMLIB2
+            g_snprintf(globals->ls_logo_filename, 255, "%s/xrdp_logo.png",
+                       XRDP_SHARE_PATH);
+#else
+            g_snprintf(globals->ls_logo_filename, 255, "%s/xrdp_logo.bmp",
+                       XRDP_SHARE_PATH);
+#endif
         }
 
         /* logo image */
@@ -921,6 +927,8 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
             g_snprintf(globals->ls_logo_filename, 255, "%s/ad256.bmp", XRDP_SHARE_PATH);
         }
 
+        LOG(LOG_LEVEL_DEBUG, "ls_logo_filename: %s", globals->ls_logo_filename);
+
         xrdp_bitmap_load(but, globals->ls_logo_filename, self->palette,
                          globals->ls_bg_color,
                          globals->ls_logo_transform,
diff --git a/xrdp/xrdp_logo.bmp b/xrdp/xrdp_logo.bmp
index 58ce50ff..f8bbd8b0 100644
--- a/xrdp/xrdp_logo.bmp
+++ b/xrdp/xrdp_logo.bmp
diff --git a/xrdp/xrdp_logo.png b/xrdp/xrdp_logo.png
new file mode 100644
index 00000000..82d7df17
--- /dev/null
+++ b/xrdp/xrdp_logo.png