Update branding

7 files changed, 21 insertions, 31 deletions

diff --git a/xrdp/ad24b.bmp b/xrdp/ad24b.bmp
index 47589979..6184a3de 100644
--- a/xrdp/ad24b.bmp
+++ b/xrdp/ad24b.bmp
diff --git a/xrdp/ad256.bmp b/xrdp/ad256.bmp
index 5e1946c0..b789fe48 100644
--- a/xrdp/ad256.bmp
+++ b/xrdp/ad256.bmp
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 9cca9581..01766b47 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -30,12 +30,6 @@ tcp_keepalive=yes
 #tcp_send_buffer_bytes=32768
 #tcp_recv_buffer_bytes=32768
 
-#
-# colors used by windows in RGB format
-#
-
-blue=009cb5
-grey=dedede
 #black=000000
 #dark_grey=808080
 #blue=08246b
@@ -43,8 +37,8 @@ grey=dedede
 #white=ffffff
 #red=ff0000
 #green=00ff00
-#background=626c72
-#autorun=xrdp1
+background=618dcc
+#autorun=xrdp7
 #hidelogwindow=yes
 
 # when true, userid/password *must* be passed on cmd line
@@ -66,15 +60,12 @@ use_fastpath=both
 # configure login screen
 #
 
-# Login Screen Window Title
-#ls_title=My Login Title
-
-# top level window background color in RGB format
-ls_top_window_bg_color=009cb5
+# top level window background color in BGR format (not RGB)
+ls_top_window_bg_color=000000
 
 # width and height of login screen
-ls_width=350
-ls_height=430
+ls_width=500
+ls_height=180
 
 # login screen background color in RGB format
 ls_bg_color=dedede
@@ -85,31 +76,31 @@ ls_bg_color=dedede
 # logo
 # full path to bmp-file or file in shared folder
 ls_logo_filename=
-ls_logo_x_pos=55
-ls_logo_y_pos=50
+ls_logo_x_pos=10
+ls_logo_y_pos=30
 
 # for positioning labels such as username, password etc
-ls_label_x_pos=30
+ls_label_x_pos=165
 ls_label_width=60
 
 # for positioning text and combo boxes next to above labels
-ls_input_x_pos=110
+ls_input_x_pos=270
 ls_input_width=210
 
 # y pos for first label and combo box
-ls_input_y_pos=220
+ls_input_y_pos=35
 
 # OK button
-ls_btn_ok_x_pos=142
-ls_btn_ok_y_pos=370
-ls_btn_ok_width=85
-ls_btn_ok_height=30
+ls_btn_ok_x_pos=300
+ls_btn_ok_y_pos=142
+ls_btn_ok_width=60
+ls_btn_ok_height=23
 
 # Cancel button
-ls_btn_cancel_x_pos=237
-ls_btn_cancel_y_pos=370
-ls_btn_cancel_width=85
-ls_btn_cancel_height=30
+ls_btn_cancel_x_pos=370
+ls_btn_cancel_y_pos=142
+ls_btn_cancel_width=60
+ls_btn_cancel_height=23
 
 [Logging]
 LogFile=xrdp.log
diff --git a/xrdp/xrdp24b.bmp b/xrdp/xrdp24b.bmp
index 14d83cb4..e5f42a33 100644
--- a/xrdp/xrdp24b.bmp
+++ b/xrdp/xrdp24b.bmp
diff --git a/xrdp/xrdp256.bmp b/xrdp/xrdp256.bmp
index 6191514e..e11e0b5e 100644
--- a/xrdp/xrdp256.bmp
+++ b/xrdp/xrdp256.bmp
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index c9fca912..6047ff55 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -682,11 +682,10 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
 
     self->login_window->notify = xrdp_wm_login_notify;
 
-    /* if window title not specified, use hostname as default */
+    /* if window title not specified, use Login as default */
     if (globals->ls_title[0] == 0)
     {
-       g_gethostname(buf1, 256);
-       g_sprintf(buf, "Login to %s", buf1);
+       g_sprintf(buf, "Login");
        set_string(&self->login_window->caption1, buf);
     }
     else
diff --git a/xrdp/xrdp_logo.bmp b/xrdp/xrdp_logo.bmp
index 58ce50ff..6184a3de 100644
--- a/xrdp/xrdp_logo.bmp
+++ b/xrdp/xrdp_logo.bmp