[SHELL32]

- Change "open with" dialog type to allow aborting, add code to handle WM_DESTROY messages
- Change full blue selection color to standard background blue, set selection background non white correctly
- Adjust German resource fields to make texts fit
See issue #4226 for more details.

svn path=/trunk/; revision=46766
This commit is contained in:
Gregor Schneider 2010-04-07 19:11:56 +00:00
parent b800febcd7
commit 2d3b57377f
30 changed files with 39 additions and 35 deletions

View file

@ -357,7 +357,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Îòâàðÿíå ñ" CAPTION "Îòâàðÿíå ñ"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -360,7 +360,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Otevøít v..." CAPTION "Otevøít v..."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -347,7 +347,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -361,17 +361,17 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Öffnen mit" CAPTION "Öffnen mit"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20
LTEXT "Wählen Sie das Programm, das zum Öffnen dieser Datei verwendet werden soll:", -1, 44, 12, 211, 10 LTEXT "Wählen Sie das Programm, das zum Öffnen dieser Datei verwendet werden soll:", -1, 44, 12, 211, 18
LTEXT "Datei: ", 14001, 44, 25, 188, 10 LTEXT "Datei: ", 14001, 44, 30, 188, 10
GROUPBOX "&Programme", -1, 7, 42, 249, 187 GROUPBOX "&Programme", -1, 7, 42, 249, 187
LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE
AUTOCHECKBOX "&Dateityp &immer mit dem ausgewählten Programm öffnen", 14003, 20, 193, 225, 10 AUTOCHECKBOX "&Dateityp &immer mit dem ausgewählten Programm öffnen", 14003, 20, 193, 225, 10
PUSHBUTTON "&Durchsuchen..", 14004, 198, 207, 50, 14 PUSHBUTTON "&Durchsuchen...", 14004, 188, 207, 60, 14
PUSHBUTTON "OK", 14005, 150, 236, 50, 14 PUSHBUTTON "OK", 14005, 150, 236, 50, 14
PUSHBUTTON "Abbrechen", 14006, 206, 236, 50, 14 PUSHBUTTON "Abbrechen", 14006, 206, 236, 50, 14
END END

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "¢íïéãìá ìå" CAPTION "¢íïéãìá ìå"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -361,7 +361,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 284, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 284, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Abrir con" CAPTION "Abrir con"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -362,7 +362,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Ouvrir avec" CAPTION "Ouvrir avec"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -361,7 +361,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -359,7 +359,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Apri con" CAPTION "Apri con"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "開くプログラム" CAPTION "開くプログラム"
FONT 9, "MS UI Gothic", 0, 0, 0x0 FONT 9, "MS UI Gothic", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -359,7 +359,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Åpne med" CAPTION "Åpne med"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -365,7 +365,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Otwórz za pomoc¹" CAPTION "Otwórz za pomoc¹"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -360,7 +360,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -361,7 +361,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Abre com..." CAPTION "Abre com..."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -361,7 +361,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Âûáîð ïðîãðàììû" CAPTION "Âûáîð ïðîãðàììû"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -364,7 +364,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Otvori<72> v programe" CAPTION "Otvori<72> v programe"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -358,7 +358,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -359,7 +359,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Âèá³ð ïðîãðàìè" CAPTION "Âèá³ð ïðîãðàìè"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -347,7 +347,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -359,7 +359,7 @@ BEGIN
END END
OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256
STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION
CAPTION "Open With" CAPTION "Open With"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN

View file

@ -719,12 +719,12 @@ static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wPar
if (lpdis->itemID == index) if (lpdis->itemID == index)
{ {
/* paint focused item with blue background */ /* paint focused item with standard background colour */
HBRUSH hBrush; HBRUSH hBrush;
hBrush = CreateSolidBrush(RGB(0, 0, 255)); hBrush = CreateSolidBrush(RGB(46, 104, 160));
FillRect(lpdis->hDC, &lpdis->rcItem, hBrush); FillRect(lpdis->hDC, &lpdis->rcItem, hBrush);
DeleteObject(hBrush); DeleteObject(hBrush);
preBkColor = SetBkColor(lpdis->hDC, RGB(255, 255, 255)); preBkColor = SetBkColor(lpdis->hDC, RGB(46, 104, 160));
} }
else else
{ {
@ -756,6 +756,10 @@ static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wPar
break; break;
} }
break; break;
case WM_DESTROY:
FreeListItems(hwndDlg);
EndDialog(hwndDlg, 0);
return TRUE;
default: default:
break; break;
} }