Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plClient.rc compatibility with newer versions of MSVC #641

Merged
merged 1 commit into from
Mar 12, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 23 additions & 31 deletions Sources/Plasma/Apps/plClient/res/plClient.rc
Original file line number Diff line number Diff line change
Expand Up @@ -89,31 +89,25 @@ BEGIN
END

IDD_URULOGIN_MAIN DIALOGEX 0, 0, 302, 246
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS |
DS_CENTER | WS_POPUP
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Login",IDOK,87,225,50,14
PUSHBUTTON "Quit",IDCANCEL,163,225,50,14
CONTROL 151,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE |
WS_BORDER,7,7,289,36
CONTROL 151,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | WS_BORDER,7,7,289,36
LTEXT "Account name:",IDC_STATIC,69,119,49,10
LTEXT "Password:",IDC_STATIC,69,135,49,10
EDITTEXT IDC_URULOGIN_USERNAME,123,119,108,12,ES_AUTOHSCROLL
EDITTEXT IDC_URULOGIN_PASSWORD,123,135,108,12,ES_PASSWORD |
ES_AUTOHSCROLL
EDITTEXT IDC_URULOGIN_PASSWORD,123,135,108,12,ES_PASSWORD | ES_AUTOHSCROLL
GROUPBOX "",IDC_STATIC,14,99,274,112
LTEXT "Language:",IDC_STATIC,69,151,49,10
COMBOBOX IDC_LANGUAGE,123,151,108,100,CBS_DROPDOWNLIST | WS_TABSTOP
CONTROL "Remember Password:",IDC_URULOGIN_REMEMBERPASS,"Button",
BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,69,167,100,10
CONTROL "Remember Password:",IDC_URULOGIN_REMEMBERPASS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,69,167,100,10
GROUPBOX "",IDC_STATIC,14,54,274,43
LTEXT "Welcome to URU",IDC_STATUS_TEXT,17,62,267,20
RTEXT "Product String",IDC_PRODUCTSTRING,88,86,194,8
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,49,
288,168
PUSHBUTTON "Need an account?",IDC_URULOGIN_NEWACCTLINK,95,183,110,
14,BS_FLAT
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,49,288,168
PUSHBUTTON "Need an account?",IDC_URULOGIN_NEWACCTLINK,95,183,110,14,BS_FLAT
END

IDD_URULOGIN_EULA DIALOGEX 0, 0, 300, 318
Expand Down Expand Up @@ -159,45 +153,43 @@ GUIDELINES DESIGNINFO
BEGIN
IDD_LOADING, DIALOG
BEGIN
, 4096
, 458752
RIGHTMARGIN, 159
END

IDD_EXCEPTION, DIALOG
BEGIN
RIGHTMARGIN, 296
LEFTMARGIN, 7
RIGHTMARGIN, 290
TOPMARGIN, 7
BOTTOMMARGIN, 26
END

IDD_URULOGIN_MAIN, DIALOG
BEGIN
, 71, 295
, 1029, 7
, 1031, 223
, 4096
, 458752, 1348403200
LEFTMARGIN, 7
RIGHTMARGIN, 295
TOPMARGIN, 7
BOTTOMMARGIN, 239
END

IDD_URULOGIN_EULA, DIALOG
BEGIN
, 71, 293
, 1029, 7
, 1031, 311
, 4096
, 11468800, 1430585344
LEFTMARGIN, 7
RIGHTMARGIN, 293
TOPMARGIN, 7
BOTTOMMARGIN, 311
END

IDD_AUTHFAILED, DIALOG
BEGIN
, 1031, 87
, 4096
, 11468800, 1348206592
RIGHTMARGIN, 175
BOTTOMMARGIN, 87
END

IDD_AUTHENTICATING, DIALOG
BEGIN
, 1031, 57
, 4096
, 4653129, 131144
RIGHTMARGIN, 175
BOTTOMMARGIN, 57
END
END
#endif // APSTUDIO_INVOKED
Expand Down