Starting remote program works.

Added option to disable access control.

1 files changed, 23 insertions, 14 deletions

diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
index e432d724b..689576b2a 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -68,19 +68,25 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION STR_CAPTION_PROGRAM
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT           STR_CLIENT_PROGRAM_DESC,IDC_CLIENT_PROGRAM_DESC,7,14,64,10
-    COMBOBOX        IDC_CLIENT_PROGRAM,70,12,64,54,CBS_DROPDOWN | WS_VSCROLL
+    AUTORADIOBUTTON STR_CLIENT_LOCAL,IDC_CLIENT_LOCAL,7,14,300,10
+    AUTORADIOBUTTON STR_CLIENT_REMOTE,IDC_CLIENT_REMOTE,7,50,300,10
+
+    LTEXT           STR_CLIENT_PROGRAM_DESC,IDC_CLIENT_PROGRAM_DESC,19,28,64,10
+    COMBOBOX        IDC_CLIENT_PROGRAM,100,26,64,54,CBS_DROPDOWN | WS_VSCROLL
 
-    AUTORADIOBUTTON STR_CLIENT_LOCAL,IDC_CLIENT_LOCAL,7,28,300,10
-    AUTORADIOBUTTON STR_CLIENT_REMOTE,IDC_CLIENT_REMOTE,7,42,300,10
     
-    LTEXT           STR_CLIENT_PROTOCOL_DESC,IDC_CLIENT_PROTOCOL_DESC,19,56,70,10
-    COMBOBOX        IDC_CLIENT_PROTOCOL,100,54,64,54,CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT           STR_CLIENT_REMOTEPROGRAM_DESC,IDC_CLIENT_REMOTEPROGRAM_DESC,19,64,70,10
+    EDITTEXT        IDC_CLIENT_REMOTEPROGRAM,100,62,200,12
+
+    LTEXT           STR_CLIENT_PASSWORD_DESC,IDC_CLIENT_PASSWORD_DESC,19,78,70,10
+    EDITTEXT        IDC_CLIENT_PASSWORD,100,76,64,12
     
-    LTEXT           STR_CLIENT_HOST_DESC,IDC_CLIENT_HOST_DESC,19,70,70,10
-    LTEXT           STR_CLIENT_USER_DESC,IDC_CLIENT_USER_DESC,19,84,70,10
-    EDITTEXT        IDC_CLIENT_HOST,100,68,64,12
-    EDITTEXT        IDC_CLIENT_USER,100,82,64,12
+
+    LTEXT           STR_CLIENT_HOST_DESC,IDC_CLIENT_HOST_DESC,19,92,70,10
+    EDITTEXT        IDC_CLIENT_HOST,100,90,64,12
+    
+    LTEXT           STR_CLIENT_USER_DESC,IDC_CLIENT_USER_DESC,19,106,70,10
+    EDITTEXT        IDC_CLIENT_USER,100,104,64,12
 END
 
 IDD_XDMCP DIALOGEX 0, 0, 317, 143
@@ -106,11 +112,14 @@ BEGIN
     AUTOCHECKBOX    STR_CLIPBOARDPRIMARY,IDC_CLIPBOARDPRIMARY,19,30,300,10
     LTEXT           STR_CLIPBOARDPRIMARY_DESC,IDC_CLIPBOARDPRIMARY_DESC,31,40,280,27
 
-    AUTOCHECKBOX    STR_WGL,IDC_WGL,7,56,300,10
-    LTEXT           STR_WGL_DESC,IDC_WGL_DESC,19,66,280,27
+    AUTOCHECKBOX    STR_WGL,IDC_DISABLEAC,7,52,300,10
+    LTEXT           STR_WGL_DESC,IDC_WGL_DESC,19,62,280,27
+
+    AUTOCHECKBOX    STR_DISABLEAC,IDC_WGL,7,82,300,10
+    LTEXT           STR_DISABLEAC_DESC,IDC_DISABLEAC_DESC,19,92,280,27
 
-    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,95,280,10
-    EDITTEXT        IDC_EXTRA_PARAMS,7,105,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,105,280,10
+    EDITTEXT        IDC_EXTRA_PARAMS,7,115,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
 END
 
 IDD_FINISH DIALOGEX 0, 0, 317, 143