1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-01-04 04:38:12 -06:00

Linux/MacOSX: use new icons contributed by Andreas Becker (https://github.com/veracrypt/VeraCrypt/issues/9#issuecomment-118353850)

This commit is contained in:
Mounir IDRASSI
2015-12-03 00:43:44 +01:00
parent 3a9db8d98c
commit 533b7e1eb8
9 changed files with 3908 additions and 735 deletions

View File

@@ -194,7 +194,7 @@ ifeq "$(TC_BUILD_CONFIG)" "Release"
ifndef TC_NO_GUI ifndef TC_NO_GUI
mkdir -p $(PWD)/Setup/Linux/usr/share/applications mkdir -p $(PWD)/Setup/Linux/usr/share/applications
mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps
cp $(PWD)/Resources/Icons/VeraCrypt-48x48.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm cp $(PWD)/Resources/Icons/VeraCrypt-256x256.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
endif endif

View File

@@ -155,8 +155,8 @@ namespace VeraCrypt
#ifdef TC_WINDOWS #ifdef TC_WINDOWS
return wxIcon (L"IDI_TRUECRYPT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); return wxIcon (L"IDI_TRUECRYPT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
#else #else
# include "Resources/Icons/VeraCrypt-16x16.xpm" # include "Resources/Icons/VeraCrypt-256x256.xpm"
return wxIcon (VeraCryptIcon16x16); return wxIcon (VeraCryptIcon256x256);
#endif #endif
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1,143 +1,105 @@
/* XPM */ /* XPM */
static const char *VeraCryptIcon16x16[] = { static const char *VeraCryptIcon16x16[] = {
/* columns rows colors chars-per-pixel */ "16 16 86 1",
"16 16 123 2", " c None",
" c None", ". c #FFFFFF",
". c #ABADA9", "+ c #FDFEFF",
"+ c #B6B7B2", "@ c #FDFEFE",
"@ c #B4B6B2", "# c #FEFEFE",
"# c #B6B6B3", "$ c #FEFFFE",
"$ c #B7B8B4", "% c #FEFFFF",
"% c #B7B7B4", "& c #FEFEFF",
"& c #B5B7B3", "* c #FCFEFE",
"* c #B5B6B2", "= c #60C9E6",
"= c #B5B5B2", "- c #6FCDE7",
"- c #ABADA8", "; c #C4E7DC",
"; c #C1C3BF", "> c #8ACCB7",
"> c #CBCCC7", ", c #A0D4C2",
", c #C4C5C1", "' c #BFE1D4",
"' c #CCCEC9", ") c #FCFEFD",
") c #CECFCA", "! c #8CD6EC",
"! c #CDCFC9", "~ c #0096CC",
"~ c #CCCDC8", "{ c #B8E2F1",
"{ c #CED0CB", "] c #F1F9F7",
"] c #C0C2BE", "^ c #51BA9C",
"^ c #B1B3AE", "/ c #68C0A5",
"/ c #CBCDC7", "( c #9FD3C0",
"( c #B5B6B1", "_ c #CFE9E0",
"_ c #CCCDC9", ": c #3FA8D7",
": c #D0D2CC", "< c #399CD3",
"< c #CDCFCA", "[ c #F9FCFD",
"[ c #D1D3CE", "} c #87D4C1",
"} c #D9DAD6", "| c #38B495",
"| c #B7B9B4", "1 c #E2F4EF",
"1 c #BEBFBB", "2 c #C5E0F1",
"2 c #CCCECA", "3 c #0C79C1",
"3 c #D3D4D0", "4 c #A0C7E5",
"4 c #D6D8D4", "5 c #E6F8F6",
"5 c #DFE0DD", "6 c #1A7C68",
"6 c #E0E1DE", "7 c #479A80",
"7 c #D8D9D6", "8 c #FBFFFF",
"8 c #D4D5D1", "9 c #FCFDFD",
"9 c #D7D9D4", "0 c #66A1D1",
"0 c #D9DAD7", "a c #2B74BA",
"a c #C2C3C0", "b c #5AB3C3",
"b c #D1D2CF", "c c #288F93",
"c c #E4E5E2", "d c #248C6C",
"d c #DEDFDA", "e c #89C6B6",
"e c #DCDDD9", "f c #C5E2DB",
"f c #DEDFDC", "g c #E4F3EF",
"g c #D8D9D7", "h c #E1E9F6",
"h c #D9DBD7", "i c #24679C",
"i c #E1E2DE", "j c #026B83",
"j c #D7D8D4", "k c #BAE2ED",
"k c #C1C2BE", "l c #7CB8A3",
"l c #BDBEB9", "m c #0E7A59",
"m c #C7C8C5", "n c #159271",
"n c #D5D5D2", "o c #60C2AC",
"o c #E4E6E3", "p c #EEEEEE",
"p c #EBEBE9", "q c #E6E6E6",
"q c #E8E8E5", "r c #FFFEFF",
"r c #E3E4E1", "s c #DCE9EC",
"s c #E2E3E0", "t c #CEDFE3",
"t c #E2E2DF", "u c #EEECEC",
"u c #DEDEDB", "v c #F0F7F4",
"v c #ACAFA8", "w c #D6E9E3",
"w c #B1B4AD", "x c #D5EBE5",
"x c #A8ABA4", "y c #CEEAE4",
"y c #C6C8C3", "z c #FAFDFD",
"z c #C9CAC7", "A c #CBCBCA",
"A c #D2D4D1", "B c #777775",
"B c #D5D7D3", "C c #8E8E8E",
"C c #DDDED9", "D c #A29F9E",
"D c #EBECEA", "E c #959190",
"E c #EFEFEE", "F c #D0D1D0",
"F c #F5F5F4", "G c #C6C5C5",
"G c #CBCCCA", "H c #BFBCBC",
"H c #B1B3AC", "I c #B1ADAD",
"I c #C7C7C1", "J c #DCD9D9",
"J c #BBBDB6", "K c #F6F6F6",
"K c #A9ACA6", "L c #DFDFDE",
"L c #C2C4C2", "M c #DEDEDE",
"M c #D3D5D0", "N c #DFDFDF",
"N c #CECFCC", "O c #D9DADA",
"O c #D6D7D3", "P c #EDEDED",
"P c #D7D8D5", "Q c #E5E6E5",
"Q c #DADBD8", "R c #CECFCE",
"R c #DEDFDF", "S c #DEDFDE",
"S c #CCC9B8", "T c #F4F5F5",
"T c #B0A980", "U c #FDFDFD",
"U c #B3B2A3", " ",
"V c #CFC17D", " ........ ",
"W c #C3BE9C", " ++....@@#$ ",
"X c #B4B2A1", " %.&..%%... ",
"Y c #A19A74", " *=-.%@.;>,') ",
"Z c #444849", " .!~{..]^/(_. ",
"` c #5F6362", " %..:<[.}|1.@.. ",
" . c #606463", "..@.2345678.@...",
".. c #616563", "...9.0abcdefg.$.",
"+. c #676B69", " ..@.hijklmno.$ ",
"@. c #656968", " .pqrstuvwxyz ",
"#. c #636768", " .ABCDEFGHIJ. ",
"$. c #6A675A", " KLMNOPQRST ",
"%. c #D6CB80", " ##....#... ",
"&. c #F9F198", " UUUU#### ",
"*. c #F3E879", " "};
"=. c #D3C653",
"-. c #D2C54F",
";. c #59532E",
">. c #2A3032",
",. c #2B3133",
"'. c #2E3334",
"). c #333838",
"!. c #383D3E",
"~. c #353A3A",
"{. c #32383B",
"]. c #3C3C34",
"^. c #D0C264",
"/. c #FFF877",
"(. c #DDCC2E",
"_. c #BEAB04",
":. c #C7B50E",
"<. c #514922",
"[. c #D4C661",
"}. c #FCF28A",
"|. c #E2D352",
"1. c #C8B82D",
"2. c #C9B828",
" ",
" ",
" ",
" . + @ # $ % & * = - ",
" ; > , ' ) ! ~ { ' ] ",
" ^ / ( _ : { { ' < [ } | ",
" 1 2 3 4 } 5 6 7 8 9 0 a ",
" b c d e f g h i j k l m ",
" n o p q r s t u v w x y ",
" z A B C t D E F G H I J K L ",
" a M N O P Q R S T U V W X Y ",
" Z ` ...+.@.#.$.%.&.*.=.-.;. ",
" >.,.'.).!.~.{.].^./.(._.:.<. ",
" [.}.|.1.2. ",
" ",
" "};

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.