NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit0ee85f8

Hiroshi Inoue

committed

Change dialog windows.

1 parent9abd055 commit0ee85f8Copy full SHA for 0ee85f8

File tree

2 files changed

+19

-20

lines changed

src/interfaces/odbc
- dlg_specific.c
- psqlodbc.rc

2 files changed

+19

-20

lines changed

`‎src/interfaces/odbc/dlg_specific.c`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,26 +243,25 @@ driver_optionsProc(HWND hdlg,`
`243`	`243`	`caseWM_INITDIALOG:`
`244`	`244`	`SetWindowLong(hdlg,DWL_USER,lParam);/* save for OK etc */`
`245`	`245`	`ci= (ConnInfo*)lParam;`
	`246`	`+CheckDlgButton(hdlg,DRV_OR_DSN,0);`
`246`	`247`	`if (ci&&ci->dsn&&ci->dsn[0])`
`247`	`248`	`{`
`248`		`-SetWindowText(hdlg,"Advanced Options (Common)");`
`249`		`-driver_optionsDraw(hdlg,NULL,0, TRUE);`
	`249`	`+SetWindowText(hdlg,"Advanced Options (per DSN)");`
`250`	`250`	`}`
`251`	`251`	`else`
`252`	`252`	`{`
`253`		`-CheckDlgButton(hdlg,DRV_OR_DSN,1);`
`254`	`253`	`SetWindowText(hdlg,"Advanced Options (Connection)");`
`255`	`254`	`ShowWindow(GetDlgItem(hdlg,DRV_OR_DSN),SW_HIDE);`
`256`		`-driver_optionsDraw(hdlg,ci,1, FALSE);`
`257`	`255`	`}`
	`256`	`+driver_optionsDraw(hdlg,ci,1, FALSE);`
`258`	`257`	`break;`
`259`	`258`
`260`	`259`	`caseWM_COMMAND:`
`261`	`260`	`switch (GET_WM_COMMAND_ID(wParam,lParam))`
`262`	`261`	`{`
`263`	`262`	`caseIDOK:`
`264`	`263`	`ci= (ConnInfo*)GetWindowLong(hdlg,DWL_USER);`
`265`		`-driver_options_update(hdlg,IsDlgButtonChecked(hdlg,DRV_OR_DSN) ?ci :NULL,`
	`264`	`+driver_options_update(hdlg,IsDlgButtonChecked(hdlg,DRV_OR_DSN) ?NULL :ci,`
`266`	`265`	`ci&&ci->dsn&&ci->dsn[0]);`
`267`	`266`
`268`	`267`	`caseIDCANCEL:`
`@@ -271,12 +270,12 @@ driver_optionsProc(HWND hdlg,`
`271`	`270`
`272`	`271`	`caseIDDEFAULTS:`
`273`	`272`	`if (IsDlgButtonChecked(hdlg,DRV_OR_DSN))`
	`273`	`+driver_optionsDraw(hdlg,NULL,2, TRUE);`
	`274`	`+else`
`274`	`275`	`{`
`275`	`276`	`ConnInfoci= (ConnInfo)GetWindowLong(hdlg,DWL_USER);`
`276`	`277`	`driver_optionsDraw(hdlg,ci,0, FALSE);`
`277`	`278`	`}`
`278`		`-else`
`279`		`-driver_optionsDraw(hdlg,NULL,2, TRUE);`
`280`	`279`	`break;`
`281`	`280`
`282`	`281`	`caseDRV_OR_DSN:`
`@@ -285,14 +284,14 @@ driver_optionsProc(HWND hdlg,`
`285`	`284`	`mylog("DRV_OR_DSN clicked\n");`
`286`	`285`	`if (IsDlgButtonChecked(hdlg,DRV_OR_DSN))`
`287`	`286`	`{`
`288`		`-ConnInfoci= (ConnInfo)GetWindowLong(hdlg,DWL_USER);`
`289`		`-SetWindowText(hdlg,"Advanced Options (per DSN)");`
`290`		`-driver_optionsDraw(hdlg,ci,ci ?1 :0,ci==NULL);`
	`287`	`+SetWindowText(hdlg,"Advanced Options (Common)");`
	`288`	`+driver_optionsDraw(hdlg,NULL,0, TRUE);`
`291`	`289`	`}`
`292`	`290`	`else`
`293`	`291`	`{`
`294`		`-SetWindowText(hdlg,"Advanced Options (Common)");`
`295`		`-driver_optionsDraw(hdlg,NULL,0, TRUE);`
	`292`	`+ConnInfoci= (ConnInfo)GetWindowLong(hdlg,DWL_USER);`
	`293`	`+SetWindowText(hdlg,"Advanced Options (per DSN)");`
	`294`	`+driver_optionsDraw(hdlg,ci,ci ?1 :0,ci==NULL);`
`296`	`295`	`}`
`297`	`296`	`}`
`298`	`297`	`break;`

`‎src/interfaces/odbc/psqlodbc.rc`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,10 @@ BEGIN`
`132`	`132`	`EDITTEXT DRV_CONNSETTINGS,61,165,225,25,ES_MULTILINE \|`
`133`	`133`	`ES_AUTOVSCROLL \| ES_AUTOHSCROLL \| ES_WANTRETURN`
`134`	`134`	`DEFPUSHBUTTON "OK",IDOK,59,201,50,14,WS_GROUP`
`135`		`- PUSHBUTTON "Cancel",IDCANCEL,129,201,50,14`
`136`		`- PUSHBUTTON "Defaults",IDDEFAULTS,199,201,50,15`
`137`		`- CONTROL "DSN",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX \| BS_LEFTTEXT \|`
`138`		`- BS_NOTIFY \| WS_TABSTOP,243,208,30,10`
	`135`	`+ PUSHBUTTON "Cancel",IDCANCEL,124,201,50,14`
	`136`	`+ PUSHBUTTON "Defaults",IDDEFAULTS,189,201,50,15`
	`137`	`+ CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX \| BS_LEFTTEXT \|`
	`138`	`+ BS_NOTIFY \| WS_TABSTOP,233,208,40,10`
`139`	`139`	`END`
`140`	`140`
`141`	`141`	`DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 161`
`@@ -249,10 +249,10 @@ BEGIN`
`249`	`249`	`EDITTEXT DRV_CONNSETTINGS,50,185,225,25,ES_MULTILINE \|`
`250`	`250`	`ES_AUTOVSCROLL \| ES_AUTOHSCROLL \| ES_WANTRETURN`
`251`	`251`	`DEFPUSHBUTTON "OK",IDOK,45,220,50,14,WS_GROUP`
`252`		`- PUSHBUTTON "Cancel",IDCANCEL,115,220,50,14`
`253`		`- PUSHBUTTON "Defaults",IDDEFAULTS,185,220,50,15`
`254`		`- CONTROL "DSN",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX \| BS_LEFTTEXT \|`
`255`		`- BS_NOTIFY \| WS_TABSTOP,243,224,30,10`
	`252`	`+ PUSHBUTTON "Cancel",IDCANCEL,110,220,50,14`
	`253`	`+ PUSHBUTTON "Defaults",IDDEFAULTS,175,220,50,15`
	`254`	`+ CONTROL "Common",DRV_OR_DSN,"Button",BS_AUTOCHECKBOX \| BS_LEFTTEXT \|`
	`255`	`+ BS_NOTIFY \| WS_TABSTOP,233,224,40,10`
`256`	`256`	`END`
`257`	`257`
`258`	`258`	`DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 161`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0ee85f8

File tree

2 files changed

2 files changed

`‎src/interfaces/odbc/dlg_specific.c`

`‎src/interfaces/odbc/psqlodbc.rc`

0 commit comments