From 844ed59dd86f0debec11610e705188b863138c67 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:14:59 -0800 Subject: [PATCH 1/8] CPCursor will now look in the theme to get system cursors --- AppKit/CPCursor.j | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index 9ab1aa2dc..d1e58c2c0 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -159,7 +159,11 @@ var currentCursor = nil, var cssString; if (doesHaveImage) - cssString = [CPString stringWithFormat:@"url(%@/CPCursor/%@.cur), %@", [[CPBundle bundleForClass:self] resourcePath], cursorName, aString]; + { + var themeResourcePath = [[CPApp themeBlend]._bundle resourcePath]; + cssString = [CPString stringWithFormat:@"url(%@/cursors/%@.cur), %@", themeResourcePath, cursorName, aString]; + } + else { // IE <= 8 does not support some cursors, map them to supported cursors From d7af63877e2e4ac1b7b566be7a0ce1ecb7a9ad60 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:15:19 -0800 Subject: [PATCH 2/8] Add system cursors in theme --- .../Resources/cursors/closedHandCursor.cur | Bin 0 -> 326 bytes .../Resources/cursors/contextualMenuCursor.cur | Bin 0 -> 4286 bytes .../Resources/cursors/disappearingItemCursor.cur | Bin 0 -> 4286 bytes .../Aristo2/Resources/cursors/dragCopyCursor.cur | Bin 0 -> 4286 bytes .../Aristo2/Resources/cursors/dragLinkCursor.cur | Bin 0 -> 4286 bytes .../Aristo2/Resources/cursors/openHandCursor.cur | Bin 0 -> 326 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/closedHandCursor.cur create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/contextualMenuCursor.cur create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/disappearingItemCursor.cur create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/dragCopyCursor.cur create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/dragLinkCursor.cur create mode 100644 AppKit/Themes/Aristo2/Resources/cursors/openHandCursor.cur diff --git a/AppKit/Themes/Aristo2/Resources/cursors/closedHandCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/closedHandCursor.cur new file mode 100644 index 0000000000000000000000000000000000000000..41aaa62a596f9e973f333e084e004da35bfdd9bf GIT binary patch literal 326 zcmbu(y$ypf5QgE`Mv<$CE-fxoW&}3Ks*J!W8Nosn6iAovz(opZ!dZ{+r#KrTft(|W z8?OKl;3-*p2|8QU=+MPZ)xDsgLtkXUK2BdF!K?QUpKW7>gf z2mVb5W>D!8Sc#zj{oD7ZXNco2TyDGFe#hJkaKyh+{sHSB)lJnN{q=hN*>Ri~T%Usj<;QvCcYr^R;gKWH zT!lh`2d`SKJ|W|!ycqB?viUoK^y5_4&}=rHMx((#+<{wg1Fix0hR@q7VBeF#MEv-X zOxA#B?6uWueS9KR3tZRjb-Ud+%;A5rX^;RW;+G!@L;LOTja#Wyt}s3aOs$>u|LIrm za=FYsSO6(tYVAm+_s8JY`eSlO`eSs5{4u-f=l7p{<|p8$KS%$B-1KjBIvtkajqx3$ zM;D89*J`zUOqd6z-*25)-ltm^t|)n=7lDm?+aLqd__Y>^04ZFPS+ERtKoOJxgqZGO G*!u!`f?iJm literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/cursors/disappearingItemCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/disappearingItemCursor.cur new file mode 100644 index 0000000000000000000000000000000000000000..e77aaea921bf1e638132c37cae22a03dcca56e56 GIT binary patch literal 4286 zcmcgvX-rgC6n-#NP{Yz%rCJy2-fBtJKw_;z-6$$hT#(edL?c?OKhQQ&qYUMriEFiW zY1Kv(Qx!0PAXwQ^K|qvEfhoHn`#v-8-8*ypomVhTlSUt{y~#IkyXSoOtoM#2*-AE& zo13JLUtJ_=6z--2Zh$v{ulSXuaD3A+Y{!fq?TGmkfDeF4z*~Ubv}w~M8w}k4XXEM9 zr>ZV*Z*S7A1IGxw@R>Mq;*r_2XJ4K?dGaYde*w@sT!D9hw-+v4ILzOFh3&9m!=#Li z47?iL$j!|qL7j_>3)$!fe6}ql6gxRN?Hx60)DBNi&%NOM z3iB4|bat)|4i37)!a`}ynl*T(eLQ^lko@^3;5UB!_(SvN&5Jh}3|t67kO8Hqr$?MR zb*ldK>C?3_F)64 zYt}5y`~w0(K|$Z<=jU6=RssfVZEa;mMa4WjCx;go7qh0OCI#=5>gsCc;K76D!E6BZWci2ORy-Q8_{@Zf?);kT^?JU4-#)f=>sGE03*+!Trx=kRIy*Zpkk6YmY0^>XS^^B$ z!oPmQ23ws@=NTFrnwXW9WrfXhS63H1a^withwFJtN(yoDeqZoo$BuG?p_0eO#>ea_C#=8a9woLMXkgK~zWkMs;5KHUA4$uV(laPacfl#~j{Tfj|v zSWHYD%gfE<&CSi=GIENyY&LU~$;2%du8zW@B9@(fpINL{j@l$SOHNKsgQKJ4`&#&S z@7}$kuCA_?;+U46&aPg)%CB6x!h3srIch)!@tVO;FdB^?!H9}KWb0fwQJWmnVFgV$&)7vI8l3MMs^Y(?Bl3$UQ<(}-Xqki z{pbhe8?v20d-e=DbBDo?A|xc_doBFvcha(D%Rah$_ii)A5WF(k+t${`u_lIE;J0tz z=I76!hyHrr)z!_*%gcE>VnxQ&`e+SUvzj}o;~%x~BafvWJ9c=$_D<+w@Hn6}68QD&*VP_`xvZd|fO>$8rI@g8f&Aa8g&(;_{A1vU$FN0U4KnhJ z^wSy`;zRX~TCZf4l~tVlOmQzQeZtVM3Dm4rpl{_H42F?f_}8slXOEZ-S+ZowYS>tT zK48IKYK0GIEf!jn!SK5%D0s-q$|{to$m=XUBSXo|%u*T}8fZOrSbHjbbIi-ji_Qm{ z2KIb=`0QN>&2e>g{e0!hm0zw}wJHR)Y(PI27cXA??Z%B8>F7a%dOmEYJ%I95AP>s7 zY}xYR(4j+}Ag>Du2#~N`O=lx;NT@kq$SH{PIp~=@XU-g#v17-&FIcc(Ii4No&Ye3W zF)=X*b7ksFVL(;WU5#d>7d3FmmL`DTr0bp+kqT744%On~rmk$P==lVg3CsZKNK0okY2d8r?CdPTKlDoFS8oRSgS{;PHExBtf^&!|FE6hH zJux2VqFD5v1cW&XbrzkPn(B+17=n6x1OBlY;2$LI3$aI!9t9x20{gIRXJ;pnlf8j~ zfnxpo^#W%y5f>LnWl#&Kdt3i`?S=fmy&?N=-MS^9N3plJCqK|V2TVRbKGw?0$^!H! ziUZ~Mpw3t%`%i=T$$oq%e)59__wuGqn*@4M2{fa{rl~gah50h z8TlSHUV@rb_jBZ^Zrr$WFV!`e34e*d0(oWQ#*G4XURYXMI{p6r`=rvQ|3AuL)W1}Q z>_`5S|NFLY-%i}Q@cH!qT2p(<>*Pm%t)Tix?-kg?vcXONIVJ4puO;4pcSuxJ)Th|z z1oo4x0q$+vw*4>Mv=*GZ=YzKc@S4n A&Hw-a literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/cursors/dragCopyCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/dragCopyCursor.cur new file mode 100644 index 0000000000000000000000000000000000000000..63409fa3416c0900700caed8aaf2a03255525e94 GIT binary patch literal 4286 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 FegPn%Zr=a^ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/cursors/openHandCursor.cur b/AppKit/Themes/Aristo2/Resources/cursors/openHandCursor.cur new file mode 100644 index 0000000000000000000000000000000000000000..fba3ddc807fd2e29b41d09af0b14d6db6bdb879c GIT binary patch literal 326 zcmbu(u?@m75QX92i6U1h9TF8ODcJzFVFXGt0;3=b>Wq?t0aBq9D39kj1vQ-Y*=OHL zXDA3XO+ln$A7Bmatg)j7uQ`?@la<+x_h6sG+m?*Z%Tfs literal 0 HcmV?d00001 From 5b84fd6e4018d307122d7617d41de0e050b63cbe Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:15:41 -0800 Subject: [PATCH 3/8] Remove unused AppKit resources --- AppKit/Resources/CPCursor/closedHandCursor.cur | Bin 326 -> 0 bytes .../Resources/CPCursor/contextualMenuCursor.cur | Bin 4286 -> 0 bytes .../CPCursor/disappearingItemCursor.cur | Bin 4286 -> 0 bytes AppKit/Resources/CPCursor/dragCopyCursor.cur | Bin 4286 -> 0 bytes AppKit/Resources/CPCursor/dragLinkCursor.cur | Bin 4286 -> 0 bytes AppKit/Resources/CPCursor/openHandCursor.cur | Bin 326 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPCursor/closedHandCursor.cur delete mode 100644 AppKit/Resources/CPCursor/contextualMenuCursor.cur delete mode 100644 AppKit/Resources/CPCursor/disappearingItemCursor.cur delete mode 100644 AppKit/Resources/CPCursor/dragCopyCursor.cur delete mode 100644 AppKit/Resources/CPCursor/dragLinkCursor.cur delete mode 100644 AppKit/Resources/CPCursor/openHandCursor.cur diff --git a/AppKit/Resources/CPCursor/closedHandCursor.cur b/AppKit/Resources/CPCursor/closedHandCursor.cur deleted file mode 100644 index 41aaa62a596f9e973f333e084e004da35bfdd9bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(y$ypf5QgE`Mv<$CE-fxoW&}3Ks*J!W8Nosn6iAovz(opZ!dZ{+r#KrTft(|W z8?OKl;3-*p2|8QU=+MPZ)xDsgLtkXUK2BdF!K?QUpKW7>gf z2mVb5W>D!8Sc#zj{oD7ZXNco2TyDGFe#hJkaKyh+{sHSB)lJnN{q=hN*>Ri~T%Usj<;QvCcYr^R;gKWH zT!lh`2d`SKJ|W|!ycqB?viUoK^y5_4&}=rHMx((#+<{wg1Fix0hR@q7VBeF#MEv-X zOxA#B?6uWueS9KR3tZRjb-Ud+%;A5rX^;RW;+G!@L;LOTja#Wyt}s3aOs$>u|LIrm za=FYsSO6(tYVAm+_s8JY`eSlO`eSs5{4u-f=l7p{<|p8$KS%$B-1KjBIvtkajqx3$ zM;D89*J`zUOqd6z-*25)-ltm^t|)n=7lDm?+aLqd__Y>^04ZFPS+ERtKoOJxgqZGO G*!u!`f?iJm diff --git a/AppKit/Resources/CPCursor/disappearingItemCursor.cur b/AppKit/Resources/CPCursor/disappearingItemCursor.cur deleted file mode 100644 index e77aaea921bf1e638132c37cae22a03dcca56e56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmcgvX-rgC6n-#NP{Yz%rCJy2-fBtJKw_;z-6$$hT#(edL?c?OKhQQ&qYUMriEFiW zY1Kv(Qx!0PAXwQ^K|qvEfhoHn`#v-8-8*ypomVhTlSUt{y~#IkyXSoOtoM#2*-AE& zo13JLUtJ_=6z--2Zh$v{ulSXuaD3A+Y{!fq?TGmkfDeF4z*~Ubv}w~M8w}k4XXEM9 zr>ZV*Z*S7A1IGxw@R>Mq;*r_2XJ4K?dGaYde*w@sT!D9hw-+v4ILzOFh3&9m!=#Li z47?iL$j!|qL7j_>3)$!fe6}ql6gxRN?Hx60)DBNi&%NOM z3iB4|bat)|4i37)!a`}ynl*T(eLQ^lko@^3;5UB!_(SvN&5Jh}3|t67kO8Hqr$?MR zb*ldK>C?3_F)64 zYt}5y`~w0(K|$Z<=jU6=RssfVZEa;mMa4WjCx;go7qh0OCI#=5>gsCc;K76D!E6BZWci2ORy-Q8_{@Zf?);kT^?JU4-#)f=>sGE03*+!Trx=kRIy*Zpkk6YmY0^>XS^^B$ z!oPmQ23ws@=NTFrnwXW9WrfXhS63H1a^withwFJtN(yoDeqZoo$BuG?p_0eO#>ea_C#=8a9woLMXkgK~zWkMs;5KHUA4$uV(laPacfl#~j{Tfj|v zSWHYD%gfE<&CSi=GIENyY&LU~$;2%du8zW@B9@(fpINL{j@l$SOHNKsgQKJ4`&#&S z@7}$kuCA_?;+U46&aPg)%CB6x!h3srIch)!@tVO;FdB^?!H9}KWb0fwQJWmnVFgV$&)7vI8l3MMs^Y(?Bl3$UQ<(}-Xqki z{pbhe8?v20d-e=DbBDo?A|xc_doBFvcha(D%Rah$_ii)A5WF(k+t${`u_lIE;J0tz z=I76!hyHrr)z!_*%gcE>VnxQ&`e+SUvzj}o;~%x~BafvWJ9c=$_D<+w@Hn6}68QD&*VP_`xvZd|fO>$8rI@g8f&Aa8g&(;_{A1vU$FN0U4KnhJ z^wSy`;zRX~TCZf4l~tVlOmQzQeZtVM3Dm4rpl{_H42F?f_}8slXOEZ-S+ZowYS>tT zK48IKYK0GIEf!jn!SK5%D0s-q$|{to$m=XUBSXo|%u*T}8fZOrSbHjbbIi-ji_Qm{ z2KIb=`0QN>&2e>g{e0!hm0zw}wJHR)Y(PI27cXA??Z%B8>F7a%dOmEYJ%I95AP>s7 zY}xYR(4j+}Ag>Du2#~N`O=lx;NT@kq$SH{PIp~=@XU-g#v17-&FIcc(Ii4No&Ye3W zF)=X*b7ksFVL(;WU5#d>7d3FmmL`DTr0bp+kqT744%On~rmk$P==lVg3CsZKNK0okY2d8r?CdPTKlDoFS8oRSgS{;PHExBtf^&!|FE6hH zJux2VqFD5v1cW&XbrzkPn(B+17=n6x1OBlY;2$LI3$aI!9t9x20{gIRXJ;pnlf8j~ zfnxpo^#W%y5f>LnWl#&Kdt3i`?S=fmy&?N=-MS^9N3plJCqK|V2TVRbKGw?0$^!H! ziUZ~Mpw3t%`%i=T$$oq%e)59__wuGqn*@4M2{fa{rl~gah50h z8TlSHUV@rb_jBZ^Zrr$WFV!`e34e*d0(oWQ#*G4XURYXMI{p6r`=rvQ|3AuL)W1}Q z>_`5S|NFLY-%i}Q@cH!qT2p(<>*Pm%t)Tix?-kg?vcXONIVJ4puO;4pcSuxJ)Th|z z1oo4x0q$+vw*4>Mv=*GZ=YzKc@S4n A&Hw-a diff --git a/AppKit/Resources/CPCursor/dragCopyCursor.cur b/AppKit/Resources/CPCursor/dragCopyCursor.cur deleted file mode 100644 index 63409fa3416c0900700caed8aaf2a03255525e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 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 FegPn%Zr=a^ diff --git a/AppKit/Resources/CPCursor/openHandCursor.cur b/AppKit/Resources/CPCursor/openHandCursor.cur deleted file mode 100644 index fba3ddc807fd2e29b41d09af0b14d6db6bdb879c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmbu(u?@m75QX92i6U1h9TF8ODcJzFVFXGt0;3=b>Wq?t0aBq9D39kj1vQ-Y*=OHL zXDA3XO+ln$A7Bmatg)j7uQ`?@la<+x_h6sG+m?*Z%Tfs From 4ce8ea9ce955a7dfe0a6cded2b314ea73845568f Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:27:49 -0800 Subject: [PATCH 4/8] make CPThemeBlend's bundle property readonly --- AppKit/CPThemeBlend.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPThemeBlend.j b/AppKit/CPThemeBlend.j index eeea9c09c..8455bd4c0 100644 --- a/AppKit/CPThemeBlend.j +++ b/AppKit/CPThemeBlend.j @@ -33,7 +33,7 @@ @implementation CPThemeBlend : CPObject { - CPBundle _bundle; + CPBundle _bundle @accessors(getter=bundle); CPArray _themes; id _loadDelegate; } From ddf33a13cd3aa9f4bc11024ffd11457e6ea450e2 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:28:25 -0800 Subject: [PATCH 5/8] Use new CPThemeBlend bundle accessor --- AppKit/CPCursor.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPCursor.j b/AppKit/CPCursor.j index d1e58c2c0..876351f58 100755 --- a/AppKit/CPCursor.j +++ b/AppKit/CPCursor.j @@ -160,7 +160,7 @@ var currentCursor = nil, if (doesHaveImage) { - var themeResourcePath = [[CPApp themeBlend]._bundle resourcePath]; + var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath]; cssString = [CPString stringWithFormat:@"url(%@/cursors/%@.cur), %@", themeResourcePath, cursorName, aString]; } From 4ad40ee00d9d68de3ffdd9c22ae4c0286439dfb9 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:28:43 -0800 Subject: [PATCH 6/8] Pull menu default icon from theme instead of AppKit resource --- AppKit/CPApplication.j | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index ec4003cbb..8eb73df9e 100644 --- a/AppKit/CPApplication.j +++ b/AppKit/CPApplication.j @@ -1357,26 +1357,26 @@ var _CPAppBootstrapperActions = nil; // FIXME: We should implement autoenabling. [mainMenu setAutoenablesItems:NO]; - var bundle = [CPBundle bundleForClass:[CPApplication class]], + var themeBundle = [[CPApp themeBlend] bundle], newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"]; - [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]]; - [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]]; + [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new.png"] size:CGSizeMake(16.0, 16.0)]]; + [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/new-highlighted.png"] size:CGSizeMake(16.0, 16.0)]]; [mainMenu addItem:newMenuItem]; var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"]; - [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]]; - [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]]; + [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open.png"] size:CGSizeMake(16.0, 16.0)]]; + [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/open-highlighted.png"] size:CGSizeMake(16.0, 16.0)]]; [mainMenu addItem:openMenuItem]; var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"], saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil]; - [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]]; - [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]]; + [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save.png"] size:CGSizeMake(16.0, 16.0)]]; + [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[themeBundle pathForResource:@"application-icons/save-highlighted.png"] size:CGSizeMake(16.0, 16.0)]]; [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]]; [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]]; From 42824713e3239cd23449b6bdf9f0ede60d305033 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:29:24 -0800 Subject: [PATCH 7/8] Add application's menu default icon in theme --- .../application-icons/new-highlighted.png | Bin 0 -> 442 bytes .../Aristo2/Resources/application-icons/new.png | Bin 0 -> 455 bytes .../application-icons/open-highlighted.png | Bin 0 -> 541 bytes .../Aristo2/Resources/application-icons/open.png | Bin 0 -> 580 bytes .../application-icons/save-highlighted.png | Bin 0 -> 402 bytes .../Aristo2/Resources/application-icons/save.png | Bin 0 -> 274 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/new.png create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/open.png create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png create mode 100644 AppKit/Themes/Aristo2/Resources/application-icons/save.png diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/new-highlighted.png new file mode 100644 index 0000000000000000000000000000000000000000..cc1798ce59948b723daf3bd0918786978da809f5 GIT binary patch literal 442 zcmV;r0Y(0aP)czV7sU4!@P!3S@6zTbO%^%6vs;A@R-Fomg1W4kQP4%i;sX6uQCD=I)( zo6qMI8IQ-*@Aq+!feOn-C9(pA?PIvx?F!9ilWMgZ3ZjyRtRyN>SssJEUQcMXT2!r8 z5nfpm6=Cq>yobP2rib~vNYS277T|&q0{M*ZQBURN{VbtTHyP>Fc=J|-ENcP zIAoe88HPcYWnnu6PFYG?FdB`7APC6wJOpqiI9Pn**FoTn?MMs4FkA^Um_W?acS$2I5^{WoEM{8MUl@p&)ggd`BksHvX05 kSxJTu?*m~x9T^0F0U~0j`hE`^8UO$Q07*qoM6N<$f?i9#B>(^b literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/new.png b/AppKit/Themes/Aristo2/Resources/application-icons/new.png new file mode 100644 index 0000000000000000000000000000000000000000..2ca371152ed836c53047310d1dcf00bdec112e22 GIT binary patch literal 455 zcmV;&0XY7NP)uK#$*rX+aO|KV?ShU!G%7hAKATytpxJCPbX|vBE=MDtWE+|13T)eEG#U*k zm&>3i3S=@FkYyRN*({xo3OmRWSI}y;7>?tBWm&9Huh*ekt92NH&XKx93bY38$#J*Q< z1C`ag<#&%@Fc^3^eu~0_UHn6~@(dDqzC>Q=zKL@!0aqXQ5GlmIMo+;01tgAKAW0s< xq~MT1ya^c8@%)WLNeBt^5GB7!W!jx}Fu&6+3H5P(-f{o{002ovPDHLkV1gV-#7qDH literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/open-highlighted.png new file mode 100644 index 0000000000000000000000000000000000000000..61bef991a548b2de990038ef7b34e248bd85d766 GIT binary patch literal 541 zcmV+&0^ z0TDv4bLH}-t6+`^0jImCdG+$;{F~Qrp3{mzmYnR2bLK#kp-Bk|F#qYCir5|*Ct48* z`=haThP#Z%BWA>mnGt_YQ$sbGM4$_d;=XCsMN1Tb{Zo+;MXKAxi$>$*Z39Xn?u2NP=vbOs7=UB-4r_6p{#mBen?&7-O3d1Ol=tf)EfwI7KV& z?+t%^`?9{%JGWTm++tVR03!q;bhfuPw`eJZa6NW9_k;>?1~Fqm%oq^==%kcB fqJwmFI4TtNLmS|8EW00000NkvXXu0mjfr1kf3 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/open.png b/AppKit/Themes/Aristo2/Resources/application-icons/open.png new file mode 100644 index 0000000000000000000000000000000000000000..e7377da0669707d7723611240c3f9dae55f3bf38 GIT binary patch literal 580 zcmV-K0=xZ*P)Eoan3>^$<5zFozW?Ciqg(x?A2ApvgXHa-*X?%u>yC3?##Ab*A%F)E-mD;Olh8ZZH5{$y+Z z+T6mqrS%VOiabL`tmE;D2xdk!aH^rjAY%LWuy; zz^fuo$n$~_4H2R49cD1yX!uvFFBS|qEUUE{87LxHto(@4 zNQNncWEcUwiaJHqxdS(0hB_Uoh=`6`iZ~~zf^)70;Je#f+wa%ce$UReYN042A_!pE zXncEbHC91X>p$9`e*uVdeqmyA@&bqli&gTda37*tClP9SmVL^z^qm~`oc{rNg%nAI S?IETB0000< literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png b/AppKit/Themes/Aristo2/Resources/application-icons/save-highlighted.png new file mode 100644 index 0000000000000000000000000000000000000000..8a42c72a77db9970a2a2754a6f3d141ff64706be GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6MwS0D`m-rn9878XEKTwGj1 zK|x7LNmW%V`Jmu;t~=P5)%`Xl9G~>lT%Vs($dn> z)6+9EGYbj|3JVLXs;cVh>gwz38yXtg+uNs4pT2P6!o`ah^L6bh0y~nT{pzFVlsiyUSgNjnw3ZjJrSBv=|G TrDy$53KX)Qu6{1-oD!MYP)KxNl_~I^Sic4S8nBh zJm=3jVP!kv3Y8VKwSVGUZc-;lK<7kM(bB@igJVZ#*UvpYLc+q_j+zEue41HE4!Xk& zy|6?S?V5PPTr^h^)urU%*f7Lv=7&=-q~Oj0Jv zii`NC5Q~eg3vc#C`7a?CEqw@&4pjwrB_XJq8VH($?)#}me@|_rPrgh?UCpo>8R`3% YZ(2@c=Cw2chX4Qo07*qoM6N<$g7j5yZvX%Q literal 0 HcmV?d00001 From a3273dedc1d6ae4e3d7a961e159eb2eac8bd5e25 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Thu, 10 Jan 2013 11:29:33 -0800 Subject: [PATCH 8/8] Remove unused art --- AppKit/Resources/CPApplication/New.png | Bin 455 -> 0 bytes AppKit/Resources/CPApplication/NewHighlighted.png | Bin 442 -> 0 bytes AppKit/Resources/CPApplication/Open.png | Bin 580 -> 0 bytes .../Resources/CPApplication/OpenHighlighted.png | Bin 541 -> 0 bytes AppKit/Resources/CPApplication/Save.png | Bin 274 -> 0 bytes .../Resources/CPApplication/SaveHighlighted.png | Bin 402 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPApplication/New.png delete mode 100644 AppKit/Resources/CPApplication/NewHighlighted.png delete mode 100644 AppKit/Resources/CPApplication/Open.png delete mode 100644 AppKit/Resources/CPApplication/OpenHighlighted.png delete mode 100644 AppKit/Resources/CPApplication/Save.png delete mode 100644 AppKit/Resources/CPApplication/SaveHighlighted.png diff --git a/AppKit/Resources/CPApplication/New.png b/AppKit/Resources/CPApplication/New.png deleted file mode 100644 index 2ca371152ed836c53047310d1dcf00bdec112e22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmV;&0XY7NP)uK#$*rX+aO|KV?ShU!G%7hAKATytpxJCPbX|vBE=MDtWE+|13T)eEG#U*k zm&>3i3S=@FkYyRN*({xo3OmRWSI}y;7>?tBWm&9Huh*ekt92NH&XKx93bY38$#J*Q< z1C`ag<#&%@Fc^3^eu~0_UHn6~@(dDqzC>Q=zKL@!0aqXQ5GlmIMo+;01tgAKAW0s< xq~MT1ya^c8@%)WLNeBt^5GB7!W!jx}Fu&6+3H5P(-f{o{002ovPDHLkV1gV-#7qDH diff --git a/AppKit/Resources/CPApplication/NewHighlighted.png b/AppKit/Resources/CPApplication/NewHighlighted.png deleted file mode 100644 index cc1798ce59948b723daf3bd0918786978da809f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmV;r0Y(0aP)czV7sU4!@P!3S@6zTbO%^%6vs;A@R-Fomg1W4kQP4%i;sX6uQCD=I)( zo6qMI8IQ-*@Aq+!feOn-C9(pA?PIvx?F!9ilWMgZ3ZjyRtRyN>SssJEUQcMXT2!r8 z5nfpm6=Cq>yobP2rib~vNYS277T|&q0{M*ZQBURN{VbtTHyP>Fc=J|-ENcP zIAoe88HPcYWnnu6PFYG?FdB`7APC6wJOpqiI9Pn**FoTn?MMs4FkA^Um_W?acS$2I5^{WoEM{8MUl@p&)ggd`BksHvX05 kSxJTu?*m~x9T^0F0U~0j`hE`^8UO$Q07*qoM6N<$f?i9#B>(^b diff --git a/AppKit/Resources/CPApplication/Open.png b/AppKit/Resources/CPApplication/Open.png deleted file mode 100644 index e7377da0669707d7723611240c3f9dae55f3bf38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*P)Eoan3>^$<5zFozW?Ciqg(x?A2ApvgXHa-*X?%u>yC3?##Ab*A%F)E-mD;Olh8ZZH5{$y+Z z+T6mqrS%VOiabL`tmE;D2xdk!aH^rjAY%LWuy; zz^fuo$n$~_4H2R49cD1yX!uvFFBS|qEUUE{87LxHto(@4 zNQNncWEcUwiaJHqxdS(0hB_Uoh=`6`iZ~~zf^)70;Je#f+wa%ce$UReYN042A_!pE zXncEbHC91X>p$9`e*uVdeqmyA@&bqli&gTda37*tClP9SmVL^z^qm~`oc{rNg%nAI S?IETB0000< diff --git a/AppKit/Resources/CPApplication/OpenHighlighted.png b/AppKit/Resources/CPApplication/OpenHighlighted.png deleted file mode 100644 index 61bef991a548b2de990038ef7b34e248bd85d766..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmV+&0^ z0TDv4bLH}-t6+`^0jImCdG+$;{F~Qrp3{mzmYnR2bLK#kp-Bk|F#qYCir5|*Ct48* z`=haThP#Z%BWA>mnGt_YQ$sbGM4$_d;=XCsMN1Tb{Zo+;MXKAxi$>$*Z39Xn?u2NP=vbOs7=UB-4r_6p{#mBen?&7-O3d1Ol=tf)EfwI7KV& z?+t%^`?9{%JGWTm++tVR03!q;bhfuPw`eJZa6NW9_k;>?1~Fqm%oq^==%kcB fqJwmFI4TtNLmS|8EW00000NkvXXu0mjfr1kf3 diff --git a/AppKit/Resources/CPApplication/Save.png b/AppKit/Resources/CPApplication/Save.png deleted file mode 100644 index d7aed8e2d61d072b78b27f1e98f03e45e62bf071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmV+t0qy>YP)KxNl_~I^Sic4S8nBh zJm=3jVP!kv3Y8VKwSVGUZc-;lK<7kM(bB@igJVZ#*UvpYLc+q_j+zEue41HE4!Xk& zy|6?S?V5PPTr^h^)urU%*f7Lv=7&=-q~Oj0Jv zii`NC5Q~eg3vc#C`7a?CEqw@&4pjwrB_XJq8VH($?)#}me@|_rPrgh?UCpo>8R`3% YZ(2@c=Cw2chX4Qo07*qoM6N<$g7j5yZvX%Q diff --git a/AppKit/Resources/CPApplication/SaveHighlighted.png b/AppKit/Resources/CPApplication/SaveHighlighted.png deleted file mode 100644 index 8a42c72a77db9970a2a2754a6f3d141ff64706be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfiU6MwS0D`m-rn9878XEKTwGj1 zK|x7LNmW%V`Jmu;t~=P5)%`Xl9G~>lT%Vs($dn> z)6+9EGYbj|3JVLXs;cVh>gwz38yXtg+uNs4pT2P6!o`ah^L6bh0y~nT{pzFVlsiyUSgNjnw3ZjJrSBv=|G TrDy$53KX)Qu6{1-oD!M