From 2da01423871a24d3f9f278ee68c0d8a7d23fdf37 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 9 Jan 2013 18:24:41 -0800 Subject: [PATCH 1/6] Make find/search/cancel buttons themable --- AppKit/CPSearchField.j | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index c9f6ba148..2170aa7e5 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -28,15 +28,6 @@ CPSearchFieldRecentsMenuItemTag = 1001; CPSearchFieldClearRecentsMenuItemTag = 1002; CPSearchFieldNoRecentsMenuItemTag = 1003; -var CPSearchFieldSearchImage = nil, - CPSearchFieldFindImage = nil, - CPSearchFieldCancelImage = nil, - CPSearchFieldCancelPressedImage = nil; - -var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0, - CANCEL_BUTTON_DEFAULT_WIDTH = 22.0, - BUTTON_DEFAULT_HEIGHT = 22.0; - var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification"; var RECENT_SEARCH_PREFIX = @" "; @@ -70,16 +61,14 @@ var RECENT_SEARCH_PREFIX = @" "; return @"searchfield" } -+ (void)initialize ++ (CPDictionary)themeAttributes { - if (self !== [CPSearchField class]) - return; - - var bundle = [CPBundle bundleForClass:self]; - CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)]; - CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)]; - CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)]; - CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)]; + return [CPDictionary dictionaryWithJSObject:{ + @"image-search": [CPNull null], + @"image-find": [CPNull null], + @"image-cancel": [CPNull null], + @"image-cancel-pressed": [CPNull null] + }]; } - (id)initWithFrame:(CGRect)frame @@ -170,7 +159,7 @@ var RECENT_SEARCH_PREFIX = @" "; - (void)resetSearchButton { var button = [self searchButton], - searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage; + searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"]; [button setBordered:NO]; [button setImageScaling:CPImageScaleAxesIndependently]; @@ -216,8 +205,8 @@ var RECENT_SEARCH_PREFIX = @" "; var button = [self cancelButton]; [button setBordered:NO]; [button setImageScaling:CPImageScaleAxesIndependently]; - [button setImage:CPSearchFieldCancelImage]; - [button setAlternateImage:CPSearchFieldCancelPressedImage]; + [button setImage:[self valueForThemeAttribute:@"image-cancel"]]; + [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]]; [button setAutoresizingMask:CPViewMinXMargin]; [button setTarget:self]; [button setAction:@selector(cancelOperation:)]; @@ -258,7 +247,9 @@ var RECENT_SEARCH_PREFIX = @" "; */ - (CGRect)searchButtonRectForBounds:(CGRect)rect { - return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT); + var size = [[self valueForThemeAttribute:@"image-search"] size] || CPSizeMakeZero(); + + return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height); } /*! @@ -268,7 +259,9 @@ var RECENT_SEARCH_PREFIX = @" "; */ - (CGRect)cancelButtonRectForBounds:(CGRect)rect { - return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT); + var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CPSizeMakeZero(); + + return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height); } // Managing Menu Templates From c5a4b2605c4257831d17c9c75ffbfd9991444528 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 9 Jan 2013 18:25:11 -0800 Subject: [PATCH 2/6] Add missing theme attributes for CPSearchField --- .../Resources/search-field-cancel-pressed.png | Bin 0 -> 224 bytes .../Aristo2/Resources/search-field-cancel.png | Bin 0 -> 234 bytes .../Aristo2/Resources/search-field-find.png | Bin 0 -> 303 bytes .../Aristo2/Resources/search-field-search.png | Bin 0 -> 283 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 17 +++++++++++++++-- 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/search-field-cancel-pressed.png create mode 100644 AppKit/Themes/Aristo2/Resources/search-field-cancel.png create mode 100644 AppKit/Themes/Aristo2/Resources/search-field-find.png create mode 100644 AppKit/Themes/Aristo2/Resources/search-field-search.png diff --git a/AppKit/Themes/Aristo2/Resources/search-field-cancel-pressed.png b/AppKit/Themes/Aristo2/Resources/search-field-cancel-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..0c49b6bcb71c156503104e6588b1771bdda7e6f0 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H0wnYHF4+L2mV3H5hG?9>I?0glumX?kecht& z6t&{>0cmAYV!uUr_HtM%%POqM^qA(iQI+MA@V{^7ckJ1C#LjbfC+=`km-#id?6T0-em@>FVdQ&MBb@07tY|4gdfE literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/search-field-cancel.png b/AppKit/Themes/Aristo2/Resources/search-field-cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..b36474116520f475cb327b69e131b0101586d021 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H0wnYHF4+L2HhQ`^hG?8mPLTN3FyFEBV9P;9 z4qu5Wl0QCZPEFg8RFGWIn(V!RgHPe`1D0^M=Dr(KKQo?X^qQW2NW>{}+6|e-EJmAk z9{>L@`&Yr$`q%&e`llJR!;gjJFd6bM$#A!CX}OiywDJaHnyrW8q@W4AJpP000&U1ONa4pSJ%!0002?NklhQvrD9@XK1LW`7@AOT3K6LSxQC6NK0m>tD&K5Ceu3B(YMi2ly|16W1}xV zL}F7xRU#5eR0Y$+BxfeL-gRCHW)d~y-Kl*hPlCJc$dOyYqXab*V`KHNEp5R>>Oxs+ zB1q*xZ66>~@L(geu#njZUKO^t_3x%Bx-l>}H*jxc?b-R^hfWlflwB$*su+3matuXc ziJY9+nTnB2<2M_3s-i7_d~rUa6Zym6xu5+>-T~_$FABS1z;gfq002ovPDHLkV1gHg Bero^# literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/search-field-search.png b/AppKit/Themes/Aristo2/Resources/search-field-search.png new file mode 100644 index 0000000000000000000000000000000000000000..49df1413960061ffd930535a2a5f1c95f6f934f1 GIT binary patch literal 283 zcmV+$0p$LPP)P000&U1ONa4pSJ%!0002uNkl3f|m Date: Wed, 9 Jan 2013 18:25:46 -0800 Subject: [PATCH 3/6] Remove unused ressource --- .../CPSearchField/CPSearchFieldCancel.png | Bin 234 -> 0 bytes .../CPSearchField/CPSearchFieldCancelPressed.png | Bin 224 -> 0 bytes .../Resources/CPSearchField/CPSearchFieldFind.png | Bin 303 -> 0 bytes .../CPSearchField/CPSearchFieldSearch.png | Bin 283 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPSearchField/CPSearchFieldCancel.png delete mode 100644 AppKit/Resources/CPSearchField/CPSearchFieldCancelPressed.png delete mode 100644 AppKit/Resources/CPSearchField/CPSearchFieldFind.png delete mode 100644 AppKit/Resources/CPSearchField/CPSearchFieldSearch.png diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldCancel.png b/AppKit/Resources/CPSearchField/CPSearchFieldCancel.png deleted file mode 100644 index b36474116520f475cb327b69e131b0101586d021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H0wnYHF4+L2HhQ`^hG?8mPLTN3FyFEBV9P;9 z4qu5Wl0QCZPEFg8RFGWIn(V!RgHPe`1D0^M=Dr(KKQo?X^qQW2NW>{}+6|e-EJmAk z9{>L@`&Yr$`q%&e`llJR!;gjJFd6bM$#A!CX}OiywDJaHnyrW8q@W4AJpI?0glumX?kecht& z6t&{>0cmAYV!uUr_HtM%%POqM^qA(iQI+MA@V{^7ckJ1C#LjbfC+=`km-#id?6T0-em@>FVdQ&MBb@07tY|4gdfE diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldFind.png b/AppKit/Resources/CPSearchField/CPSearchFieldFind.png deleted file mode 100644 index 2abd5418293f1640abfc080d3413126a54d26f66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)P000&U1ONa4pSJ%!0002?NklhQvrD9@XK1LW`7@AOT3K6LSxQC6NK0m>tD&K5Ceu3B(YMi2ly|16W1}xV zL}F7xRU#5eR0Y$+BxfeL-gRCHW)d~y-Kl*hPlCJc$dOyYqXab*V`KHNEp5R>>Oxs+ zB1q*xZ66>~@L(geu#njZUKO^t_3x%Bx-l>}H*jxc?b-R^hfWlflwB$*su+3matuXc ziJY9+nTnB2<2M_3s-i7_d~rUa6Zym6xu5+>-T~_$FABS1z;gfq002ovPDHLkV1gHg Bero^# diff --git a/AppKit/Resources/CPSearchField/CPSearchFieldSearch.png b/AppKit/Resources/CPSearchField/CPSearchFieldSearch.png deleted file mode 100644 index 49df1413960061ffd930535a2a5f1c95f6f934f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmV+$0p$LPP)P000&U1ONa4pSJ%!0002uNkl3f|m Date: Wed, 9 Jan 2013 18:29:18 -0800 Subject: [PATCH 4/6] Remove unused AppKit ressource --- AppKit/Resources/CPWindowResizeIndicator.png | Bin 134 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/CPWindowResizeIndicator.png diff --git a/AppKit/Resources/CPWindowResizeIndicator.png b/AppKit/Resources/CPWindowResizeIndicator.png deleted file mode 100644 index e966196a6b1d2cc4e80374a6c6e5006f59de19e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRKzMd|QArhC9f1GdNm2!V1@b7(> z^ACG_zK8#LELxT_7jXP9Kc@I6UaZ~V4qr)PtAfm-g!%;GfBGj6Bz(WmrgG-t*ZX`b iXP)vdQT=bsz_4R-=f;T)5vza(GkCiCxvX Date: Wed, 9 Jan 2013 18:29:56 -0800 Subject: [PATCH 5/6] Remove unused AppKit ressource --- AppKit/Resources/FIXME_ImageShadow.png | Bin 428 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/FIXME_ImageShadow.png diff --git a/AppKit/Resources/FIXME_ImageShadow.png b/AppKit/Resources/FIXME_ImageShadow.png deleted file mode 100644 index 5ce5682197f3b60645553fc05574f33ea65398d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r50wh%=tkf777>hk!978hhy}f6v(@lDib%~rnqZzYe`-P_MlWv9rf z>Qzxu;pf_x_{O6%GIA0lzvaUj4P2?G&NXUk8cHAQ$(hGEyToF-UoTgx7hmViH`~@k z7%a(u%u{hnRNSQ{f}>!c#@?5o!j1QIfc&CnVp)P?mTEy4X%oB+%A70=V)Fdry+ORmmRm+p9z1N zqieDM;K~LjE{z355)a}Txo_u*?y1wRvELD&u&df$Y)0kbsKrqoqVG-D`08Z}*M%L( zlfE`ZH~Sfn Date: Wed, 9 Jan 2013 18:30:25 -0800 Subject: [PATCH 6/6] Remove another unused AppKit ressource --- AppKit/Resources/HUDTheme/WindowClose.png | Bin 473 -> 0 bytes AppKit/Resources/HUDTheme/WindowCloseActive.png | Bin 547 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 AppKit/Resources/HUDTheme/WindowClose.png delete mode 100644 AppKit/Resources/HUDTheme/WindowCloseActive.png diff --git a/AppKit/Resources/HUDTheme/WindowClose.png b/AppKit/Resources/HUDTheme/WindowClose.png deleted file mode 100644 index dd9d7d72b94b2c7335e3f9a8a004bb66071e00bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmV;~0Ve*5P)g2YXHr3+g`7g$*6%7%nR6A{0_&Z0>x z=t4AYB9YF*Kk!42)2|@b=GnY+=9x2-8Q>qrkYbBBp5qR8jpw%bkn%?$lNxGBA%!!X zGG|CNq|^|ZektxLTqB8H#IeD|IVEwUPXEvrTcryeVhhWd$1F3?X%mOiiDSo<9U-a+#c<=MO|NgDoXNma5cb-A4=~ z7DsMDSB17gvA(9(QY|cJfmXuZ=v7a3Ok)!xOeS895?^~002ovPDHLkV1mpq|6c$A