Skip to content

Commit

Permalink
Merge pull request #2627 from mbeddr/feature/new_icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Nov 26, 2024
2 parents ebe515d + 6c1d3a6 commit 09358e0
Show file tree
Hide file tree
Showing 97 changed files with 554 additions and 235 deletions.
2 changes: 2 additions & 0 deletions ...plications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">cc99dce1-49f3-4392-8dbf-e22ca47bd0af(org.modelix.model.api)</dependency>
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -52,6 +53,7 @@
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
<module reference="44ce4404-473f-43bf-a54c-40d7c6f01639(com.mbeddr.editingGuide)" version="0" />
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
Expand Down
Binary file removed code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/play.png
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions ...applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions ...orial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
<import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
<import index="ksrs" ref="cc99dce1-49f3-4392-8dbf-e22ca47bd0af/java:kotlin.coroutines(org.modelix.model.api/)" />
<import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
<import index="jz16" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:icons(MPS.ThirdParty/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
</imports>
Expand Down Expand Up @@ -768,12 +770,12 @@
<ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
<node concept="1oajcY" id="2QDtwSqDi2V" role="1oa70y" />
</node>
<node concept="1QGGSu" id="2QDtwSqDi2W" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/play.png" />
<node concept="1QGGSu" id="frftTv53d3" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/task.svg" />
</node>
</node>
<node concept="sE7Ow" id="2NmTaRWDjVL">
<property role="TrG5h" value="openUserGUide" />
<property role="TrG5h" value="openUserGuide" />
<property role="2uzpH1" value="mbeddr User Guide" />
<property role="1rBW0U" value="true" />
<node concept="tnohg" id="2NmTaRWDjZk" role="tncku">
Expand Down
15 changes: 0 additions & 15 deletions code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11427,21 +11427,6 @@
</node>
</node>
</node>
<node concept="398rNT" id="7eF9rfAuDUw" role="1l3spd">
<property role="TrG5h" value="mbeddr.analyses" />
<node concept="398BVA" id="7eF9rfAuDUx" role="398pKh">
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
<node concept="2Ry0Ak" id="7eF9rfAuDUy" role="iGT6I">
<property role="2Ry0Am" value="code" />
<node concept="2Ry0Ak" id="7eF9rfAuDUz" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="7eF9rfAuDU$" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.analyses" />
</node>
</node>
</node>
</node>
</node>
<node concept="398rNT" id="4MR$$QmqomQ" role="1l3spd">
<property role="TrG5h" value="artifacts.root" />
</node>
Expand Down
6 changes: 0 additions & 6 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20541,12 +20541,6 @@
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="6VdWf6S5EOM" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6VdWf6S5EOR" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.genericactions" />
<node concept="2Ry0Ak" id="6VdWf6S5EOW" role="2Ry0An">
<property role="2Ry0Am" value="icons" />
</node>
</node>
</node>
</node>
</node>
Expand Down
20 changes: 15 additions & 5 deletions ...ents/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
<import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
<import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
<import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
<import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
</imports>
<registry>
<language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
<concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
<property id="2756621024541341363" name="file" index="1iqoE4" />
<child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
</concept>
</language>
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
Expand Down Expand Up @@ -91,6 +92,9 @@
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
Expand Down Expand Up @@ -389,8 +393,11 @@
</node>
</node>
</node>
<node concept="1QGGSu" id="TFjNjjzKQ3" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/check.png" />
<node concept="1QGGSu" id="6ghi$I1W7AX" role="3Uehp1">
<node concept="10M0yZ" id="6ghi$I1WacR" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
<ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
</node>
</node>
</node>
<node concept="sE7Ow" id="3JD5OqKQTX6">
Expand Down Expand Up @@ -558,8 +565,11 @@
</node>
</node>
</node>
<node concept="1QGGSu" id="3JD5OqKQTYE" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/check.png" />
<node concept="1QGGSu" id="6ghi$I1WccG" role="3Uehp1">
<node concept="10M0yZ" id="6ghi$I1WdI0" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
<ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
</node>
</node>
</node>
<node concept="sE7Ow" id="7PQduOXsbmi">
Expand Down
Binary file removed ...anguages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/icons/check.png
View file
Binary file not shown.
24 changes: 17 additions & 7 deletions ...s/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
<import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
<import index="rpdm" ref="r:91453863-abdf-432d-a851-57f349774287(com.mbeddr.cc.var.annotations.behavior)" />
<import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
<import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
<import index="qdv7" ref="r:1ff3d952-eae5-4d94-b89e-ea3060b11545(com.mbeddr.cc.var.annotations.structure)" implicit="true" />
</imports>
<registry>
<language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
<concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
<property id="2756621024541341363" name="file" index="1iqoE4" />
<child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
</concept>
</language>
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
Expand Down Expand Up @@ -214,8 +215,11 @@
</node>
</node>
</node>
<node concept="1QGGSu" id="7QrLfqVNtaG" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/check.png" />
<node concept="1QGGSu" id="6ghi$I1WfLg" role="3Uehp1">
<node concept="10M0yZ" id="6ghi$I1WhbY" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
<ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
</node>
</node>
</node>
<node concept="sE7Ow" id="7TnSnE3by8X">
Expand Down Expand Up @@ -256,8 +260,11 @@
</node>
</node>
</node>
<node concept="1QGGSu" id="7TnSnE3by9m" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/check.png" />
<node concept="1QGGSu" id="6ghi$I1W04A" role="3Uehp1">
<node concept="10M0yZ" id="6ghi$I1W6I8" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
<ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
</node>
</node>
</node>
<node concept="sE7Ow" id="7TnSnE3byA0">
Expand Down Expand Up @@ -298,8 +305,11 @@
</node>
</node>
</node>
<node concept="1QGGSu" id="7TnSnE3byAp" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/check.png" />
<node concept="1QGGSu" id="6ghi$I1Wreg" role="3Uehp1">
<node concept="10M0yZ" id="6ghi$I1WsX_" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$Actions.Checked" resolve="Checked" />
<ref role="1PxDUh" to="z2i8:~AllIcons$Actions" resolve="Actions" />
</node>
</node>
</node>
<node concept="sE7Ow" id="7TnSnE3bz3Y">
Expand Down
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.png
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions ...guages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/assessment_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/down.png
View file
Binary file not shown.
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/left.png
View file
Binary file not shown.
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/nodelist.png
View file
Binary file not shown.
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/right.png
View file
Binary file not shown.
Binary file removed code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/icons/up.png
View file
Binary file not shown.
49 changes: 31 additions & 18 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
<import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" />
<import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
<import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
</imports>
<registry>
<language id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor">
Expand All @@ -87,7 +88,7 @@
</language>
<language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
<concept id="8974276187400029883" name="jetbrains.mps.lang.resources.structure.FileIcon" flags="ng" index="1QGGSu">
<property id="2756621024541341363" name="file" index="1iqoE4" />
<child id="6976585500156684809" name="iconExpression" index="3xaMm5" />
</concept>
<concept id="8974276187400029891" name="jetbrains.mps.lang.resources.structure.IconExpression" flags="nn" index="1QGGTA">
<child id="8974276187400029893" name="icon" index="1QGGTw" />
Expand Down Expand Up @@ -5647,8 +5648,11 @@
<ref role="3cqZAo" node="CPtprWNoG0" resolve="n" />
</node>
<node concept="1QGGTA" id="VuyCfHNr9y" role="37wK5m">
<node concept="1QGGSu" id="VuyCfHNr9z" role="1QGGTw">
<property role="1iqoE4" value="${module}/icons/up.png" />
<node concept="1QGGSu" id="frftTuZdvm" role="1QGGTw">
<node concept="10M0yZ" id="frftTuZfzF" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowUp" resolve="ArrowUp" />
<ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
</node>
</node>
</node>
</node>
Expand All @@ -5669,14 +5673,17 @@
<node concept="3Tm1VV" id="CPtprWNBIw" role="1B3o_S" />
<node concept="3clFbS" id="CPtprWNBIx" role="3clF47">
<node concept="3clFbF" id="CPtprWNBIy" role="3cqZAp">
<node concept="3P9mCS" id="CPtprWNBIz" role="3clFbG">
<node concept="3P9mCS" id="frftTv12qa" role="3clFbG">
<ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
<node concept="37vLTw" id="CPtprWNBI$" role="37wK5m">
<node concept="37vLTw" id="frftTv12qb" role="37wK5m">
<ref role="3cqZAo" node="CPtprWNBIt" resolve="n" />
</node>
<node concept="1QGGTA" id="VuyCfHNr1e" role="37wK5m">
<node concept="1QGGSu" id="VuyCfHNr1f" role="1QGGTw">
<property role="1iqoE4" value="${module}/icons/down.png" />
<node concept="1QGGTA" id="frftTv12qc" role="37wK5m">
<node concept="1QGGSu" id="frftTv12qd" role="1QGGTw">
<node concept="10M0yZ" id="frftTv12OJ" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowDown" resolve="ArrowDown" />
<ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
</node>
</node>
</node>
</node>
Expand All @@ -5697,14 +5704,17 @@
<node concept="3Tm1VV" id="CPtprWNBIE" role="1B3o_S" />
<node concept="3clFbS" id="CPtprWNBIF" role="3clF47">
<node concept="3clFbF" id="CPtprWNBIG" role="3cqZAp">
<node concept="3P9mCS" id="CPtprWNBIH" role="3clFbG">
<node concept="3P9mCS" id="frftTv13eb" role="3clFbG">
<ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
<node concept="37vLTw" id="CPtprWNBII" role="37wK5m">
<node concept="37vLTw" id="frftTv13ec" role="37wK5m">
<ref role="3cqZAo" node="CPtprWNBIB" resolve="n" />
</node>
<node concept="1QGGTA" id="VuyCfHNquM" role="37wK5m">
<node concept="1QGGSu" id="VuyCfHNquN" role="1QGGTw">
<property role="1iqoE4" value="${module}/icons/left.png" />
<node concept="1QGGTA" id="frftTv13ed" role="37wK5m">
<node concept="1QGGSu" id="frftTv13ee" role="1QGGTw">
<node concept="10M0yZ" id="frftTv13CL" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowLeft" resolve="ArrowLeft" />
<ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
</node>
</node>
</node>
</node>
Expand All @@ -5725,14 +5735,17 @@
<node concept="3Tm1VV" id="CPtprWNBIQ" role="1B3o_S" />
<node concept="3clFbS" id="CPtprWNBIR" role="3clF47">
<node concept="3clFbF" id="CPtprWNBIS" role="3cqZAp">
<node concept="3P9mCS" id="CPtprWNBIT" role="3clFbG">
<node concept="3P9mCS" id="frftTv142e" role="3clFbG">
<ref role="37wK5l" node="CPtprWNpe6" resolve="createButtonWithIcon" />
<node concept="37vLTw" id="CPtprWNBIU" role="37wK5m">
<node concept="37vLTw" id="frftTv142f" role="37wK5m">
<ref role="3cqZAo" node="CPtprWNBIN" resolve="n" />
</node>
<node concept="1QGGTA" id="VuyCfHNq67" role="37wK5m">
<node concept="1QGGSu" id="VuyCfHNqeq" role="1QGGTw">
<property role="1iqoE4" value="${module}/icons/right.png" />
<node concept="1QGGTA" id="frftTv142g" role="37wK5m">
<node concept="1QGGSu" id="frftTv142h" role="1QGGTw">
<node concept="10M0yZ" id="frftTv14sP" role="3xaMm5">
<ref role="3cqZAo" to="z2i8:~AllIcons$General.ArrowRight" resolve="ArrowRight" />
<ref role="1PxDUh" to="z2i8:~AllIcons$General" resolve="General" />
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 09358e0

Please sign in to comment.