This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 21a382d [NETBEANS-5195] Change icon for JSON files new 37aaec6 Merge pull request #2656 from mhalachev/NETBEANS-5195-Change-icon-for-JSON-files 21a382d is described below commit 21a382d6ec15dd2607730c3dc96b53fe8be103f2 Author: Martin Halachev <mhalac...@gmail.com> AuthorDate: Sat Jan 9 18:14:08 2021 +0200 [NETBEANS-5195] Change icon for JSON files https://issues.apache.org/jira/browse/NETBEANS-5195 --- webcommon/javascript2.editor/licenseinfo.xml | 5 +++ .../modules/javascript2/editor/JsonLanguage.java | 2 +- .../modules/javascript2/editor/resources/json.png | Bin 0 -> 454 bytes .../modules/javascript2/editor/resources/json.svg | 42 +++++++++++++++++++++ .../modules/javascript2/editor/resources/layer.xml | 4 +- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/webcommon/javascript2.editor/licenseinfo.xml b/webcommon/javascript2.editor/licenseinfo.xml index f271c5d..76a02ed 100644 --- a/webcommon/javascript2.editor/licenseinfo.xml +++ b/webcommon/javascript2.editor/licenseinfo.xml @@ -41,4 +41,9 @@ <license ref="Apache-2.0-ASF" /> <comment type="GUI_USABILITY" /> </fileset> + <fileset> + <file>src/org/netbeans/modules/javascript2/editor/resources/json.png</file> + <license ref="Apache-2.0-ASF" /> + <comment type="COMMENT_UNSUPPORTED" /> + </fileset> </licenseinfo> diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java index 4fd567d..e4756bd 100644 --- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java +++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java @@ -66,7 +66,7 @@ public class JsonLanguage extends DefaultLanguageConfig { ) @NbBundle.Messages("JsonResolver=JSON Files") @MultiViewElement.Registration(displayName = "#LBL_JsonEditorTab", - iconBase = "org/netbeans/modules/javascript2/editor/resources/javascript.png", + iconBase = "org/netbeans/modules/javascript2/editor/resources/json.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED, preferredID = "json.source", mimeType = JsTokenId.JSON_MIME_TYPE, diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png new file mode 100644 index 0000000..4f7a7ad Binary files /dev/null and b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png differ diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg new file mode 100644 index 0000000..7cdbb3b --- /dev/null +++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <defs> + <linearGradient id="a" x1="11.018" y1="2.049" x2="11.018" y2="14.51" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#d7e8f5"/> + <stop offset="1" stop-color="#a1cae9"/> + </linearGradient> + <linearGradient id="b" x1="11.018" y1="1.049" x2="11.018" y2="15.51" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#5e7f98"/> + <stop offset="1" stop-color="#435e73"/> + </linearGradient> + <linearGradient id="c" x1="3.971" y1="2.049" x2="3.971" y2="14.51" xlink:href="#a"/> + <linearGradient id="d" x1="3.971" y1="1.049" x2="3.971" y2="15.51" xlink:href="#b"/> + </defs> + <g style="isolation:isolate"> + <path d="M9.167,13.779a1.992,1.992,0,0,0,1.281-2.1v-1.4a2.013,2.013,0,0,1,1.1-2,2,2,0,0,1-1.1-2V5q0-1.791-1.274-2.216l.231-.73a3.026,3.026,0,0,1,1.622,1.032,3.061,3.061,0,0,1,.549,1.888V6.3q0,1.517,1.293,1.517v.92q-1.292,0-1.293,1.543v1.282a3.047,3.047,0,0,1-.552,1.911A3.074,3.074,0,0,1,9.4,14.51Z" fill="url(#a)"/> + <path d="M9.4,2.049a3.026,3.026,0,0,1,1.622,1.032,3.061,3.061,0,0,1,.549,1.888V6.3q0,1.517,1.293,1.517v.92q-1.292,0-1.293,1.543v1.282a3.047,3.047,0,0,1-.552,1.911A3.074,3.074,0,0,1,9.4,14.51l-.238-.731a1.992,1.992,0,0,0,1.281-2.1v-1.4a2.013,2.013,0,0,1,1.1-2,2,2,0,0,1-1.1-2V5q0-1.791-1.274-2.216l.231-.73m0-1a1,1,0,0,0-.953.7l-.231.73a1,1,0,0,0,.636,1.251c.192.064.591.2.591,1.267V6.283a3.331,3.331,0,0,0,.574,2,3.321,3.321,0,0,0-.574,2v1.4c-.024.961-.411,1.09-.6,1.151a1,1,0,0,0-.63 [...] + <path d="M5.587,14.51a3.021,3.021,0,0,1-1.625-1.044,3.122,3.122,0,0,1-.546-1.921V10.282q0-1.542-1.293-1.543v-.92q1.293,0,1.293-1.536V4.963a3.109,3.109,0,0,1,.546-1.876A3.017,3.017,0,0,1,5.587,2.049l.232.73Q4.544,3.205,4.544,5V6.277A2.091,2.091,0,0,1,3.525,8.282a2.12,2.12,0,0,1,1.019,2.026v1.307a2.016,2.016,0,0,0,1.275,2.164Z" fill="url(#c)"/> + <path d="M5.587,2.049l.232.73Q4.544,3.205,4.544,5V6.277A2.091,2.091,0,0,1,3.525,8.282a2.12,2.12,0,0,1,1.019,2.026v1.307a2.016,2.016,0,0,0,1.275,2.164l-.232.731a3.021,3.021,0,0,1-1.625-1.044,3.122,3.122,0,0,1-.546-1.921V10.282q0-1.542-1.293-1.543v-.92q1.293,0,1.293-1.536V4.963a3.109,3.109,0,0,1,.546-1.876A3.017,3.017,0,0,1,5.587,2.049m0-1a.963.963,0,0,0-.284.042,4,4,0,0,0-2.142,1.4,4.1,4.1,0,0,0-.745,2.465v1.33a.973.973,0,0,1-.088.509h0a.541.541,0,0,1-.2.027,1,1,0,0,0-1,1v.92a1,1, [...] + </g> +</svg> diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/layer.xml b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/layer.xml index c7476d4..a4fe423 100644 --- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/layer.xml +++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/layer.xml @@ -437,8 +437,8 @@ </folder> </folder> <folder name="x-json"> - <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javascript2/editor/resources/javascript.png"/> - <attr name="iconBase" stringvalue="org/netbeans/modules/javascript2/editor/resources/javascript.png"/> + <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/javascript2/editor/resources/json.png"/> + <attr name="iconBase" stringvalue="org/netbeans/modules/javascript2/editor/resources/json.png"/> <folder name="Actions"> <file name="CopyAction.shadow"> <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists