[Boxp-cvs] boxp/srv_trayicon trayicon.cpp,1.5,1.6 trayicon.dsp,1.1,1.2 trayicon.rc,1.3,1.4

[Javier A. \(RA\) <j_a...@us...>]

Update of /cvsroot/boxp/boxp/srv_trayicon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5588/srv_trayicon

Modified Files:
	trayicon.cpp trayicon.dsp trayicon.rc 
Log Message:
> [NEW] Hides the dialog when minimize it, like cli_extend does.
> [OPT] TrayIcon toolbar bitmap changed to 256 colors and new icons.
> [OPT] New Tray Icons, looks much better.

Index: trayicon.cpp
===================================================================
RCS file: /cvsroot/boxp/boxp/srv_trayicon/trayicon.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- trayicon.cpp	26 Sep 2005 22:15:30 -0000	1.5
+++ trayicon.cpp	31 Dec 2005 21:24:45 -0000	1.6
@@ -647,6 +647,7 @@
     {
 	// Initialize Tray Icon Stuff.------------------------------
     case WM_INITDIALOG: 
+		{
 			// Save Initial Data. Guardar Datos iniciales.
 			api->pSetWindowLong( hDlg,GWL_USERDATA,(LONG)lParam );
 
@@ -664,7 +665,11 @@
 			tictx->hBoxpBig	 =(HICON) api->pLoadImage( g_hInstance,MAKEINTRESOURCE(IDI_BOXP) ,IMAGE_ICON,32,32,0 );
 			tictx->hBoxpSmall=(HICON) api->pLoadImage( g_hInstance,MAKEINTRESOURCE(IDI_BOXP) ,IMAGE_ICON,16,16,0 );
 
-			tictx->hTBImageList=(HIMAGELIST) ImageList_LoadImage( g_hInstance,MAKEINTRESOURCE(IDB_TBIMGLIST),16,1,RGB(255,0,255),IMAGE_BITMAP,0 );
+			// Image list for toolbar
+			tictx->hTBImageList = ImageList_Create(16,18,ILC_COLORDDB|ILC_MASK,0,0);
+			HBITMAP bmp = (HBITMAP) LoadBitmap(g_hInstance,MAKEINTRESOURCE(IDB_TBIMGLIST));
+			ImageList_AddMasked(tictx->hTBImageList,bmp,RGB(255,0,255));
+
 			tictx->hToolBar = CreateToolBar( hDlg, tictx->hTBImageList, tictx->bAdmin );
 			
 			if (!AddTrayIcon( hDlg, TRAYICONID, tictx->hIcon1, STR_TRAYTIP_LISTEN ))
@@ -699,7 +704,7 @@
 				tictx->hCmdsMenu = GetSubMenu( tictx->hMainMenu, 4 );
 			}
 			return TRUE;
-	
+		}
 	// If our size was changed, we need to adjust our controls.
 	// Si nuestro tamanio es cambiado, necesitamos ajustar nuestros controles.
 	case WM_WINDOWPOSCHANGED:

Index: trayicon.dsp
===================================================================
RCS file: /cvsroot/boxp/boxp/srv_trayicon/trayicon.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trayicon.dsp	10 Sep 2004 21:54:13 -0000	1.1
+++ trayicon.dsp	31 Dec 2005 21:24:45 -0000	1.2
@@ -155,6 +155,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\boxpsrv.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\ico1.ico
 # End Source File
 # Begin Source File

Index: trayicon.rc
===================================================================
RCS file: /cvsroot/boxp/boxp/srv_trayicon/trayicon.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- trayicon.rc	19 Dec 2004 23:27:53 -0000	1.3
+++ trayicon.rc	31 Dec 2005 21:24:45 -0000	1.4
@@ -56,7 +56,7 @@
 // remains consistent on all systems.
 IDI_ICON1               ICON    DISCARDABLE     "res\\ico1.ico"
 IDI_ICON2               ICON    DISCARDABLE     "res\\ico2.ico"
-IDI_BOXP                ICON    DISCARDABLE     "res\\bo2k.ico"
+IDI_BOXP                ICON    DISCARDABLE     "res\\boxpsrv.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //