diff options
Diffstat (limited to 'xorg-server/hw/xwin/XWin.rc')
| -rw-r--r-- | xorg-server/hw/xwin/XWin.rc | 77 |
1 files changed, 61 insertions, 16 deletions
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index a142f3070..5429c139a 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -32,32 +32,66 @@ #include <windows.h> #include "winresource.h" #include "xwin-config.h" -#include "version-config.h" + +#define VER_FILEVERSION 1,16,1,0 +#define VER_FILEVERSION_STR "1.16.1.0" + +#define VER_PRODUCTVERSION 1,16,1,0 +#define VER_PRODUCTVERSION_STR "1.16.1.0" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileDescription", "VcXsrv windows xserver\0" + VALUE "FileVersion", VER_FILEVERSION_STR"\0" + VALUE "InternalName", "VcXsrv\0" + VALUE "LegalCopyright", "marha@users.sourceforge.net\0" + VALUE "OriginalFilename", "vcxsrv.exe\0" + VALUE "ProductName", "VcXsrv\0" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR"\0" + END + END + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + VALUE "Translation", 0x409, 1252 + END +END /* * Dialogs */ /* About */ -ABOUT_BOX DIALOGEX 32, 32, 260, 105 +ABOUT_BOX DIALOGEX 32, 32, 260, 95 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE -CAPTION "About " XVENDORNAMESHORT +CAPTION "About "XVENDORNAMESHORT FONT 8, "MS Shell Dlg 2" BEGIN - CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 - LTEXT XVENDORNAMESHORT " X Server ", IDC_STATIC, 36, 8, 220, 8 - LTEXT VENDOR_MAN_VERSION, IDC_STATIC, 36, 18, 220, 8 - LTEXT BUILDERSTRING, IDC_STATIC, 36, 28, 220, 8 - LTEXT "This software is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 48, 220, 20 - CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", - BS_OWNERDRAW | WS_TABSTOP, 36, 68, 220, 8 - DEFPUSHBUTTON "&OK", IDOK, 105, 85, 50, 15 + CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 + LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 + LTEXT "http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8 + LTEXT "marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8 + LTEXT "Version "VER_PRODUCTVERSION_STR" (12 Oct 2014)", IDC_STATIC, 36, 38, 220, 8 + DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END /* Depth change */ -DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 +DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" CAPTION XVENDORNAMESHORT @@ -65,16 +99,16 @@ BEGIN DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14 CTEXT XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8 CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8 - CTEXT "Restore previous resolution to use " XVENDORNAMESHORT ".", IDC_STATIC, 7, 52, 166, 8 + CTEXT "Restore previous resolution to use "XVENDORNAMESHORT".", IDC_STATIC, 7, 52, 166, 8 END /* Exit */ -EXIT_DIALOG DIALOGEX 32, 32, 180, 78 +EXIT_DIALOG DIALOGEX 32, 32, 180, 78 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE FONT 8, "MS Shell Dlg 2" -CAPTION "Exit " XVENDORNAMESHORT "?" +CAPTION "Exit "XVENDORNAMESHORT"?" BEGIN PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14 DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14 @@ -83,6 +117,17 @@ BEGIN CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8 END +/* Xdmcp host selection dialog */ +XDMCP_HOSTS DIALOGEX 32, 32, 260, 156 +STYLE DS_SETFONT | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_NOPARENTNOTIFY +CAPTION "Select host to connect to" +FONT 8, "MS Shell Dlg 2", 0, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Connect",IDOK,61,132,50,15 + LISTBOX IDC_HOSTLIST,7,7,245,113,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Cancel",IDCANCEL,147,134,50,14 +END /* * Menus @@ -105,4 +150,4 @@ END */ IDI_XWIN ICON "X.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "XWin.exe.manifest" +/* CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "XWin.exe.manifest"*/ |