Module: wine Branch: stable Commit: 87ef82364ee6ef155a7fcae1e2b6f14911221882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ef82364ee6ef155a7fcae1e...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Aug 28 23:47:30 2018 -0600
shell32: Rename icon 48 from "rights" to "security".
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit e7a3ce70162606c9785641b8b524340cee677532) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{lock.ico => security.ico} | Bin dlls/shell32/resources/{lock.svg => security.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e5217ea..5a56fc2 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -77,7 +77,6 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ - resources/lock.svg \ resources/log_off.svg \ resources/menu.svg \ resources/mycomputer.svg \ @@ -91,6 +90,7 @@ SVG_SRCS = \ resources/recent.svg \ resources/rename.svg \ resources/search.svg \ + resources/security.svg \ resources/shortcut.svg \ resources/shut_down.svg \ resources/sleep.svg \ diff --git a/dlls/shell32/resources/lock.ico b/dlls/shell32/resources/security.ico similarity index 100% rename from dlls/shell32/resources/lock.ico rename to dlls/shell32/resources/security.ico diff --git a/dlls/shell32/resources/lock.svg b/dlls/shell32/resources/security.svg similarity index 100% rename from dlls/shell32/resources/lock.svg rename to dlls/shell32/resources/security.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 070754b..47aeb6a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -500,8 +500,8 @@ IDI_SHELL_SEARCH_FOLDER ICON resources/search.ico /* @makedep: resources/update.ico */ IDI_SHELL_UPDATE ICON resources/update.ico
-/* @makedep: resources/lock.ico */ -IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_SECURITY ICON resources/security.ico
/* @makedep: resources/shut_down.ico */ IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 735f70e..b654b48 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -212,7 +212,7 @@ #define IDI_SHELL_LOG_OFF 45 #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 -#define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_SECURITY 48 #define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_BLANK1 50 #define IDI_SHELL_BLANK2 51