Commit a9c8ab91 authored by Berke Viktor's avatar Berke Viktor
Browse files

Rename X-Tray to HexTray

parent 25a9a60b
......@@ -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">
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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
......@@ -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);
......
......@@ -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);
}
......
......@@ -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 */
......
......@@ -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
{
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment