29 files changed, 7 insertions, 7 deletions

diff --git a/plugins/xtray/bitmaps/sd.bmp b/plugins/hextray/bitmaps/sd.bmp
index 9d6b7f95..9d6b7f95 100644
--- a/plugins/xtray/bitmaps/sd.bmp
+++ b/plugins/hextray/bitmaps/sd.bmp
Binary files differdiff --git a/plugins/xtray/callbacks.cpp b/plugins/hextray/callbacks.cpp
index c7de9626..c7de9626 100644
--- a/plugins/xtray/callbacks.cpp
+++ b/plugins/hextray/callbacks.cpp
diff --git a/plugins/xtray/callbacks.h b/plugins/hextray/callbacks.h
index 99cbae74..99cbae74 100644
--- a/plugins/xtray/callbacks.h
+++ b/plugins/hextray/callbacks.h
diff --git a/plugins/xtray/xtray.vcxproj b/plugins/hextray/hextray.vcxproj
index 305b3845..884e3110 100644
--- a/plugins/xtray/xtray.vcxproj
+++ b/plugins/hextray/hextray.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">

     <ProjectGuid>{3024CF36-85E5-4E00-9608-7002E2C7EF14}</ProjectGuid>

     <Keyword>Win32Proj</Keyword>

-    <RootNamespace>xtray</RootNamespace>

+    <RootNamespace>hextray</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

diff --git a/plugins/xtray/xtray.vcxproj.filters b/plugins/hextray/hextray.vcxproj.filters
index 637a896d..637a896d 100644
--- a/plugins/xtray/xtray.vcxproj.filters
+++ b/plugins/hextray/hextray.vcxproj.filters
diff --git a/plugins/xtray/xtray.vcxproj.user b/plugins/hextray/hextray.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/plugins/xtray/xtray.vcxproj.user
+++ b/plugins/hextray/hextray.vcxproj.user
diff --git a/plugins/xtray/icons/banned.ico b/plugins/hextray/icons/banned.ico
index fef8df8c..fef8df8c 100644
--- a/plugins/xtray/icons/banned.ico
+++ b/plugins/hextray/icons/banned.ico
Binary files differdiff --git a/plugins/xtray/icons/chan_msg.ico b/plugins/hextray/icons/chan_msg.ico
index 793d050e..793d050e 100644
--- a/plugins/xtray/icons/chan_msg.ico
+++ b/plugins/hextray/icons/chan_msg.ico
Binary files differdiff --git a/plugins/xtray/icons/disconnected.ico b/plugins/hextray/icons/disconnected.ico
index 9063e7e3..9063e7e3 100644
--- a/plugins/xtray/icons/disconnected.ico
+++ b/plugins/hextray/icons/disconnected.ico
Binary files differdiff --git a/plugins/xtray/icons/hexchat.ico b/plugins/hextray/icons/hexchat.ico
index 73247fd0..73247fd0 100644
--- a/plugins/xtray/icons/hexchat.ico
+++ b/plugins/hextray/icons/hexchat.ico
Binary files differdiff --git a/plugins/xtray/icons/highlight-1-3.ico b/plugins/hextray/icons/highlight-1-3.ico
index a759145b..a759145b 100644
--- a/plugins/xtray/icons/highlight-1-3.ico
+++ b/plugins/hextray/icons/highlight-1-3.ico
Binary files differdiff --git a/plugins/xtray/icons/highlight.ico b/plugins/hextray/icons/highlight.ico
index 625cca9a..625cca9a 100644
--- a/plugins/xtray/icons/highlight.ico
+++ b/plugins/hextray/icons/highlight.ico
Binary files differdiff --git a/plugins/xtray/icons/kicked.ico b/plugins/hextray/icons/kicked.ico
index 845a74e1..845a74e1 100644
--- a/plugins/xtray/icons/kicked.ico
+++ b/plugins/hextray/icons/kicked.ico
Binary files differdiff --git a/plugins/xtray/icons/priv_msg-1-2-2.ico b/plugins/hextray/icons/priv_msg-1-2-2.ico
index 7941ff77..7941ff77 100644
--- a/plugins/xtray/icons/priv_msg-1-2-2.ico
+++ b/plugins/hextray/icons/priv_msg-1-2-2.ico
Binary files differdiff --git a/plugins/xtray/icons/sd.ico b/plugins/hextray/icons/sd.ico
index ca179621..ca179621 100644
--- a/plugins/xtray/icons/sd.ico
+++ b/plugins/hextray/icons/sd.ico
Binary files differdiff --git a/plugins/xtray/icons/server_notice.ico b/plugins/hextray/icons/server_notice.ico
index ff765d87..ff765d87 100644
--- a/plugins/xtray/icons/server_notice.ico
+++ b/plugins/hextray/icons/server_notice.ico
Binary files differdiff --git a/plugins/xtray/resource.h b/plugins/hextray/resource.h
index b8008c2c..b8008c2c 100644
--- a/plugins/xtray/resource.h
+++ b/plugins/hextray/resource.h
diff --git a/plugins/xtray/resource.rc b/plugins/hextray/resource.rc
index b786cfbd..d2a60911 100644
--- a/plugins/xtray/resource.rc
+++ b/plugins/hextray/resource.rc
@@ -76,7 +76,7 @@ END
 IDD_PREF DIALOGEX 0, 0, 233, 190

 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 

     WS_SYSMENU

-CAPTION "X-Tray Preferences"

+CAPTION "HexTray Preferences"

 FONT 8, "Tahoma", 0, 0, 0x0

 BEGIN

     DEFPUSHBUTTON   "Ok",IDC_PREF_OK,57,173,50,14

@@ -91,7 +91,7 @@ FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN

     CONTROL         119,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN | 

                     WS_BORDER,3,6,88,81

-    CTEXT           "X-Tray\r\nBy: Michael Hotaling\r\n www.SinisterDevelopments.com",

+    CTEXT           "HexTray\r\nBy: Michael Hotaling\r\n www.SinisterDevelopments.com",

                     IDC_STATIC,95,33,118,30

     LTEXT           "Folken\r\nBasket\r\nDonatzsky\r\nDaemon404",IDC_STATIC,

                     15,103,64,33

@@ -236,12 +236,12 @@ BEGIN
         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "SinisterDevelopments"

-            VALUE "FileDescription", "X-Tray"

+            VALUE "FileDescription", "HexTray"

             VALUE "FileVersion", "1, 2, 4, 0"

-            VALUE "InternalName", "X-Tray"

+            VALUE "InternalName", "HexTray"

             VALUE "LegalCopyright", "Copyright © 2005"

-            VALUE "OriginalFilename", "xtray.dll"

-            VALUE "ProductName", "X-Tray - XChat Win32 System Tray Plugin"

+            VALUE "OriginalFilename", "hextray.dll"

+            VALUE "ProductName", "HexTray - HexChat Win32 System Tray Plugin"

             VALUE "ProductVersion", "1, 2, 4, 0"

         END

     END

diff --git a/plugins/xtray/sdAlerts.cpp b/plugins/hextray/sdAlerts.cpp
index 5e042806..5e042806 100644
--- a/plugins/xtray/sdAlerts.cpp
+++ b/plugins/hextray/sdAlerts.cpp
diff --git a/plugins/xtray/sdAlerts.h b/plugins/hextray/sdAlerts.h
index cd45a05b..cd45a05b 100644
--- a/plugins/xtray/sdAlerts.h
+++ b/plugins/hextray/sdAlerts.h
diff --git a/plugins/xtray/sdTray.cpp b/plugins/hextray/sdTray.cpp
index 3a91a61b..3a91a61b 100644
--- a/plugins/xtray/sdTray.cpp
+++ b/plugins/hextray/sdTray.cpp
diff --git a/plugins/xtray/sdTray.h b/plugins/hextray/sdTray.h
index 68469fe0..68469fe0 100644
--- a/plugins/xtray/sdTray.h
+++ b/plugins/hextray/sdTray.h
diff --git a/plugins/xtray/utility.cpp b/plugins/hextray/utility.cpp
index 66489bc0..66489bc0 100644
--- a/plugins/xtray/utility.cpp
+++ b/plugins/hextray/utility.cpp
diff --git a/plugins/xtray/utility.h b/plugins/hextray/utility.h
index 6bee8aed..6bee8aed 100644
--- a/plugins/xtray/utility.h
+++ b/plugins/hextray/utility.h
diff --git a/plugins/xtray/xchat.cpp b/plugins/hextray/xchat.cpp
index 47ce46a9..47ce46a9 100644
--- a/plugins/xtray/xchat.cpp
+++ b/plugins/hextray/xchat.cpp
diff --git a/plugins/xtray/xchat.h b/plugins/hextray/xchat.h
index 76452aeb..76452aeb 100644
--- a/plugins/xtray/xchat.h
+++ b/plugins/hextray/xchat.h
diff --git a/plugins/xtray/xtray.cpp b/plugins/hextray/xtray.cpp
index 69303fc5..69303fc5 100644
--- a/plugins/xtray/xtray.cpp
+++ b/plugins/hextray/xtray.cpp
diff --git a/plugins/xtray/xtray.def b/plugins/hextray/xtray.def
index 77670bf2..77670bf2 100644
--- a/plugins/xtray/xtray.def
+++ b/plugins/hextray/xtray.def
diff --git a/plugins/xtray/xtray.h b/plugins/hextray/xtray.h
index 56323cf2..56323cf2 100644
--- a/plugins/xtray/xtray.h
+++ b/plugins/hextray/xtray.h