From 3a8d4f91e500d8706e090463db3b4bf66eb6f6b5 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 16 Aug 2010 12:56:03 +0200 Subject: [PATCH] make xtray builds available and some cosmetics --- plugins/xtray/callbacks.cpp | 4 ++-- plugins/xtray/resource.rc | 12 ++++++------ plugins/xtray/utility.cpp | 6 +++--- plugins/xtray/xtray.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/xtray/callbacks.cpp b/plugins/xtray/callbacks.cpp index f6533281..e9be49dd 100644 --- a/plugins/xtray/callbacks.cpp +++ b/plugins/xtray/callbacks.cpp @@ -44,7 +44,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) TCHAR szTitle[10]; GetWindowText(hWnd, szTitle, 9); - if(_tcsstr(szTitle, _T("X-Chat ["))) + if(_tcsstr(szTitle, _T("XChat ["))) { g_hXchatWnd = hWnd; return false; @@ -339,7 +339,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam) if(msg == RegisterWindowMessage(_T("TaskbarCreated"))) { char szVersion[64]; - _snprintf(szVersion, 64, "X-Chat [%s]", xchat_get_info(ph, "version")); + _snprintf(szVersion, 64, "XChat-WDK [%s]", xchat_get_info(ph, "version")); AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG); } } diff --git a/plugins/xtray/resource.rc b/plugins/xtray/resource.rc index 0622aa2a..a0d327e1 100644 --- a/plugins/xtray/resource.rc +++ b/plugins/xtray/resource.rc @@ -32,7 +32,7 @@ IDD_EVENTS DIALOGEX 8, 20, 216, 143 STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD FONT 8, "Tahoma", 0, 0, 0x0 BEGIN - GROUPBOX "X-Chat Events",IDC_STATIC,5,5,205,77 + GROUPBOX "XChat Events",IDC_STATIC,5,5,205,77 CONTROL "Server Notice",9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 145,32,55,10 CONTROL "Topic Change",3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, @@ -62,13 +62,13 @@ BEGIN GROUPBOX "Options",IDC_STATIC,5,5,205,135 CONTROL "Auto away on minimize",11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,100,10 - CONTROL "Minimize X-Chat to the system tray",12,"Button", + CONTROL "Minimize XChat to the system tray",12,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,18,133,10 CONTROL "Minimize to the tray instead of closing",17,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,32,174,9 EDITTEXT IDC_AWAY_MSG,33,86,169,50,ES_AUTOHSCROLL LTEXT "Away Msg:",IDC_STATIC,27,72,35,8 - CONTROL "Remove X-Chat from the taskbar ( Only show in tray )", + CONTROL "Remove XChat from the taskbar (only show in tray)", 20,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,46,191,9 END @@ -108,7 +108,7 @@ BEGIN GROUPBOX "Version Information:",IDC_STATIC,101,92,109,49 LTEXT "1.2.3 PR",IDC_STATIC,170,105,33,8,0,WS_EX_RIGHT LTEXT "Compiled On: ",IDC_STATIC,110,116,46,8 - LTEXT "11/06/05",IDC_STATIC,174,117,30,8 + LTEXT "10/08/16",IDC_STATIC,174,117,30,8 LTEXT "Version Number:",IDC_STATIC,110,105,54,8 END @@ -249,8 +249,8 @@ BEGIN VALUE "FileVersion", "1, 2, 3, 0" VALUE "InternalName", "X-Tray" VALUE "LegalCopyright", "Copyright © 2005" - VALUE "OriginalFilename", "X-Tray.dll" - VALUE "ProductName", "X-Tray - X-Chat Win32 System Tray Plugin" + VALUE "OriginalFilename", "xtray.dll" + VALUE "ProductName", "X-Tray - XChat Win32 System Tray Plugin" VALUE "ProductVersion", "1, 2, 3, 0" END END diff --git a/plugins/xtray/utility.cpp b/plugins/xtray/utility.cpp index dd9dd29f..93f445fe 100644 --- a/plugins/xtray/utility.cpp +++ b/plugins/xtray/utility.cpp @@ -26,7 +26,7 @@ #include "callbacks.h" #include "resource.h" -TCHAR BACKUP_INI_FILE[] = _T(".\\plugins\\config\\xTray.ini"); +TCHAR BACKUP_INI_FILE[] = _T(".\\plugins\\config\\xtray.conf"); struct HOTKEY g_hHotKey; void SavePrefs(int iDlg) @@ -48,7 +48,7 @@ void SavePrefs(int iDlg) char temp[1024]; TCHAR TEMP_INI_FILE[1024]; - _snprintf(temp, 1024, "%s\\xtray.ini", xchat_get_info(ph, "xchatdir")); + _snprintf(temp, 1024, "%s\\xtray.conf", xchat_get_info(ph, "xchatdir")); ConvertString(temp, TEMP_INI_FILE, 1024); // ok this one is really ugly @@ -141,7 +141,7 @@ void LoadPrefs() char temp[1024]; TCHAR TEMP_INI_FILE[1024]; - _snprintf(temp, 1024, "%s\\xtray.ini", xchat_get_info(ph, "xchatdir")); + _snprintf(temp, 1024, "%s\\xtray.conf", xchat_get_info(ph, "xchatdir")); ConvertString(temp, TEMP_INI_FILE, 1024); if(FileExists(TEMP_INI_FILE)) diff --git a/plugins/xtray/xtray.cpp b/plugins/xtray/xtray.cpp index c9f1bd5e..8364952c 100644 --- a/plugins/xtray/xtray.cpp +++ b/plugins/xtray/xtray.cpp @@ -74,7 +74,7 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl ph = plugin_handle; *plugin_name = "X-Tray"; - *plugin_desc = "Minimize X-Chat to the windows systemtray"; + *plugin_desc = "Minimize XChat to the Windows system tray"; *plugin_version = "1.2.3 PR"; /***************************************************************************************************************************/ @@ -116,7 +116,7 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl /************************* Add our icon to the tray ************************************************************************/ /***************************************************************************************************************************/ char szVersion[64]; - _snprintf(szVersion, 64, "X-Chat [%s]", xchat_get_info(ph, "version")); + _snprintf(szVersion, 64, "XChat-WDK [%s]", xchat_get_info(ph, "version")); AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG); /***************************************************************************************************************************/