From 64c548c13f15f4308b5cd659065ab667930aa356 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 15 Aug 2020 01:45:47 -0500 Subject: [PATCH] Change filter button assets. Issue #2336 --- Mac/Base.lproj/MainWindow.storyboard | 37 +++++++++--------- .../filterActive.imageset/Contents.json | 18 +++++++-- .../filter-selected_Normal.png | Bin 0 -> 3566 bytes .../filter-selected_Normal@2x.png | Bin 0 -> 3712 bytes .../filterActive.imageset/filterActive.pdf | Bin 4139 -> 0 bytes .../filterInactive.imageset/Contents.json | 18 +++++++-- .../filter-unselected_Normal.png | Bin 0 -> 3596 bytes .../filter-unselected_Normal@2x.png | Bin 0 -> 3791 bytes .../filterInactive.pdf | Bin 4216 -> 0 bytes 9 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png create mode 100644 Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/filterActive.imageset/filterActive.pdf create mode 100644 Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png create mode 100644 Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal@2x.png delete mode 100644 Mac/Resources/Assets.xcassets/filterInactive.imageset/filterInactive.pdf diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard index 395954ad2..8272b9ddd 100644 --- a/Mac/Base.lproj/MainWindow.storyboard +++ b/Mac/Base.lproj/MainWindow.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -290,10 +291,10 @@ - + - + - + - + - + - + @@ -340,7 +341,7 @@ - + @@ -358,7 +359,7 @@ - + @@ -526,10 +527,10 @@ - + - + @@ -542,7 +543,7 @@ - + @@ -616,11 +617,11 @@ - - - + + + - + diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json b/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json index 6d8907a7a..a8b873158 100644 --- a/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json @@ -1,15 +1,25 @@ { "images" : [ { + "filename" : "filter-selected_Normal.png", "idiom" : "universal", - "filename" : "filterActive.pdf" + "scale" : "1x" + }, + { + "filename" : "filter-selected_Normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png b/Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png new file mode 100644 index 0000000000000000000000000000000000000000..c3c6a0e8bf72499de04c7643fd972aff2153795b GIT binary patch literal 3566 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 oG~DC^=XHY{%vidc5v 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 UR4sor8X+qK2aAYk7-)k32W9^wz5oCK diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json b/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json index 93ba12c1b..1bc9bbbe1 100644 --- a/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json +++ b/Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json @@ -1,15 +1,25 @@ { "images" : [ { + "filename" : "filter-unselected_Normal.png", "idiom" : "universal", - "filename" : "filterInactive.pdf" + "scale" : "1x" + }, + { + "filename" : "filter-unselected_Normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png b/Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png new file mode 100644 index 0000000000000000000000000000000000000000..28da341c40ac4db52dc77a8acb3f3e4c75e64067 GIT binary patch literal 3596 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