From 6d9a2db991eb7c2a031f9a49a0864ed46734ac8c Mon Sep 17 00:00:00 2001
From: Hunter Kvalevog <hunterkva@gmail.com>
Date: Tue, 5 Mar 2019 23:03:49 -0600
Subject: [PATCH] Move IRC to Chat

---
 data/menu/nullified-ui.xml      |  1 -
 data/menu/nullifiedcat/chat.xml | 20 ++++++++++++++++++++
 data/menu/nullifiedcat/irc.xml  | 18 ------------------
 3 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 data/menu/nullifiedcat/irc.xml

diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml
index 5040f21c..2ef91519 100755
--- a/data/menu/nullified-ui.xml
+++ b/data/menu/nullified-ui.xml
@@ -10,7 +10,6 @@
             <Include path="nullifiedcat/movement.xml"/>
             <Include path="nullifiedcat/spyalert.xml"/>
             <Include path="nullifiedcat/misc.xml"/>
-            <Include path="nullifiedcat/irc.xml"/>
             <Include path="nullifiedcat/hackinfo.xml"/>
             <Include path="nullifiedcat/debug.xml"/>
         </TabContainer>
diff --git a/data/menu/nullifiedcat/chat.xml b/data/menu/nullifiedcat/chat.xml
index e202a8a8..38a58595 100755
--- a/data/menu/nullifiedcat/chat.xml
+++ b/data/menu/nullifiedcat/chat.xml
@@ -88,4 +88,24 @@
             <AutoVariable width="fill" target="chat.identify.answer" label="Counter Identify"/>
         </List>
     </Box>
+    <Box name="IRC" width="content" height="content" padding="12 6 6 6" x="170" y="185">
+        <List width="150">
+            <AutoVariable width="fill" target="irc.enabled" label="Enabled"/>
+            <AutoVariable width="fill" target="irc.anon" label="Hide real name"/>
+            <AutoVariable width="fill" target="irc.auth" label="Reveal to cathook users"/>
+            <AutoVariable width="fill" target="irc.address" label="Address"/>
+            <AutoVariable width="fill" target="irc.port" label="Port"/>
+            <AutoVariable width="fill" target="irc.channel" label="Channel"/>
+        </List>
+    </Box>
+    <Box name="Command & Control" width="content" height="content" padding="12 6 6 6" y="185">
+        <List width="150">
+            <AutoVariable width="fill" target="irc.cc.channel" label="Channel"/>
+            <AutoVariable width="fill" target="irc.cc.password" label="Password"/>
+            <AutoVariable width="fill" target="irc.cc.party" label="Autoparty"/>
+            <AutoVariable width="fill" target="irc.cc.respondparty" label="Respond Autoparty"/>
+            <AutoVariable width="fill" target="irc.cc.party-cooldown" label="Party cooldown"/>
+            <AutoVariable width="fill" target="irc.cc.party-size" label="Party maxsize"/>
+        </List>
+    </Box>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/irc.xml b/data/menu/nullifiedcat/irc.xml
deleted file mode 100644
index 1a08cc03..00000000
--- a/data/menu/nullifiedcat/irc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Tab name="IRC">
-    <Box width="content" height="content" padding="12 6 6 6">
-        <List width="250">
-            <AutoVariable width="fill" target="irc.enabled" label="Enabled"/>
-            <AutoVariable width="fill" target="irc.anon" label="Hide real name"/>
-            <AutoVariable width="fill" target="irc.auth" label="Reveal yourself to cathook users"/>
-            <AutoVariable width="fill" target="irc.address" label="Address"/>
-            <AutoVariable width="fill" target="irc.port" label="Port"/>
-            <AutoVariable width="fill" target="irc.channel" label="Channel"/>
-            <AutoVariable width="fill" target="irc.cc.channel" label="Command & Control Channel"/>
-            <AutoVariable width="fill" target="irc.cc.password" label="Command & Control Password"/>
-            <AutoVariable width="fill" target="irc.cc.party" label="Command & Control Autoparty"/>
-            <AutoVariable width="fill" target="irc.cc.respondparty" label="Command & Control Respond Autoparty"/>
-            <AutoVariable width="fill" target="irc.cc.party-cooldown" label="Command & Control Party cooldown"/>
-            <AutoVariable width="fill" target="irc.cc.party-size" label="Command & Control Party maxsize"/>
-        </List>
-    </Box>
-</Tab>