diff --git a/plugins/xtray/bitmaps/sd.bmp b/plugins/hextray/bitmaps/sd.bmp similarity index 100% rename from plugins/xtray/bitmaps/sd.bmp rename to plugins/hextray/bitmaps/sd.bmp diff --git a/plugins/xtray/callbacks.cpp b/plugins/hextray/callbacks.cpp similarity index 100% rename from plugins/xtray/callbacks.cpp rename to plugins/hextray/callbacks.cpp diff --git a/plugins/xtray/callbacks.h b/plugins/hextray/callbacks.h similarity index 100% rename from plugins/xtray/callbacks.h rename to plugins/hextray/callbacks.h diff --git a/plugins/xtray/xtray.vcxproj b/plugins/hextray/hextray.vcxproj similarity index 97% rename from plugins/xtray/xtray.vcxproj rename to plugins/hextray/hextray.vcxproj index 305b3845..884e3110 100644 --- a/plugins/xtray/xtray.vcxproj +++ b/plugins/hextray/hextray.vcxproj @@ -13,7 +13,7 @@ {3024CF36-85E5-4E00-9608-7002E2C7EF14} Win32Proj - xtray + hextray diff --git a/plugins/xtray/xtray.vcxproj.filters b/plugins/hextray/hextray.vcxproj.filters similarity index 100% rename from plugins/xtray/xtray.vcxproj.filters rename to plugins/hextray/hextray.vcxproj.filters diff --git a/plugins/xtray/xtray.vcxproj.user b/plugins/hextray/hextray.vcxproj.user similarity index 100% rename from plugins/xtray/xtray.vcxproj.user rename to plugins/hextray/hextray.vcxproj.user diff --git a/plugins/xtray/icons/banned.ico b/plugins/hextray/icons/banned.ico similarity index 100% rename from plugins/xtray/icons/banned.ico rename to plugins/hextray/icons/banned.ico diff --git a/plugins/xtray/icons/chan_msg.ico b/plugins/hextray/icons/chan_msg.ico similarity index 100% rename from plugins/xtray/icons/chan_msg.ico rename to plugins/hextray/icons/chan_msg.ico diff --git a/plugins/xtray/icons/disconnected.ico b/plugins/hextray/icons/disconnected.ico similarity index 100% rename from plugins/xtray/icons/disconnected.ico rename to plugins/hextray/icons/disconnected.ico diff --git a/plugins/xtray/icons/hexchat.ico b/plugins/hextray/icons/hexchat.ico similarity index 100% rename from plugins/xtray/icons/hexchat.ico rename to plugins/hextray/icons/hexchat.ico diff --git a/plugins/xtray/icons/highlight-1-3.ico b/plugins/hextray/icons/highlight-1-3.ico similarity index 100% rename from plugins/xtray/icons/highlight-1-3.ico rename to plugins/hextray/icons/highlight-1-3.ico diff --git a/plugins/xtray/icons/highlight.ico b/plugins/hextray/icons/highlight.ico similarity index 100% rename from plugins/xtray/icons/highlight.ico rename to plugins/hextray/icons/highlight.ico diff --git a/plugins/xtray/icons/kicked.ico b/plugins/hextray/icons/kicked.ico similarity index 100% rename from plugins/xtray/icons/kicked.ico rename to plugins/hextray/icons/kicked.ico diff --git a/plugins/xtray/icons/priv_msg-1-2-2.ico b/plugins/hextray/icons/priv_msg-1-2-2.ico similarity index 100% rename from plugins/xtray/icons/priv_msg-1-2-2.ico rename to plugins/hextray/icons/priv_msg-1-2-2.ico diff --git a/plugins/xtray/icons/sd.ico b/plugins/hextray/icons/sd.ico similarity index 100% rename from plugins/xtray/icons/sd.ico rename to plugins/hextray/icons/sd.ico diff --git a/plugins/xtray/icons/server_notice.ico b/plugins/hextray/icons/server_notice.ico similarity index 100% rename from plugins/xtray/icons/server_notice.ico rename to plugins/hextray/icons/server_notice.ico diff --git a/plugins/xtray/resource.h b/plugins/hextray/resource.h similarity index 100% rename from plugins/xtray/resource.h rename to plugins/hextray/resource.h diff --git a/plugins/xtray/resource.rc b/plugins/hextray/resource.rc similarity index 93% rename from plugins/xtray/resource.rc rename to 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 similarity index 100% rename from plugins/xtray/sdAlerts.cpp rename to plugins/hextray/sdAlerts.cpp diff --git a/plugins/xtray/sdAlerts.h b/plugins/hextray/sdAlerts.h similarity index 100% rename from plugins/xtray/sdAlerts.h rename to plugins/hextray/sdAlerts.h diff --git a/plugins/xtray/sdTray.cpp b/plugins/hextray/sdTray.cpp similarity index 100% rename from plugins/xtray/sdTray.cpp rename to plugins/hextray/sdTray.cpp diff --git a/plugins/xtray/sdTray.h b/plugins/hextray/sdTray.h similarity index 100% rename from plugins/xtray/sdTray.h rename to plugins/hextray/sdTray.h diff --git a/plugins/xtray/utility.cpp b/plugins/hextray/utility.cpp similarity index 100% rename from plugins/xtray/utility.cpp rename to plugins/hextray/utility.cpp diff --git a/plugins/xtray/utility.h b/plugins/hextray/utility.h similarity index 100% rename from plugins/xtray/utility.h rename to plugins/hextray/utility.h diff --git a/plugins/xtray/xchat.cpp b/plugins/hextray/xchat.cpp similarity index 100% rename from plugins/xtray/xchat.cpp rename to plugins/hextray/xchat.cpp diff --git a/plugins/xtray/xchat.h b/plugins/hextray/xchat.h similarity index 100% rename from plugins/xtray/xchat.h rename to plugins/hextray/xchat.h diff --git a/plugins/xtray/xtray.cpp b/plugins/hextray/xtray.cpp similarity index 100% rename from plugins/xtray/xtray.cpp rename to plugins/hextray/xtray.cpp diff --git a/plugins/xtray/xtray.def b/plugins/hextray/xtray.def similarity index 100% rename from plugins/xtray/xtray.def rename to plugins/hextray/xtray.def diff --git a/plugins/xtray/xtray.h b/plugins/hextray/xtray.h similarity index 100% rename from plugins/xtray/xtray.h rename to plugins/hextray/xtray.h diff --git a/src/common/util.c b/src/common/util.c index 27f0aa40..74146b21 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1885,10 +1885,10 @@ portable_mode () } int -xtray_mode () +hextray_mode () { #ifdef WIN32 - if ((_access( "plugins/xtray.dll", 0 )) != -1) + if ((_access( "plugins/hextray.dll", 0 )) != -1) { return 1; } diff --git a/src/common/util.h b/src/common/util.h index 82d74366..c2f1e118 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -58,6 +58,6 @@ guint32 str_ihash (const unsigned char *key); void safe_strcpy (char *dest, const char *src, int bytes_left); void canonalize_key (char *key); int portable_mode (); -int xtray_mode (); +int hextray_mode (); #endif diff --git a/src/common/xchat.c b/src/common/xchat.c index 1b9fd5a7..da33edbe 100644 --- a/src/common/xchat.c +++ b/src/common/xchat.c @@ -981,7 +981,7 @@ main (int argc, char *argv[]) * only works correctly when X-Tray is used, but it's not a big deal * since you can only minimize XChat to tray via the taskbar if you * use X-Tray*/ - if (xtray_mode ()) + if (hextray_mode ()) { /* FindWindow() doesn't support wildcards so we check all the open windows */ EnumWindows (enum_windows_impl, NULL); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 62a35746..c764e04a 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -1287,7 +1287,7 @@ mg_open_quit_dialog (gboolean minimize_button) gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); - if (minimize_button && !xtray_mode ()) + if (minimize_button && !hextray_mode ()) { button = gtk_button_new_with_mnemonic (_("_Minimize to Tray")); gtk_widget_show (button); @@ -1586,7 +1586,7 @@ mg_create_alertmenu (session *sess, GtkWidget *menu) mg_perchan_menu_item (_("Beep on _Message"), submenu, &sess->alert_beep, prefs.input_beep_chans); - if (!xtray_mode ()) /*disable this context menu item when xtray is loaded */ + if (!hextray_mode ()) /*disable this context menu item when HexTray is loaded */ { mg_perchan_menu_item (_("Blink Tray _Icon"), submenu, &sess->alert_tray, prefs.input_tray_chans); } diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 145e5c95..0dcc8f7f 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -732,7 +732,7 @@ tray_apply_setup (void) } else { - if (prefs.gui_tray && !xtray_mode ()) + if (prefs.gui_tray && !hextray_mode ()) tray_init (); } } @@ -764,7 +764,7 @@ tray_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL); - if (prefs.gui_tray && !xtray_mode ()) + if (prefs.gui_tray && !hextray_mode ()) tray_init (); return 1; /* return 1 for success */ diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index ffe9f4f0..c11bb474 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -376,7 +376,7 @@ static const setting alert_settings[] = {ST_END, 0, 0, 0, 0, 0} }; -static const setting alert_settings_xtray[] = +static const setting alert_settings_hextray[] = { {ST_HEADER, N_("Alerts"),0,0,0}, @@ -1802,9 +1802,9 @@ setup_create_pages (GtkWidget *box) setup_add_page (cata[4], book, setup_create_page (tabs_settings)); setup_add_page (cata[5], book, setup_create_color_page ()); - if (xtray_mode ()) + if (hextray_mode ()) { - setup_add_page (cata[8], book, setup_create_page (alert_settings_xtray)); + setup_add_page (cata[8], book, setup_create_page (alert_settings_hextray)); } else { diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index 799ee8bf..a9db3e24 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -121,7 +121,7 @@ copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" @@ -204,7 +204,7 @@ copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins" -copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins" +copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins" copy "$(OutDir)\xcwmpa.dll" "$(HexChatDest)\plugins" diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 3f223bad..13e10d3b 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsys", "..\plugins\winsys EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xsasl", "..\plugins\xsasl\xsasl.vcxproj", "{18871EBA-AC85-4652-8919-EB8064B9A714}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xtray", "..\plugins\xtray\xtray.vcxproj", "{3024CF36-85E5-4E00-9608-7002E2C7EF14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hextray", "..\plugins\hextray\hextray.vcxproj", "{3024CF36-85E5-4E00-9608-7002E2C7EF14}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpa", "..\plugins\wmpa\wmpa.vcxproj", "{E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}" EndProject diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 4f4613da..3d94ccb3 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -47,7 +47,7 @@ Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disabl Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xsasl"; Description: "X-SASL"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning @@ -173,7 +173,7 @@ Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys Source: "plugins\xcxsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xsasl -Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xtray +Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index afe7e6a9..c16ea7e0 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -46,7 +46,7 @@ Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disabl Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\xsasl"; Description: "X-SASL"; Types: full custom; Flags: disablenouninstallwarning -Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning +Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning @@ -174,7 +174,7 @@ Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "etc\system.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winsys Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winsys Source: "plugins\xcxsasl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xsasl -Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\xtray +Source: "plugins\hextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua