diff --git a/src/GUI/ChatScreen.form b/src/GUI/ChatScreen.form
index a7545b5c89e879f4f64d350fecef2e6ef019a505..fc19ecab3953bc99aa5416516e99b31508b22226 100644
--- a/src/GUI/ChatScreen.form
+++ b/src/GUI/ChatScreen.form
@@ -20,7 +20,7 @@
<properties/>
<border type="none"/>
<children>
- <grid id="bad73" binding="myAreaPanel" layout-manager="GridLayoutManager" row-count="12" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+ <grid id="bad73" binding="myAreaPanel" layout-manager="GridLayoutManager" row-count="11" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="7" hsize-policy="1" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -30,7 +30,7 @@
<children>
<component id="a35da" class="javax.swing.JLabel" binding="managersNameLabel">
<constraints>
- <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font size="14" style="1"/>
@@ -39,12 +39,12 @@
</component>
<vspacer id="38e19">
<constraints>
- <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+ <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="98bbe" class="javax.swing.JLabel" binding="yourNameLabel">
<constraints>
- <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font size="14" style="1"/>
@@ -53,7 +53,7 @@
</component>
<component id="33d66" class="javax.swing.JLabel" binding="yourNameDisplay">
<constraints>
- <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Here goes User's Name"/>
@@ -62,7 +62,7 @@
<grid id="4212" binding="managersPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
- <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+ <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none" title="Manager's Tools"/>
@@ -100,7 +100,7 @@
</grid>
<component id="51b56" class="javax.swing.JLabel" binding="managersNameDisplay">
<constraints>
- <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Here goes Admin's Name"/>
@@ -108,7 +108,7 @@
</component>
<vspacer id="e9e96">
<constraints>
- <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+ <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="deaed" class="javax.swing.JButton" binding="exitThisRoomButton" default-binding="true">
@@ -119,14 +119,6 @@
<text value="Exit This Room"/>
</properties>
</component>
- <component id="bd8ec" class="javax.swing.JButton" binding="quitButton">
- <constraints>
- <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
- </constraints>
- <properties>
- <text value="Quit Program"/>
- </properties>
- </component>
</children>
</grid>
<grid id="5d886" binding="chatPanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/src/GUI/ChatScreen.java b/src/GUI/ChatScreen.java
index b36a1a53b732ce6027fb4fc3de3dec9c97b63ee4..1c70a5f1b6933fae7b920b0039b8e4af9dc4639a 100644
--- a/src/GUI/ChatScreen.java
+++ b/src/GUI/ChatScreen.java
@@ -30,7 +30,6 @@ public class ChatScreen {
private JPanel managersPanel;
private JPanel chatPanel;
private JButton exitThisRoomButton;
- private JButton quitButton;
private JFrame frame;
public Client getClient() {
@@ -44,7 +43,6 @@ public class ChatScreen {
this.client = client;
yourNameDisplay.setText(client.getUserName());
exitThisRoomButton.addActionListener(actionListener);
- quitButton.addActionListener(actionListener);
sendButton.addActionListener(actionListener);
kickOutButton.addActionListener(actionListener);
promoteToManagerButton.addActionListener(actionListener);
diff --git a/src/GUI/icon/circle.png b/src/GUI/icon/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c23e5a725c3b9d87d0765641e401184be837d24
Binary files /dev/null and b/src/GUI/icon/circle.png differ
diff --git a/src/GUI/icon/eraser.png b/src/GUI/icon/eraser.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5d98df4ca4a1a677baaf83a00fbc903f814119c
Binary files /dev/null and b/src/GUI/icon/eraser.png differ
diff --git a/src/GUI/icon/freehand.png b/src/GUI/icon/freehand.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d162ecd975889c2ff84b0b3e456a4d4115eb82f
Binary files /dev/null and b/src/GUI/icon/freehand.png differ
diff --git a/src/GUI/icon/line.png b/src/GUI/icon/line.png
new file mode 100644
index 0000000000000000000000000000000000000000..31156130a58ec6c455be88f00e470329cba61afd
Binary files /dev/null and b/src/GUI/icon/line.png differ
diff --git a/src/GUI/icon/oval.png b/src/GUI/icon/oval.png
new file mode 100644
index 0000000000000000000000000000000000000000..665c0a0c7c3b1eaa4ba51e6baa6c150f651f8b5f
Binary files /dev/null and b/src/GUI/icon/oval.png differ
diff --git a/src/GUI/icon/palette.png b/src/GUI/icon/palette.png
new file mode 100644
index 0000000000000000000000000000000000000000..813d7ffbe98d40089591256979bd1f21514abdc9
Binary files /dev/null and b/src/GUI/icon/palette.png differ
diff --git a/src/GUI/icon/rectangle.png b/src/GUI/icon/rectangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d8278acf49ff157270cc81e0967334936611ec
Binary files /dev/null and b/src/GUI/icon/rectangle.png differ
diff --git a/src/GUI/icon/square.png b/src/GUI/icon/square.png
new file mode 100644
index 0000000000000000000000000000000000000000..38657f5a2779b68ecab7d083e8c112b879bf77bc
Binary files /dev/null and b/src/GUI/icon/square.png differ
diff --git a/src/GUI/icon/text.png b/src/GUI/icon/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..33af1a2708cee9b502580ce4b6380c3a1d8740c8
Binary files /dev/null and b/src/GUI/icon/text.png differ