Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:45:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CPL][DESK] Add icons to 'Background' tab (#2281)

Browse source 
Add icons into "Background" tab of "Properties for Display" dialog.
CORE-16665
This commit is contained in:
Katayama Hirofumi MZ 2020-01-28 13:41:29 +09:00 • committed by GitHub
parent 7527483301
commit cc794e564a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

129
dll/cpl/desk/background.c
View file

@ -203,6 +203,8 @@ AddWallpapersFromDirectory(UINT uCounter, HWND hwndBackgroundList, BackgroundIte
return i; return i;
} }
himl = ListView_GetImageList(hwndBackgroundList, LVSIL_SMALL);
token = _tcstok(szFileTypes, separators); token = _tcstok(szFileTypes, separators);
while (token != NULL) while (token != NULL)
{ {
@ -227,19 +229,13 @@ AddWallpapersFromDirectory(UINT uCounter, HWND hwndBackgroundList, BackgroundIte
/* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */
if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcsicmp(wallpaperFilename, filename) != 0)) if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcsicmp(wallpaperFilename, filename) != 0))
{ {
himl = (HIMAGELIST)SHGetFileInfo(filename, SHGetFileInfo(filename,
0, 0,
&sfi, &sfi,
sizeof(sfi), sizeof(sfi),
SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_ICON | SHGFI_SMALLICON | SHGFI_DISPLAYNAME);
SHGFI_DISPLAYNAME); sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon);
if (himl == NULL) i++;
break;
if (i++ == 0)
{
(void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);
}
backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem = &pData->backgroundItems[pData->listViewItemCount];
@ -311,11 +307,20 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData)
BackgroundItem *backgroundItem = NULL; BackgroundItem *backgroundItem = NULL;
HWND hwndBackgroundList; HWND hwndBackgroundList;
HRESULT hr; HRESULT hr;
HICON hIcon;
INT cx, cy;
hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST);
GetClientRect(hwndBackgroundList, &clientRect); GetClientRect(hwndBackgroundList, &clientRect);
cx = GetSystemMetrics(SM_CXSMICON);
cy = GetSystemMetrics(SM_CYSMICON);
himl = ImageList_Create(cx, cy, ILC_COLOR32 | ILC_MASK, 0, 0);
hIcon = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_NONE), IMAGE_ICON, cx, cy, 0);
ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);
/* Add a new column to the list */ /* Add a new column to the list */
ZeroMemory(&dummy, sizeof(LV_COLUMN)); ZeroMemory(&dummy, sizeof(LV_COLUMN));
dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; dummy.mask = LVCF_SUBITEM | LVCF_WIDTH;
@ -335,9 +340,10 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData)
listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
listItem.state = 0; listItem.state = 0;
listItem.pszText = backgroundItem->szDisplayName; listItem.pszText = backgroundItem->szDisplayName;
listItem.iImage = -1; listItem.iImage = ImageList_AddIcon(himl, hIcon);
listItem.iItem = pData->listViewItemCount; listItem.iItem = pData->listViewItemCount;
listItem.lParam = pData->listViewItemCount; listItem.lParam = pData->listViewItemCount;
hIcon = NULL;
(void)ListView_InsertItem(hwndBackgroundList, &listItem); (void)ListView_InsertItem(hwndBackgroundList, &listItem);
ListView_SetItemState(hwndBackgroundList, ListView_SetItemState(hwndBackgroundList,
@ -385,55 +391,51 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData)
} }
} }
himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, SHGetFileInfoW(wallpaperFilename,
0, 0,
&sfi, &sfi,
sizeof(sfi), sizeof(sfi),
SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_ICON | SHGFI_SMALLICON |
SHGFI_DISPLAYNAME); SHGFI_DISPLAYNAME);
if (himl != NULL) sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon);
i++;
backgroundItem = &pData->backgroundItems[pData->listViewItemCount];
backgroundItem->bWallpaper = TRUE;
hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName);
if (FAILED(hr))
{ {
if (i++ == 0) RegCloseKey(regKey);
{ return;
(void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);
}
backgroundItem = &pData->backgroundItems[pData->listViewItemCount];
backgroundItem->bWallpaper = TRUE;
hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName);
if (FAILED(hr))
{
RegCloseKey(regKey);
return;
}
PathRemoveExtension(backgroundItem->szDisplayName);
hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename);
if (FAILED(hr))
{
RegCloseKey(regKey);
return;
}
ZeroMemory(&listItem, sizeof(LV_ITEM));
listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
listItem.state = 0;
listItem.pszText = backgroundItem->szDisplayName;
listItem.iImage = sfi.iIcon;
listItem.iItem = pData->listViewItemCount;
listItem.lParam = pData->listViewItemCount;
(void)ListView_InsertItem(hwndBackgroundList, &listItem);
ListView_SetItemState(hwndBackgroundList,
pData->listViewItemCount,
LVIS_SELECTED,
LVIS_SELECTED);
pData->listViewItemCount++;
} }
PathRemoveExtension(backgroundItem->szDisplayName);
hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename);
if (FAILED(hr))
{
RegCloseKey(regKey);
return;
}
ZeroMemory(&listItem, sizeof(LV_ITEM));
listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
listItem.state = 0;
listItem.pszText = backgroundItem->szDisplayName;
listItem.iImage = sfi.iIcon;
listItem.iItem = pData->listViewItemCount;
listItem.lParam = pData->listViewItemCount;
(void)ListView_InsertItem(hwndBackgroundList, &listItem);
ListView_SetItemState(hwndBackgroundList,
pData->listViewItemCount,
LVIS_SELECTED,
LVIS_SELECTED);
pData->listViewItemCount++;
} }
RegCloseKey(regKey); RegCloseKey(regKey);
@ -640,8 +642,10 @@ OnBrowseButton(HWND hwndDlg, PBACKGROUND_DATA pData)
size_t sizeRemain; size_t sizeRemain;
SIZE_T buffersize; SIZE_T buffersize;
BOOL success; BOOL success;
HIMAGELIST himl;
hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST);
himl = ListView_GetImageList(hwndBackgroundList, LVSIL_SMALL);
ZeroMemory(&ofn, sizeof(OPENFILENAME)); ZeroMemory(&ofn, sizeof(OPENFILENAME));
@ -715,7 +719,8 @@ OnBrowseButton(HWND hwndDlg, PBACKGROUND_DATA pData)
0, 0,
&sfi, &sfi,
sizeof(sfi), sizeof(sfi),
SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); SHGFI_ICON | SHGFI_SMALLICON | SHGFI_DISPLAYNAME);
sfi.iIcon = ImageList_AddIcon(himl, sfi.hIcon);
backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; backgroundItem = &pData->backgroundItems[pData->listViewItemCount];

1
dll/cpl/desk/desk.rc
View file

@ -14,6 +14,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON ICON "resources/applet.ico"
IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico"
IDI_NONE ICON "resources/none.ico"
IDC_MONITOR BITMAP "resources/monitor.bmp" IDC_MONITOR BITMAP "resources/monitor.bmp"

1
dll/cpl/desk/resource.h
View file

@ -3,6 +3,7 @@
/* ids */ /* ids */
#define IDC_DESK_ICON 40 #define IDC_DESK_ICON 40
#define IDC_DESK_ICON2 100 /* Needed for theme compatability with Windows. */ #define IDC_DESK_ICON2 100 /* Needed for theme compatability with Windows. */
#define IDI_NONE 101
#define IDC_STATIC -1 #define IDC_STATIC -1

BIN
dll/cpl/desk/resources/none.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB