From 4c332eb03348a013bca1ce00e4e34e3dc5731b65 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 13 Mar 2014 15:23:58 +0000
Subject: [PATCH] Adding new icons for fork/join in TML component diag
---
src/ui/IconManager.java | 5 +++++
src/ui/TGUIAction.java | 4 ++--
src/ui/images/tmlcfork.gif | Bin 0 -> 111 bytes
src/ui/images/tmlcjoin.gif | Bin 0 -> 115 bytes
4 files changed, 7 insertions(+), 2 deletions(-)
create mode 100755 src/ui/images/tmlcfork.gif
create mode 100644 src/ui/images/tmlcjoin.gif
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index e2d3829b62..8407428880 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -123,6 +123,7 @@ public class IconManager {
// TML component task diagram
public static ImageIcon imgic1200, imgic1202, imgic1204, imgic1206, imgic1208;
+ public static ImageIcon imgic1210, imgic1212;
public static ImageIcon imgic1300, imgic1302, imgic1304, imgic1306, imgic1308;
public static ImageIcon imgic1310, imgic1312, imgic1314, imgic1316, imgic1318;
public static ImageIcon imgic1320, imgic1322, imgic1324, imgic1326, imgic1328;
@@ -470,6 +471,8 @@ public class IconManager {
private static String icon1204 = "images/tmlcompport.gif";
private static String icon1206 = "images/tmlprimport.gif";
private static String icon1208 = "images/tmlcompdiag.gif";
+ private static String icon1210 = "images/tmlcfork.gif";
+ private static String icon1212 = "images/tmlcjoin.gif";
private static String icon1300 = "images/stepforwardxtimeunits24.gif";
private static String icon1302 = "images/stepforwardtobreakpoint24.gif";
@@ -849,6 +852,8 @@ public class IconManager {
imgic1204 = getIcon(icon1204);
imgic1206 = getIcon(icon1206);
imgic1208 = getIcon(icon1208);
+ imgic1210 = getIcon(icon1210);
+ imgic1212 = getIcon(icon1212);
imgic1300 = getIcon(icon1300);
imgic1302 = getIcon(icon1302);
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index cfb406fe24..745449e343 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -807,8 +807,8 @@ public class TGUIAction extends AbstractAction {
actions[TMLCTD_COPORT] = new TAction("add-tmlccd-coport", "Add a primitive port", IconManager.imgic1206, IconManager.imgic1206, "Add a primitive port", "Add a primitive port to the currently opened TML component Task diagram", 0);
actions[TMLCTD_PORT_CONNECTOR] = new TAction("add-tmlccd-port-connector", "Add a connector between two ports", IconManager.imgic202, IconManager.imgic202, "Add a connector between two ports", "Add a connector between two ports of the currently opened TML component Task diagram", 0);
actions[TMLCTD_RCOMPONENT] = new TAction("add-tmlccd-rcomponent", "Add a record component", IconManager.imgic1202, IconManager.imgic1202, "Add a record component", "Add a record component to the currently opened TML component Task diagram", 0);
- actions[TMLCTD_FORK] = new TAction("add-tmlccd-fork", "Add a channel fork", IconManager.imgic1204, IconManager.imgic1204, "Add a channel fork", "Add a fork channel port to the currently opened TML component Task diagram", 0);
- actions[TMLCTD_JOIN] = new TAction("add-tmlccd-join", "Add a channel join", IconManager.imgic1204, IconManager.imgic1204, "Add a channel join", "Add a join channel port to the currently opened TML component Task diagram", 0);
+ actions[TMLCTD_FORK] = new TAction("add-tmlccd-fork", "Add a channel fork", IconManager.imgic1210, IconManager.imgic1210, "Add a channel fork", "Add a fork channel port to the currently opened TML component Task diagram", 0);
+ actions[TMLCTD_JOIN] = new TAction("add-tmlccd-join", "Add a channel join", IconManager.imgic1212, IconManager.imgic1212, "Add a channel join", "Add a join channel port to the currently opened TML component Task diagram", 0);
actions[TMLAD_EDIT] = new TAction("edit-tmlad-diagram", "Edit TML Task activity diagram", IconManager.imgic100, IconManager.imgic101, "Edit TML task activity diagram", "Make it possible to edit the currently opened TML task activity diagram", 0);
actions[TMLAD_CONNECTOR] = new TAction("add-tmlad-connector", "Connect two operators together", IconManager.imgic202, IconManager.imgic202, "Connect two operators together", "Connect two operators of the currently opened TML task activity diagram", 0);
diff --git a/src/ui/images/tmlcfork.gif b/src/ui/images/tmlcfork.gif
new file mode 100755
index 0000000000000000000000000000000000000000..ae3a1eb632c8c579d91f26ae3c53ceb1f9c9be26
GIT binary patch
literal 111
zcmZ?wbhEHb<Yy3ISjfl#1poj4KX?BZkW~D~=bM<4s!*O;lA+-4=^MbH_>+Z^i-DOz
z2c!<9gMmqJPCxs}ZHF34n3t(9b3M<vLql|G<)zMLp=w*+NC%w~?w+^xY)SDBqk2ZS
K7MBD@25SIodMAJY
literal 0
HcmV?d00001
diff --git a/src/ui/images/tmlcjoin.gif b/src/ui/images/tmlcjoin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1802d4c1b4ba60edb94bf656651f0466e03a5cdb
GIT binary patch
literal 115
zcmZ?wbhEHb<Yy3ISjfl#1poj4KX?BZkW~D~=bM<4s!*O;lA+-4=^MbH_>+Z^i-DOz
z2c!<9gMrCNrfp^Q>zfTVA2=?~6A?%?PUy_=c-9$pgEdBHwU3NP_~zC#3ToCB6(3tQ
NWMvC0e5|+_tO5QyC#C=Z
literal 0
HcmV?d00001
--
GitLab