From 5335a611a003765e753ae93917618684aa6ad660 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Fri, 20 Aug 2010 01:49:46 -0400 Subject: [PATCH] Use Aristo icons for CPAlert. --- .../Themes/Aristo/Resources/alert-error.png | Bin 0 -> 1738 bytes AppKit/Themes/Aristo/Resources/alert-info.png | Bin 0 -> 2472 bytes .../Themes/Aristo/Resources/alert-warning.png | Bin 0 -> 2126 bytes .../Themes/Aristo/Resources/dialog-error.png | Bin 1656 -> 0 bytes .../Aristo/Resources/dialog-icons-LICENSE | 58 ------------------ .../Aristo/Resources/dialog-information.png | Bin 1899 -> 0 bytes .../Aristo/Resources/dialog-warning.png | Bin 1399 -> 0 bytes AppKit/Themes/Aristo/ThemeDescriptors.j | 10 +-- 8 files changed, 6 insertions(+), 62 deletions(-) create mode 100644 AppKit/Themes/Aristo/Resources/alert-error.png create mode 100644 AppKit/Themes/Aristo/Resources/alert-info.png create mode 100644 AppKit/Themes/Aristo/Resources/alert-warning.png delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-error.png delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-icons-LICENSE delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-information.png delete mode 100644 AppKit/Themes/Aristo/Resources/dialog-warning.png diff --git a/AppKit/Themes/Aristo/Resources/alert-error.png b/AppKit/Themes/Aristo/Resources/alert-error.png new file mode 100644 index 0000000000000000000000000000000000000000..edded831068734ab20d818bc615ba5a2aa3d013d GIT binary patch literal 1738 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 Eg4B2;t^fc4 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo/Resources/dialog-error.png b/AppKit/Themes/Aristo/Resources/dialog-error.png deleted file mode 100644 index aa4ae750980f97cff34495d166e36fab1ba242a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1656 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 diff --git a/AppKit/Themes/Aristo/Resources/dialog-warning.png b/AppKit/Themes/Aristo/Resources/dialog-warning.png deleted file mode 100644 index 47d84e49d3ce9dd4ecc09856fba2a27325dedbac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1399 zcmV--1&I2IP)ki`0G#1LCVYt=U3qabyHld827KeUCyR1~L`>fFXYh;;knm%W+$&@W{Q;sc*3 zC?bMITEQn`9|&`4+BI#=&Hm@sW?5{v*#|xF=bU@aJ@^0nzkcT)A(>2KDjUO8xAAzO z84!;E(s*=_*#qAJd;5VuJV5kE;MiEdBXAUgAiUQmQdn+uIDQLNR*Fa@aQD=ycq|gB z{uuam(mlZ4PJo*hZQaU}4;}!I9${fcg+w1Z{taN9^d#&BsvNm)~dQ}v~ukzQfm3q#c0n5$?NTTP@V_rCHV1jV;2f#jQ0R9B(XB8Ju zm%F<$K(1E~9)x=IC}M4GPzDCz3Pyo5S9ENZh z(vl^JUc3ljaj}6((kI^oc@qv`5NOCND>G`8c=66oDEs$AU_;y00|zkp@+HKM4!A-g zfo8v)PypN_qs>F+cDM@*HQIAxLI8XV6sR+1RJ!u>rQWMoVW_Bp zG=DzvPXawXJ%~gi&@>IA+YNR5cJ$r84VT|9Nj6(4d9HNa0Ep;M_{z(ZF{*jaTO!f6hiX!6o?!jAB#P>GQNh6FI08ws<#p^B0b~r?CnQ_MsFqcbL zW;UBs@9{C8V-5$*b#>@(ZAErg7Be`V^XMBNjR`yXi>nTX{`VLeHd$N!R+>wB2`sEtf-5k zD5;8ICKJqi_hR7jW7rrI%(G`Z`+(Z_0&s*v&qVQfemKl}&z;lVu2fZ}l%z7BlyOO) z*S)ZLGvv8*(NA9R1_H9k*k`{0*8dH_4eW9*U7Blr^-36c@&xLhJz!*IdfD;bYPIT; z35?hf)`kYeySkuKmDs#qB{2#`zXRZB3MoXO2OTqTEacyq!LMT9?ca42!+7 zQ70#fC_2aQ=ZXFKzXBlQ$T8S#2i&2M%+Gn5ERa{M7*RRztE;O~^)@%s*N4TpcrnZy zH)7!7L*%+#1`1;pmF2=w0f@li*=1#tcIOTfy}i2iqgkh)0kTZaVIwLZp0gi1q!XC% z{5fX%{p8?(QZ!4m-b=($H_PXfdvDx;al;14fxxKNb7^jFMoUY}sLHt*JRVqg?!@5J zr}^C113)9jDid(g85qSnl-sr0C_#`b2~dmWghO*RNsE%M+ggA>tZd*Rf#$ zrZ+%W=k@E;KG?R6F^Vk(4oN!k=%~|seaw4$#@pxg@jGjobJTOscD;DPuR^~Q0HG0o z-wVw2J6jr})0dLMiAih(=T$3E(*&F$-SPB`2`BpL^MIL@4~jO9E7u6M{)QV%K8dvh z9W?GH>DP5<+>A)K9vdSj_TtLRFAn|JQWrgEQvjy2{RM~kz?_asK|cTh002ovPDHLk FV1id7oK64$ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 6a5554b7f..8feeda898 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -1306,12 +1306,13 @@ var themedButtonValues = nil, { var alert = [CPAlert new], size = CGSizeMake(400.0, 110.0), - inset = CGInsetMake(10, 15, 15, 55), + inset = CGInsetMake(15, 15, 15, 80), + imageOffset = CGPointMake(15, 18), messageFont = [CPFont boldSystemFontOfSize:13.0], informativeFont = [CPFont systemFontOfSize:12.0], - informationIcon = PatternImage("dialog-information.png", 32.0, 32.0), - warningIcon = PatternImage("dialog-warning.png", 32.0, 32.0), - errorIcon = PatternImage("dialog-error.png", 32.0, 32.0); + informationIcon = PatternImage("alert-info.png", 53.0, 46.0), + warningIcon = PatternImage("alert-warning.png", 53.0, 46.0), + errorIcon = PatternImage("alert-error.png", 53.0, 46.0); themedAlertValues = [ @@ -1323,6 +1324,7 @@ var themedButtonValues = nil, [@"informative-text-alignment", CPJustifiedTextAlignment], [@"informative-text-color", [CPColor blackColor]], [@"informative-text-font", informativeFont], + [@"image-offset", imageOffset], [@"information-image", informationIcon], [@"warning-image", warningIcon], [@"error-image", errorIcon]