https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5318432454fdd8c75f48e...
commit a5318432454fdd8c75f48eb1065a51c54ddd9aa9 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Sun Jan 28 23:05:43 2018 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Tue Nov 6 00:09:15 2018 +0100
[REACTOS] Add two icons (drive and partition) for the drive list. --- base/setup/reactos/reactos.rc | 12 +++++++----- base/setup/reactos/res/README.txt | 24 ++++++++++++++++++++++++ base/setup/reactos/res/drive_disk.ico | Bin 0 -> 15086 bytes base/setup/reactos/res/partition.ico | Bin 0 -> 5430 bytes base/setup/reactos/resource.h | 2 ++ 5 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/base/setup/reactos/reactos.rc b/base/setup/reactos/reactos.rc index 2b794d83a6..b1fdf6f33d 100644 --- a/base/setup/reactos/reactos.rc +++ b/base/setup/reactos/reactos.rc @@ -12,13 +12,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* Icons */ -IDI_MAIN ICON "res/setup.ico" -IDI_ROSICON ICON "res/roslogo.ico" -IDI_WINICON ICON "res/winlogo.ico" +IDI_MAIN ICON "res/setup.ico" +IDI_ROSICON ICON "res/roslogo.ico" +IDI_WINICON ICON "res/winlogo.ico" +IDI_DISKDRIVE ICON "res/drive_disk.ico" +IDI_PARTITION ICON "res/partition.ico"
/* Bitmaps */ -IDB_WATERMARK BITMAP "res/watermark.bmp" -IDB_HEADER BITMAP "res/header.bmp" +IDB_WATERMARK BITMAP "res/watermark.bmp" +IDB_HEADER BITMAP "res/header.bmp"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "reactos.exe.manifest"
diff --git a/base/setup/reactos/res/README.txt b/base/setup/reactos/res/README.txt index 54c0b111c4..163a4ca97f 100644 --- a/base/setup/reactos/res/README.txt +++ b/base/setup/reactos/res/README.txt @@ -1,9 +1,33 @@ +drive_disk.ico +-------------- +From the GNOME-Colors project, +by Victor Castillejo (perfectska04). +Distributed under the terms of GNU GPL v2. + + +partition.ico +------------- +Farm-Fresh Icon Set +FatCow Web Hosting - http://www.fatcow.com/ + +Terms of Use +============ +These icon sets are licensed under a Creative Commons Attribution 3.0 License. +This means you can freely use these icons for any purpose, private and commercial, +including online services, templates, themes and software. However, you should +include a link to this page (http://www.fatcow.com/free-icons) in your credits +(software or website). The icons may not be resold, sub-licensed, rented, transferred +or otherwise made available for use. Please link to this page on fatcow.com if you +would like to spread the word. + + roslogo.ico ----------- (C) 2018 ReactOS Team & Contributors Distributed under CC-BY-SA 4.0 International License Terms.
+ winlogo.ico ----------- Adapted from the WinTango IconPack, by 'heebijeebi' diff --git a/base/setup/reactos/res/drive_disk.ico b/base/setup/reactos/res/drive_disk.ico new file mode 100644 index 0000000000..b9ddff5d52 Binary files /dev/null and b/base/setup/reactos/res/drive_disk.ico differ diff --git a/base/setup/reactos/res/partition.ico b/base/setup/reactos/res/partition.ico new file mode 100644 index 0000000000..181a6b5528 Binary files /dev/null and b/base/setup/reactos/res/partition.ico differ diff --git a/base/setup/reactos/resource.h b/base/setup/reactos/resource.h index 5d2037ea7c..11d855ce49 100644 --- a/base/setup/reactos/resource.h +++ b/base/setup/reactos/resource.h @@ -8,6 +8,8 @@ #define IDI_MAIN 3000 #define IDI_ROSICON 3001 #define IDI_WINICON 3002 +#define IDI_DISKDRIVE 3003 +#define IDI_PARTITION 3004
#define IDC_STATIC -1
-
Hermès Bélusca-Maïto