boxp-cvs Mailing List for Back Orifice XP
Status: Beta
Brought to you by:
j_aroche
Menu
▾
▴
boxp-cvs — BOXP CVS updates.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(20) |
Oct
(8) |
Nov
(3) |
Dec
(6) |
| 2006 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Javier A. \(RA\) <j_a...@us...> - 2006-01-21 17:32:06
|
Update of /cvsroot/boxp/boxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12189 Modified Files: changelog.txt Log Message: Cli_extend changes. Index: changelog.txt =================================================================== RCS file: /cvsroot/boxp/boxp/changelog.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- changelog.txt 31 Dec 2005 21:35:57 -0000 1.15 +++ changelog.txt 21 Jan 2006 17:31:53 -0000 1.16 @@ -68,6 +68,8 @@ is seleted. > [NEW] function added: IsObcured, determines if a window is overlapped with another window. + > [FIX] Drag Image fixed. + > [FIX] Wrong background colors used for treeview drag-and-drop targets. * srv_trayicon changes: > [FIX] When the BOXP server has more that one connection, trayicon crashes when gets the user name for the connected sockets. |
|
From: Javier A. \(RA\) <j_a...@us...> - 2006-01-09 19:25:07
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17453/cli_extend Modified Files: serverlist.cpp Log Message: Fix: wrong background colors used for drag-and-drop targets. Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- serverlist.cpp 7 Jan 2006 17:26:47 -0000 1.13 +++ serverlist.cpp 9 Jan 2006 19:24:57 -0000 1.14 @@ -69,6 +69,8 @@ // UninstallServerList function does the same call. // 11-Oct-05 * New: Delete confirmation messages in Server List. // 30-Nov-05 * New: Category treeview items painted with colors. +// 06-Jan-06 * Fix: Drag Image fixed. +// 08-Jan-06 * Fix: wrong background colors used for drag-and-drop targets // --------------------------------------------------- #include "main.h" @@ -2034,16 +2036,13 @@ TreeView_GetItem( ctx->hList, &itm ); pcat = (SRVCAT *)itm.lParam; + itm.state &= ~ (TVIS_EXPANDEDONCE|TVIS_EXPANDED); switch( itm.state ) { + case TVIS_DROPHILITED|TVIS_SELECTED: case TVIS_DROPHILITED: - if ( pcat!=NULL && pcat->c==1 ) - ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); - else - ptvcd->clrTextBk = GetSysColor(COLOR_WINDOW); - + ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - return CDRF_NEWFONT; break; @@ -2063,13 +2062,13 @@ // es categoria? if ( pcat==NULL ) { - //ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); } else if ( pcat->c==1 ) ptvcd->clrText = pcat->clrColor; else ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - //ptvcd->clrTextBk = GetSysColor(COLOR_WINDOW); + ptvcd->clrTextBk = GetSysColor(COLOR_WINDOW); return CDRF_NEWFONT; break; } |
|
From: Javier A. \(RA\) <j_a...@us...> - 2006-01-07 17:26:55
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9002/cli_extend Modified Files: serverlist.cpp Log Message: * Creates itseft the drag image. * Some fixes when painting items. Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- serverlist.cpp 31 Dec 2005 21:26:57 -0000 1.12 +++ serverlist.cpp 7 Jan 2006 17:26:47 -0000 1.13 @@ -1806,21 +1806,57 @@ LPNMTREEVIEW lpnmtv = (LPNMTREEVIEW) lParam; HIMAGELIST himl; TVITEM itm; + char sText[64]; - itm.mask = TVIF_PARAM; + itm.mask = TVIF_PARAM|TVIF_TEXT; + itm.pszText = sText; + itm.cchTextMax = 63; itm.hItem = lpnmtv->itemNew.hItem; TreeView_GetItem( ctx->hList, &itm ); if ( itm.lParam==NULL || ((SRVCAT *)itm.lParam)->c==1 ) return TRUE; - // Decir al control TreeView crear una imagen para usar en el arrastre. - // Tell the TreeView control create an image to use for dragging. - himl = TreeView_CreateDragImage(ctx->hList, lpnmtv->itemNew.hItem); + + // Create our Drag Image. + + // create memory dc compatible w/source window + RECT rc = {0,0,0,0}; + HDC htreedc = GetDC(ctx->hList); + HDC dctmp = CreateCompatibleDC(htreedc); + + // Use the same font + HFONT hOldFont = (HFONT)SelectObject(dctmp,(HFONT)SendMessage(ctx->hList,WM_GETFONT,0,0)); + + // size of the bitmap + DrawText(dctmp, sText, -1, &rc, DT_CALCRECT); + rc.right+=4; // add some extra space + + HBITMAP hbmp = CreateCompatibleBitmap(htreedc,rc.right,rc.bottom); + HBITMAP hOldbmp = (HBITMAP)SelectObject(dctmp,hbmp); + + // fill the bitmap + FillRect(dctmp,&rc,GetSysColorBrush(COLOR_HIGHLIGHT)); + SetBkMode(dctmp,TRANSPARENT); + SetTextColor(dctmp,GetSysColor(COLOR_WINDOWTEXT)); + + MoveToEx(dctmp,2,0,NULL); + DrawText(dctmp,sText, -1, &rc, DT_LEFT|DT_END_ELLIPSIS); + + SelectObject(dctmp,hOldFont); + SelectObject(dctmp,hOldbmp); + ReleaseDC(ctx->hList,dctmp); + himl = ImageList_Create(rc.right,rc.bottom,ILC_COLOR16|ILC_MASK, 0, 1); + ImageList_AddMasked(himl,hbmp,GetSysColor(COLOR_WINDOWTEXT)); + + + DeleteObject(hbmp); + ReleaseDC(ctx->hList,htreedc); + // Inicar operacion de arrastre // Start the drag operation. - ImageList_BeginDrag(himl, 0, 1, 1); + ImageList_BeginDrag(himl, 0, 0, 0); ScreenToClient(ctx->hList,&lpnmtv->ptDrag); ImageList_DragEnter(ctx->hList,lpnmtv->ptDrag.x,lpnmtv->ptDrag.y); @@ -1996,12 +2032,17 @@ itm.mask = TVIF_PARAM|TVIF_STATE; itm.stateMask = TVIS_DROPHILITED|TVIS_SELECTED; TreeView_GetItem( ctx->hList, &itm ); + pcat = (SRVCAT *)itm.lParam; switch( itm.state ) { case TVIS_DROPHILITED: - ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); + if ( pcat!=NULL && pcat->c==1 ) + ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); + else + ptvcd->clrTextBk = GetSysColor(COLOR_WINDOW); + + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); return CDRF_NEWFONT; break; @@ -2019,7 +2060,7 @@ break; default: - pcat = (SRVCAT *)itm.lParam; + // es categoria? if ( pcat==NULL ) { //ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); @@ -2060,8 +2101,8 @@ // Dibujar el elemento en la posicion actual del cursor // Drag the item to the current position of the mouse cursor. - RedrawWindow(ctx->hList,NULL,NULL,RDW_INVALIDATE); - ImageList_DragMove(pt.x, pt.y); + //RedrawWindow(ctx->hList,NULL,NULL,RDW_INVALIDATE); + ImageList_DragMove(pt.x-4, pt.y-4); // Obtener is el cursor esta sobre un elemento. Si es así, resaltar el elmento para soltar el objetivo. // Find out if the cursor is on the item. If it is, highlight the item as a drop target. @@ -2094,7 +2135,7 @@ TreeView_GetItem( ctx->hList, &tvi ); hPadre = TreeView_GetParent( ctx->hList, tvi.hItem ); - if ( tvi.lParam==NULL ) { + if ( tvi.lParam==NULL || tvi.lParam==-1) { // only root item have lParam=NULL. res = api->pSendMessage( hDlg, WM_CATEGORIZAR, (LPARAM)ctx->hDragItem, NULL ); |
|
From: Javier A. \(RA\) <j_a...@us...> - 2006-01-05 21:22:54
|
Update of /cvsroot/boxp/boxp/bogui/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3314/bogui/include Modified Files: resource.h Log Message: little changes in preferences page. Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/resource.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- resource.h 15 Oct 2005 17:48:35 -0000 1.9 +++ resource.h 5 Jan 2006 21:22:42 -0000 1.10 @@ -169,7 +169,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 150 +#define _APS_NEXT_RESOURCE_VALUE 153 #define _APS_NEXT_COMMAND_VALUE 40155 #define _APS_NEXT_CONTROL_VALUE 1096 #define _APS_NEXT_SYMED_VALUE 101 |
|
From: Javier A. \(RA\) <j_a...@us...> - 2006-01-05 21:22:50
|
Update of /cvsroot/boxp/boxp/bogui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3314/bogui Modified Files: bogui.rc Log Message: little changes in preferences page. Index: bogui.rc =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/bogui.rc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bogui.rc 15 Oct 2005 17:48:35 -0000 1.10 +++ bogui.rc 5 Jan 2006 21:22:42 -0000 1.11 @@ -382,7 +382,7 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "",IDOK,125,139,50,14 PUSHBUTTON "",IDCANCEL,69,139,50,14 @@ -416,12 +416,6 @@ 35,167,10 CONTROL "",IDC_CKSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 45,167,10 - GROUPBOX "",IDC_STC_STARTUP,7,97,123,52 - CONTROL "",IDC_RDWELCOME,"Button",BS_AUTORADIOBUTTON,13,110,113, - 9 - CONTROL "",IDC_RDNEWWS,"Button",BS_AUTORADIOBUTTON,13,121,114,10 - CONTROL "",IDC_RDLOADLSTWK,"Button",BS_AUTORADIOBUTTON,14,132, - 114,10 CONTROL "",IDC_CKSAVEATEXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,55,167,10 CONTROL "",IDC_CKFLATBTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, @@ -430,6 +424,12 @@ BS_MULTILINE | WS_TABSTOP,7,75,167,10 CONTROL "",IDC_CKDELDLG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 85,167,10 + GROUPBOX "",IDC_STC_STARTUP,7,97,123,52 + CONTROL "",IDC_RDWELCOME,"Button",BS_AUTORADIOBUTTON,13,110,113, + 9 + CONTROL "",IDC_RDNEWWS,"Button",BS_AUTORADIOBUTTON,13,121,114,10 + CONTROL "",IDC_RDLOADLSTWK,"Button",BS_AUTORADIOBUTTON,14,132, + 114,10 END IDD_FINDSRV DIALOGEX 0, 0, 172, 65 |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 21:36:05
|
Update of /cvsroot/boxp/boxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8382 Modified Files: changelog.txt Log Message: Last changes for BOXP.... Index: changelog.txt =================================================================== RCS file: /cvsroot/boxp/boxp/changelog.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- changelog.txt 15 Oct 2005 17:46:54 -0000 1.14 +++ changelog.txt 31 Dec 2005 21:35:57 -0000 1.15 @@ -15,7 +15,7 @@ - [NEW]: new feature. - [DIF]: modification. -beta 8 (??-Nov-05) +beta 8 (??-Feb-06) * FrameWork changes: > [NEW] Adding ChangeLanguage function, changes the current @@ -47,6 +47,9 @@ > [NEW] Delete confirmations added in Plugins dialog and ServerList. > [NEW] Changes in InteractiveDlgProc to support Most Recently Used server addresses. + > [OPT] New MainFrame/App icon. +* BOCFG chnages: + > [OPT] New Main Dialog/App icon. * cli_extend changes: > [FIX] The Background color of the ServerList isn't repainted when a window in from of this is minimized. WM_ERASEBKGND message disabled. @@ -58,10 +61,19 @@ > [FIX] Removed call to free(ctx,gs) when Destroys the ServerList window. UninstallServerList function does the same call. > [NEW] Delete confirmation messages in Server List. + > [NEW] Preference page added, with the following options: + - Autosave changes when minize to tray icon. + - Switch visibility on clicking the trayicon. + - Minimize to tray icon when: minize, close, minimize or close button + is seleted. + > [NEW] function added: IsObcured, determines if a window is overlapped + with another window. * srv_trayicon changes: > [FIX] When the BOXP server has more that one connection, trayicon crashes when gets the user name for the connected sockets. > [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. beta 7 (12-Sep-05) |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 21:27:07
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6089/cli_extend Modified Files: serverlist.cpp Log Message: Bug fix painting the root item. Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- serverlist.cpp 30 Nov 2005 16:25:02 -0000 1.11 +++ serverlist.cpp 31 Dec 2005 21:26:57 -0000 1.12 @@ -68,6 +68,7 @@ // > v0.94 24-Sep-05 * Fix: Removed call to free(ctx,gs) when Destroys the ServerList window. // UninstallServerList function does the same call. // 11-Oct-05 * New: Delete confirmation messages in Server List. +// 30-Nov-05 * New: Category treeview items painted with colors. // --------------------------------------------------- #include "main.h" @@ -2020,14 +2021,14 @@ default: pcat = (SRVCAT *)itm.lParam; // es categoria? - if ( pcat==NULL ) - ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - else if ( pcat->c==1 ) + if ( pcat==NULL ) { + //ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + } else if ( pcat->c==1 ) ptvcd->clrText = pcat->clrColor; else ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - //pTVCD->clrTextBk = m_tree.GetItemLineColor(hti); + //ptvcd->clrTextBk = GetSysColor(COLOR_WINDOW); return CDRF_NEWFONT; break; } |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 21:24:53
|
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" ///////////////////////////////////////////////////////////////////////////// // |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 17:44:15
|
Update of /cvsroot/boxp/boxp/boxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2782/boxp/include Modified Files: config.h Log Message: Changes for the New Config Model Index: config.h =================================================================== RCS file: /cvsroot/boxp/boxp/boxp/include/config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- config.h 18 Jul 2005 21:33:03 -0000 1.2 +++ config.h 31 Dec 2005 17:44:07 -0000 1.3 @@ -1,5 +1,5 @@ /* BOXP - Remote Administration Suite - Copyright (C) 2,003 - 2,005 BOXP Developers Team + Copyright (C) 2,003 - 2,006 BOXP Developers Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,6 +36,53 @@ char *svCategory; } VARIABLE_INFO, VI; +// 30-Dic-05: New configuration model. + +// Type of Config Variables +#define CFGVT_BOOL 1 // true or false values +#define CFGVT_NUM 2 // numeric values +#define CFGVT_STR 3 // string values +#define CFGVT_BIN 4 // binary values + +struct CFGCAT_INFO; // predef here. + +typedef struct { + // Properties + CFGCAT_INFO *pCat; // Category of this variable + char sVarID[16]; // Variable ID + char *sVarName; // Variable Name. + bool bStoreINI; // Allow store value in .INI files + unsigned short nCfgType; // Config Var Type. + + bool bValue; // boolean value + + // Numeric Values + DWORD nNumLo; // numeric Low bound + DWORD nNumHi; // numeric High bound + DWORD nValue; // numeric value + + //String/Binary Values + DWORD nValLen; // Max Lenght + void *pValue; // String/Bianry Value +} CFGVAR_INFO; //just so for now... + +// Police config. values callback function prototype. +// * pvar contains details about the variable an it's current value. +// * pValue is the new value that wants to police. +// * nValueLen is the size of pNewValue, useful for binary data. +// * pOut is the policed value... maybe a MD5 hash or a compress/emcrypted value +// * nOutLen is the output lenght... for binary data +// return false to reject the new value. +typedef bool (TYPEOF_PoliceCfgVal) (GS *gs, CFGVAR_INFO *pvar, void *pValue, DWORD nValueLen, void *pOut, DWORD nOutLen); + +typedef struct CFGCAT_INFO { + char sCatID[16]; // Category ID + char *sCatName; // Category Name + PLUGIN_INFO *pPlugin; // Plugin which owns the variables in this category + TYPEOF_PoliceCfgVal *pPolFunc; // Police Cfg Values callback function. + +} CFGCAT_INFO; +// end new stuff #ifdef _BOXPINTERNAL_ char * (BOAPI CFG_GetCfgStr) ( struct GS *gs, char *cfgstr, const char *key ); |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 17:43:31
|
Update of /cvsroot/boxp/boxp/bocfg/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2620/bocfg/res Added Files: boxpcfg.ico Log Message: New Icon --- NEW FILE: boxpcfg.ico --- (This appears to be a binary file; contents omitted.) |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-12-31 17:41:19
|
Update of /cvsroot/boxp/boxp/bogui/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2004/bogui/res Modified Files: boxpgui.ico Log Message: New Icon Index: boxpgui.ico =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/res/boxpgui.ico,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsMmbIdg and /tmp/cvsJ9H4VU differ |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-11-30 16:25:14
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27847/cli_extend Modified Files: cli_extend.rc resource.h serverlist.cpp serverlist.h Log Message: Enabling Category Colors. Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- serverlist.cpp 19 Oct 2005 21:38:09 -0000 1.10 +++ serverlist.cpp 30 Nov 2005 16:25:02 -0000 1.11 @@ -1631,6 +1631,52 @@ } // case IDC_CATDEL + // Cambiar el color de la categoria + // Change category color + case IDM_CATCOLOR: + { + SRVCAT *pcat; + TVITEM Itm; + + // obtener el elemento seleccionado. + // Get the selected item + Itm.hItem = TreeView_GetSelection( ctx->hList ); + if ( Itm.hItem==NULL ) + return TRUE; + + // Obtener la clase de elemento + // Get item type + Itm.mask = TVIF_IMAGE|TVIF_PARAM; + TreeView_GetItem( ctx->hList, &Itm ); + + if ( Itm.iImage!=3 ) // no es categoria + return TRUE; + + pcat = (SRVCAT *) Itm.lParam; + CHOOSECOLOR *clr= (CHOOSECOLOR *) fct->malloc(sizeof(CHOOSECOLOR),ggs); + DWORD *dwColors = (DWORD *) fct->malloc(sizeof(DWORD)*16,ggs); + + for (int i=0; i<16; i++) + dwColors[i]=RGB(255-(i*16),255-(i*16),255-(i*16)); + + clr->lStructSize= sizeof (CHOOSECOLOR); + clr->hwndOwner = hDlg; + clr->Flags = CC_RGBINIT|CC_FULLOPEN; + clr->lpCustColors = dwColors; + clr->rgbResult = pcat->clrColor; + + if ( ChooseColor(clr) ) { + pcat->clrColor = clr->rgbResult; + cli->pSetStatusText( ggs, cli->str.sSBclrchange ); + + } else + cli->pSetStatusText(ggs,cli->str.sStatusReady); + + fct->free(clr,ggs); + fct->free(dwColors,ggs); + return TRUE; + } // case IDM_CATCOLOR + // Notificaciones del control ComboBox // ComboBox notify messages case IDC_CAT: @@ -1931,6 +1977,64 @@ } return TRUE; } // case NM_RCLICK + + // Custom Draw Notify, used to paint Categories colors. + case NM_CUSTOMDRAW: + { + LPNMTVCUSTOMDRAW ptvcd = (LPNMTVCUSTOMDRAW)lParam; + + switch( ((NMCUSTOMDRAW *)lParam)->dwDrawStage ) { + case CDDS_PREPAINT : + SetWindowLong(hDlg,DWL_MSGRESULT,CDRF_NOTIFYITEMDRAW); + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + { + SRVCAT *pcat; + TVITEM itm; + itm.hItem = (HTREEITEM)ptvcd->nmcd.dwItemSpec; + itm.mask = TVIF_PARAM|TVIF_STATE; + itm.stateMask = TVIS_DROPHILITED|TVIS_SELECTED; + TreeView_GetItem( ctx->hList, &itm ); + + switch( itm.state ) + { + case TVIS_DROPHILITED: + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); + + return CDRF_NEWFONT; + break; + + case TVIS_SELECTED: + if (GetFocus()!=ctx->hList ) { + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + ptvcd->clrTextBk = GetSysColor(COLOR_3DFACE); + } else { + ptvcd->clrText = GetSysColor(COLOR_HIGHLIGHTTEXT); + ptvcd->clrTextBk = GetSysColor(COLOR_HIGHLIGHT); + } + + return CDRF_NEWFONT; + break; + + default: + pcat = (SRVCAT *)itm.lParam; + // es categoria? + if ( pcat==NULL ) + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + else if ( pcat->c==1 ) + ptvcd->clrText = pcat->clrColor; + else + ptvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); + + //pTVCD->clrTextBk = m_tree.GetItemLineColor(hti); + return CDRF_NEWFONT; + break; + } + } // case CDDS_ITEMPREPAINT + } + + } // case NM_CUSTOMDRAW } // switch (((LPNMHDR) lParam)->code) break; @@ -2161,6 +2265,7 @@ // agregar a la lista de categorias. pcat->c = 1; // (just a sign) pcat->nCRC = fct->CRC32_Checksum( (DWORD *)pcat->sNombre, 65 ); + pcat->clrColor = GetSysColor(COLOR_WINDOWTEXT); if ( ctx->pcats==NULL ) ctx->pcats = pcat; else { Index: serverlist.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- serverlist.h 8 Aug 2005 22:04:12 -0000 1.5 +++ serverlist.h 30 Nov 2005 16:25:02 -0000 1.6 @@ -61,6 +61,7 @@ HTREEITEM itm; // TreeView item id. struct srvcat *sig; // Siguiente Categoria. bool bExpandido; // Esta expandido? + COLORREF clrColor; // Category color } SRVCAT; // CLIEXT::ServerList Extension Context structure Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/resource.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- resource.h 7 Nov 2005 21:36:59 -0000 1.6 +++ resource.h 30 Nov 2005 16:25:02 -0000 1.7 @@ -67,13 +67,14 @@ #define IDMC_DELCAT 40007 #define IDM_TI_SHOW 40008 #define IDM_TI_EXIT 40009 +#define IDM_CATCOLOR 40010 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 128 -#define _APS_NEXT_COMMAND_VALUE 40010 +#define _APS_NEXT_COMMAND_VALUE 40011 #define _APS_NEXT_CONTROL_VALUE 1037 #define _APS_NEXT_SYMED_VALUE 101 #endif Index: cli_extend.rc =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/cli_extend.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cli_extend.rc 7 Nov 2005 21:36:58 -0000 1.6 +++ cli_extend.rc 30 Nov 2005 16:25:01 -0000 1.7 @@ -39,6 +39,7 @@ BEGIN MENUITEM "Edit Category", IDMC_EDITCAT MENUITEM "Delete Category", IDMC_DELCAT + MENUITEM "Set Color", IDM_CATCOLOR END POPUP "c3" BEGIN @@ -95,7 +96,7 @@ IDD_SRVLST DIALOGEX 0, 0, 379, 95 STYLE DS_SETFOREGROUND | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "",IDC_NEWMACHINE,4,17,16,14,BS_ICON | BS_LEFT | BS_TOP PUSHBUTTON "",IDC_DELETEMACHINE,4,32,16,14,BS_ICON | BS_LEFT | |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-11-07 21:37:11
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17283/cli_extend Modified Files: cli_extend.rc config.cpp resource.h trayicon.cpp Log Message: TrayIcon preferences completed. Index: config.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/config.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- config.cpp 31 Oct 2005 21:39:48 -0000 1.2 +++ config.cpp 7 Nov 2005 21:36:59 -0000 1.3 @@ -25,6 +25,8 @@ // > 0.94 16-Oct-05 * File added to the project. // * Preference page proc defined. // 19-Oct-05 * Auto Save changes prefereces added. +// 25-Oct-05 * TrayIcon preferences completed. +// 05-Nov-05 * Adding ServerList preferences. // --------------------------------------------------- #include "config.h" @@ -48,23 +50,32 @@ // poner las cadenas // set strings CLIEXT_STR *str = &g_Ctx->str; - SetDlgItemText(hDlg,IDC_SSRVLIST, str->sPFlblsrvlist); - SetDlgItemText(hDlg,IDC_STRAYICON,str->sPFlbltryicon); - SetDlgItemText(hDlg,IDC_CKAUTOSAVE,str->sPFckautosave); + SetDlgItemText(hDlg,IDC_SSRVLIST, str->sPFlblsrvlist); + SetDlgItemText(hDlg,IDC_STRAYICON, str->sPFlbltryicon); + SetDlgItemText(hDlg,IDC_CKAUTOSAVE, str->sPFckautosave); SetDlgItemText(hDlg,IDC_CKSWITCHONCLICK,str->sPFckswitchclick); - SetDlgItemText(hDlg,IDC_SMIN,str->sPFlblMinimize); + SetDlgItemText(hDlg,IDC_SMIN, str->sPFlblMinimize); + SetDlgItemText(hDlg,IDC_SSORT, str->sPFlblSortby); + SetDlgItemText(hDlg,IDC_CKINVSORT, str->sPFckInvSort); + SetDlgItemText(hDlg,IDC_CKRECONNECT,str->sPFckReconnect); + SetDlgItemText(hDlg,IDC_CKCATCOLOR, str->sPFckcatcolor); HWND hWnd = GetDlgItem(hDlg,IDC_CBTRAYACTION); api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 0, (LPARAM) str->sPFmsgMinSel); api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 1, (LPARAM) str->sPFmsgCloseSel); api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 2, (LPARAM) str->sPFmsgMinCloseSel); - api->pSendMessage( hWnd, CB_SETCURSEL, 0, 0 ); + api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_SETCURSEL, fct->ProfileReadInt(ggs,str->sINISectionName,str->sINIMintoTray,0), 0 ); + + hWnd = GetDlgItem(hDlg,IDC_CBSORT); + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 0, (LPARAM) str->sPFmsgName); + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 1, (LPARAM) str->sPFmsgAddress); + api->pSendMessage( GetDlgItem(hDlg,IDC_CBSORT), CB_SETCURSEL, fct->ProfileReadInt(ggs,str->sINISectionName,str->sINISrvLstSort,0), 0 ); // cargar valores. // Load values - CheckDlgButton(hDlg,IDC_CKAUTOSAVE ,fct->ProfileReadInt(ggs,"Client Extensions",str->sINIAutoSave,0)==1?BST_CHECKED:BST_UNCHECKED ); - CheckDlgButton(hDlg,IDC_CKSWITCHONCLICK ,fct->ProfileReadInt(ggs,"Client Extensions",str->sINISwitchOnClick,0)==1?BST_CHECKED:BST_UNCHECKED ); - api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_SETCURSEL, fct->ProfileReadInt(ggs,"Client Extensions",str->sINIMintoTray,0), 0 ); + CheckDlgButton(hDlg,IDC_CKAUTOSAVE ,fct->ProfileReadInt(ggs,str->sINISectionName,str->sINIAutoSave,0)==1?BST_CHECKED:BST_UNCHECKED ); + CheckDlgButton(hDlg,IDC_CKSWITCHONCLICK ,fct->ProfileReadInt(ggs,str->sINISectionName,str->sINISwitchOnClick,0)==1?BST_CHECKED:BST_UNCHECKED ); + if (ggs->Log) ggs->Log->AddStr( ggs, " >CliExtend: Preference page created.\r\n"); return TRUE; @@ -95,9 +106,10 @@ { // save values CLIEXT_STR *str = &g_Ctx->str; - fct->ProfileWriteInt( ggs,"Client Extensions",str->sINIAutoSave, IsDlgButtonChecked(hDlg,IDC_CKAUTOSAVE)==BST_CHECKED?1:0); - fct->ProfileWriteInt( ggs,"Client Extensions",str->sINISwitchOnClick,IsDlgButtonChecked(hDlg,IDC_CKSWITCHONCLICK)==BST_CHECKED?1:0); - fct->ProfileWriteInt( ggs,"Client Extensions",str->sINIMintoTray, api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_GETCURSEL, 0, 0 ) ); + fct->ProfileWriteInt( ggs,str->sINISectionName,str->sINIAutoSave, IsDlgButtonChecked(hDlg,IDC_CKAUTOSAVE)==BST_CHECKED?1:0); + fct->ProfileWriteInt( ggs,str->sINISectionName,str->sINISwitchOnClick,IsDlgButtonChecked(hDlg,IDC_CKSWITCHONCLICK)==BST_CHECKED?1:0); + fct->ProfileWriteInt( ggs,str->sINISectionName,str->sINIMintoTray, api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_GETCURSEL, 0, 0 ) ); + fct->ProfileWriteInt( ggs,str->sINISectionName,str->sINISrvLstSort, api->pSendMessage( GetDlgItem(hDlg,IDC_CBSORT), CB_GETCURSEL, 0, 0 ) ); SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); return TRUE; Index: trayicon.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/trayicon.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- trayicon.cpp 31 Oct 2005 21:39:48 -0000 1.5 +++ trayicon.cpp 7 Nov 2005 21:36:59 -0000 1.6 @@ -37,6 +37,7 @@ // close button is seleted. // * New function added: IsObcured, determines if a window // is overlapped with another window. +// 06-Nov-05 * Fix when switch the window visibility. /////////////////////////////////////////////////////////////////////////// #include "main.h" @@ -155,9 +156,11 @@ API *api=&ggs->api; if (message==WM_ACTIVATE) { - if ( (BOOL) HIWORD(wParam) ) { + short nPref = (short) ggs->fct.ProfileReadInt(ggs,g_Ctx->str.sINISectionName,g_Ctx->str.sINIMintoTray,0); + if ( (BOOL) HIWORD(wParam) && nPref!=1 ) { // Ocultar el main frame. // hide the main frame window. + api->pShowWindow(ggs->cli->hMainWnd,SW_HIDE); g_Ctx->tictx->bClose = true; return TRUE; @@ -170,12 +173,12 @@ FCT *fct = &ggs->fct; CLIEXT_STR *str = &g_Ctx->str; - short nPref = (short) fct->ProfileReadInt(ggs,"Client Extensions",str->sINIMintoTray,0); + short nPref = (short) fct->ProfileReadInt(ggs,str->sINISectionName,str->sINIMintoTray,0); if ( (wParam==SC_MINIMIZE && nPref!=1) || (wParam==SC_CLOSE && nPref!=0) ) { // guardar los cambios en el workspace ahora? // should save workspace changes now? - if ( fct->ProfileReadInt(ggs,"Client Extensions",str->sINIAutoSave,0)==1 && ggs->cli->bSave==true ) { + if ( fct->ProfileReadInt(ggs,str->sINISectionName,str->sINIAutoSave,0)==1 && ggs->cli->bSave==true ) { api->pSendMessage( ggs->cli->hMainWnd, WM_COMMAND, IDM_SAVEWRK, 0 ); } g_Ctx->tictx->bClose = false; @@ -203,7 +206,7 @@ { case WM_LBUTTONDOWN: - if ( api->pIsWindowVisible(ggs->cli->hMainWnd)==FALSE ) { + if ( api->pIsWindowVisible(hWnd)==FALSE || IsIconic(hWnd)) { api->pShowWindow(ggs->cli->hMainWnd,SW_RESTORE); SetForegroundWindow(hWnd); } else { @@ -211,7 +214,7 @@ // should hide the main frame when clicks on the tray icon? if ( IsObscured(hWnd) ) SetForegroundWindow(hWnd); - else if ( fct->ProfileReadInt(ggs,"Client Extensions",str->sINISwitchOnClick,0)==1 ) { + else if ( fct->ProfileReadInt(ggs,str->sINISectionName,str->sINISwitchOnClick,0)==1 ) { CloseWindow(hWnd); } } Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/resource.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- resource.h 31 Oct 2005 21:39:48 -0000 1.5 +++ resource.h 7 Nov 2005 21:36:59 -0000 1.6 @@ -48,6 +48,11 @@ #define IDC_CKSWITCHONCLICK 1029 #define IDC_CBTRAYACTION 1030 #define IDC_SMIN 1031 +#define IDC_SSORT 1032 +#define IDC_CBSORT 1033 +#define IDC_CKINVSORT 1034 +#define IDC_CKRECONNECT 1035 +#define IDC_CKCATCOLOR 1036 #define IDC_FIND 1080 #define IDC_SRVNAME 1081 #define IDC_SSRVNAME 1082 @@ -69,7 +74,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 128 #define _APS_NEXT_COMMAND_VALUE 40010 -#define _APS_NEXT_CONTROL_VALUE 1032 +#define _APS_NEXT_CONTROL_VALUE 1037 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif Index: cli_extend.rc =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/cli_extend.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cli_extend.rc 31 Oct 2005 21:39:48 -0000 1.5 +++ cli_extend.rc 7 Nov 2005 21:36:58 -0000 1.6 @@ -169,19 +169,28 @@ WS_VSCROLL | WS_TABSTOP END -IDD_PREFERENCES DIALOG DISCARDABLE 0, 0, 217, 153 +IDD_PREFERENCES DIALOG DISCARDABLE 0, 0, 235, 153 STYLE WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "",IDC_SSRVLIST,4,4,209,68 - GROUPBOX "",IDC_STRAYICON,4,78,209,71 + GROUPBOX "",IDC_SSRVLIST,4,4,227,68 + GROUPBOX "",IDC_STRAYICON,4,78,227,71 CONTROL "",IDC_CKAUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 11,90,174,13 + 10,90,174,13 CONTROL "",IDC_CKSWITCHONCLICK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,11,104,172,10 + WS_TABSTOP,10,104,172,10 LTEXT "",IDC_SMIN,12,117,174,9 - COMBOBOX IDC_CBTRAYACTION,12,130,144,50,CBS_DROPDOWNLIST | + COMBOBOX IDC_CBTRAYACTION,10,130,144,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_SSORT,10,13,55,9 + COMBOBOX IDC_CBSORT,69,11,107,40,CBS_DROPDOWNLIST | WS_DISABLED | + WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_CKINVSORT,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,182,12,43,11 + CONTROL "",IDC_CKRECONNECT,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,10,27,118,11 + CONTROL "",IDC_CKCATCOLOR,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,10,38,108,12 END @@ -221,7 +230,8 @@ IDD_PREFERENCES, DIALOG BEGIN LEFTMARGIN, 4 - RIGHTMARGIN, 213 + RIGHTMARGIN, 231 + VERTGUIDE, 10 TOPMARGIN, 4 BOTTOMMARGIN, 149 END |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-11-07 21:33:22
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16494/cli_extend Modified Files: main.cpp main.h Log Message: TrayIcon preferences completed. Adding serverlist preferences. Index: main.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- main.cpp 31 Oct 2005 21:39:48 -0000 1.11 +++ main.cpp 7 Nov 2005 21:33:13 -0000 1.12 @@ -86,10 +86,19 @@ "the Minimize button is selected\0" "the Close button is selected\0" "the Minimize or Close button is selected\0" +"Sort Servers by:\0" +"Invert\0" +"Connect to servers on startup.\0" +"Enable category colors.\0" +"Name\0" +"Address\0" +"Client Extensions\0" "AutoSaveChanges\0" "SwitchVisOnClick\0" "MinToTray\0" +"SrvLstSort\0" +"SrvLstInvSort\0" ; Index: main.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- main.h 31 Oct 2005 21:39:48 -0000 1.5 +++ main.h 7 Nov 2005 21:33:13 -0000 1.6 @@ -65,11 +65,20 @@ char *sPFmsgMinSel; // msg: minimize button is selected. char *sPFmsgCloseSel; // msg: close button is selected. char *sPFmsgMinCloseSel; // msg: minimize or close button is selected. + char *sPFlblSortby; // Label: Sort Servers by: + char *sPFckInvSort; // Label: Invert + char *sPFckReconnect; // Check: Connect to servers on startup. + char *sPFckcatcolor; // Check: Enable category colors. + char *sPFmsgName; // msg: Name + char *sPFmsgAddress; // msg: Address. // .INI keys (don't translate) + char *sINISectionName; // Section: Client Extensions char *sINIAutoSave; // Auto save workspace changes when minimize. char *sINISwitchOnClick; // switch visibility on clicking the tray icon char *sINIMintoTray; // Minimize to tray icon when... + char *sINISrvLstSort; // ServerList sort mode + char *sINIInvSLSort; // Invert ServerList Sort } CLIEXT_STR; // Client Extensions Context structure. |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-31 21:40:03
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3349/cli_extend Modified Files: cli_extend.rc config.cpp main.cpp main.h resource.h trayicon.cpp trayicon.h Log Message: Trayicon preferences completed. Index: main.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.cpp 19 Oct 2005 21:38:09 -0000 1.10 +++ main.cpp 31 Oct 2005 21:39:48 -0000 1.11 @@ -81,9 +81,16 @@ "Server List\0" "Tray Icon\0" "Auto-save workspace when minimizing to tray icon.\0" -"Show bogui on clicking the tray icon.\0" -; +"Switch visibility on clicking the tray icon.\0" +"Miminize to the system tray when:\0" +"the Minimize button is selected\0" +"the Close button is selected\0" +"the Minimize or Close button is selected\0" +"AutoSaveChanges\0" +"SwitchVisOnClick\0" +"MinToTray\0" +; // ------------- Function Implementations ------------------ Index: config.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/config.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- config.cpp 19 Oct 2005 21:38:09 -0000 1.1 +++ config.cpp 31 Oct 2005 21:39:48 -0000 1.2 @@ -24,6 +24,7 @@ // History: // > 0.94 16-Oct-05 * File added to the project. // * Preference page proc defined. +// 19-Oct-05 * Auto Save changes prefereces added. // --------------------------------------------------- #include "config.h" @@ -44,11 +45,26 @@ // Initailize Dialog ---------------------------------- case WM_INITDIALOG: { + // poner las cadenas + // set strings CLIEXT_STR *str = &g_Ctx->str; SetDlgItemText(hDlg,IDC_SSRVLIST, str->sPFlblsrvlist); SetDlgItemText(hDlg,IDC_STRAYICON,str->sPFlbltryicon); SetDlgItemText(hDlg,IDC_CKAUTOSAVE,str->sPFckautosave); - SetDlgItemText(hDlg,IDC_CKSHOWONCLICK,str->sPFckshowclick); + SetDlgItemText(hDlg,IDC_CKSWITCHONCLICK,str->sPFckswitchclick); + SetDlgItemText(hDlg,IDC_SMIN,str->sPFlblMinimize); + + HWND hWnd = GetDlgItem(hDlg,IDC_CBTRAYACTION); + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 0, (LPARAM) str->sPFmsgMinSel); + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 1, (LPARAM) str->sPFmsgCloseSel); + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 2, (LPARAM) str->sPFmsgMinCloseSel); + api->pSendMessage( hWnd, CB_SETCURSEL, 0, 0 ); + + // cargar valores. + // Load values + CheckDlgButton(hDlg,IDC_CKAUTOSAVE ,fct->ProfileReadInt(ggs,"Client Extensions",str->sINIAutoSave,0)==1?BST_CHECKED:BST_UNCHECKED ); + CheckDlgButton(hDlg,IDC_CKSWITCHONCLICK ,fct->ProfileReadInt(ggs,"Client Extensions",str->sINISwitchOnClick,0)==1?BST_CHECKED:BST_UNCHECKED ); + api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_SETCURSEL, fct->ProfileReadInt(ggs,"Client Extensions",str->sINIMintoTray,0), 0 ); if (ggs->Log) ggs->Log->AddStr( ggs, " >CliExtend: Preference page created.\r\n"); return TRUE; @@ -77,6 +93,12 @@ case PSN_KILLACTIVE: { + // save values + CLIEXT_STR *str = &g_Ctx->str; + fct->ProfileWriteInt( ggs,"Client Extensions",str->sINIAutoSave, IsDlgButtonChecked(hDlg,IDC_CKAUTOSAVE)==BST_CHECKED?1:0); + fct->ProfileWriteInt( ggs,"Client Extensions",str->sINISwitchOnClick,IsDlgButtonChecked(hDlg,IDC_CKSWITCHONCLICK)==BST_CHECKED?1:0); + fct->ProfileWriteInt( ggs,"Client Extensions",str->sINIMintoTray, api->pSendMessage( GetDlgItem(hDlg,IDC_CBTRAYACTION), CB_GETCURSEL, 0, 0 ) ); + SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); return TRUE; } @@ -96,3 +118,4 @@ } return FALSE; } + Index: trayicon.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/trayicon.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- trayicon.cpp 15 Sep 2005 19:45:29 -0000 1.4 +++ trayicon.cpp 31 Oct 2005 21:39:48 -0000 1.5 @@ -30,11 +30,50 @@ // > v0.93 14-Sep-05 * Trayicon Inteface working now. Hides MainFrame when it's // minimized. On left click shows the MainFrame. On right // click shows the context menu. +// > v0.94 25-Oct-05 * New preferences added: +// - Autosave changes when minize to tray icon. +// - Switch visibility on clicking the trayicon. +// - Minimize to tray icon when: minize, close, minimize or +// close button is seleted. +// * New function added: IsObcured, determines if a window +// is overlapped with another window. /////////////////////////////////////////////////////////////////////////// #include "main.h" #include "trayicon.h" #include "resource.h" +#include <resource.h> + +BOOL IsObscured (HWND hWnd) +{ + // look up the z-order for any overlapping windows + RECT rWnd; + GetWindowRect(hWnd, &rWnd); + + BOOL bTopMost = (GetWindowLong(hWnd, GWL_EXSTYLE) & WS_EX_TOPMOST); + HWND hWndPrev = GetWindow(hWnd, GW_HWNDPREV); + + while (hWndPrev) + { + // ignore hidden windows and topmost windows + // unless we're topmost too + BOOL bPrevTopMost = (::GetWindowLong(hWndPrev, GWL_EXSTYLE) & WS_EX_TOPMOST); + + if ((!bPrevTopMost || bTopMost) && IsWindowVisible(hWndPrev)) + { + RECT rPrev, rInt; + GetWindowRect(hWndPrev, &rPrev); + + if (IntersectRect(&rInt, &rWnd, &rPrev)) + return TRUE; + } + hWndPrev = GetWindow(hWndPrev, GW_HWNDPREV); + } + + // nope + return FALSE; +} + LRESULT SubMainFrmProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -53,6 +92,7 @@ return false; g_Ctx->tictx->hMenu = LoadMenu(g_hInstance,MAKEINTRESOURCE(IDR_CTX)); + g_Ctx->tictx->bClose = true; tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = cli->hMainWnd; @@ -110,27 +150,71 @@ if (gs->Log) gs->Log->AddStr(gs," >CliExtend: Tray Icon Uninstalled.\r\n" ); } -LRESULT SubMainFrmProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT SubMainFrmProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { API *api=&ggs->api; if (message==WM_ACTIVATE) { - if ( (BOOL) HIWORD(wParam) ) + if ( (BOOL) HIWORD(wParam) ) { + // Ocultar el main frame. + // hide the main frame window. api->pShowWindow(ggs->cli->hMainWnd,SW_HIDE); + g_Ctx->tictx->bClose = true; + return TRUE; + } + return CallWindowProcA(g_Ctx->pOldMainFrameProc,hWnd,message,wParam,lParam); + } - return CallWindowProcA(g_Ctx->pOldMainFrameProc,ggs->cli->hMainWnd,message,wParam,lParam); + if (message==WM_SYSCOMMAND) + { + FCT *fct = &ggs->fct; + CLIEXT_STR *str = &g_Ctx->str; + + short nPref = (short) fct->ProfileReadInt(ggs,"Client Extensions",str->sINIMintoTray,0); + + if ( (wParam==SC_MINIMIZE && nPref!=1) || (wParam==SC_CLOSE && nPref!=0) ) { + // guardar los cambios en el workspace ahora? + // should save workspace changes now? + if ( fct->ProfileReadInt(ggs,"Client Extensions",str->sINIAutoSave,0)==1 && ggs->cli->bSave==true ) { + api->pSendMessage( ggs->cli->hMainWnd, WM_COMMAND, IDM_SAVEWRK, 0 ); + } + g_Ctx->tictx->bClose = false; + } + return CallWindowProcA(g_Ctx->pOldMainFrameProc,hWnd,message,wParam,lParam); + } + + // minize or close the main frame? + if ( message==WM_CLOSE ) { + + if ( !g_Ctx->tictx->bClose ) { + api->pShowWindow(ggs->cli->hMainWnd,SW_HIDE); + g_Ctx->tictx->bClose = true; + return 0; + } else + return CallWindowProcA(g_Ctx->pOldMainFrameProc,hWnd,message,wParam,lParam); } if (message==WM_TRAYICON) { if ( ((UINT)wParam) == TRAYICONID ) { + FCT *fct = &ggs->fct; + CLIEXT_STR *str = &g_Ctx->str; switch((UINT) lParam) { - // Show the Main Dialog --------------------------------------- + case WM_LBUTTONDOWN: - if ( api->pIsWindowVisible(ggs->cli->hMainWnd)==FALSE ) + if ( api->pIsWindowVisible(ggs->cli->hMainWnd)==FALSE ) { api->pShowWindow(ggs->cli->hMainWnd,SW_RESTORE); - SetForegroundWindow(hDlg); + SetForegroundWindow(hWnd); + } else { + // deberia ocultar el main frame al hacer click en el icono? + // should hide the main frame when clicks on the tray icon? + if ( IsObscured(hWnd) ) + SetForegroundWindow(hWnd); + else if ( fct->ProfileReadInt(ggs,"Client Extensions",str->sINISwitchOnClick,0)==1 ) { + CloseWindow(hWnd); + } + } return TRUE; case WM_RBUTTONDOWN: @@ -138,12 +222,12 @@ GetCursorPos(&pt); HMENU hSM = GetSubMenu( g_Ctx->tictx->hMenu, 2 ); - DWORD nCmd = TrackPopupMenu(hSM,TPM_RETURNCMD|TPM_NONOTIFY,pt.x,pt.y,0,hDlg,NULL); + DWORD nCmd = TrackPopupMenu(hSM,TPM_RETURNCMD|TPM_NONOTIFY,pt.x,pt.y,0,hWnd,NULL); switch(nCmd) { case IDM_TI_SHOW: if ( api->pIsWindowVisible(ggs->cli->hMainWnd)==FALSE ) api->pShowWindow(ggs->cli->hMainWnd,SW_RESTORE); - SetForegroundWindow(hDlg); + SetForegroundWindow(hWnd); return TRUE; case IDM_TI_EXIT: if ( api->pIsWindowVisible(ggs->cli->hMainWnd)==FALSE ) @@ -155,5 +239,5 @@ } return TRUE; } - return CallWindowProcA(g_Ctx->pOldMainFrameProc,ggs->cli->hMainWnd,message,wParam,lParam); + return CallWindowProcA(g_Ctx->pOldMainFrameProc,hWnd,message,wParam,lParam); } \ No newline at end of file Index: main.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- main.h 19 Oct 2005 21:38:09 -0000 1.4 +++ main.h 31 Oct 2005 21:39:48 -0000 1.5 @@ -55,11 +55,21 @@ char *sFndSrvthrdname; // FindSrv Thread name char *sFSallcats; // Msg: "(All categories)" + // Preferences page strings char *sPFtitle; // Preference page title. char *sPFlblsrvlist; // Label: server list char *sPFlbltryicon; // Label: Tray Icon char *sPFckautosave; // Check: Auto save changes - char *sPFckshowclick; // Check: Show on Click + char *sPFckswitchclick; // Check: Switch visibility + char *sPFlblMinimize; // Label: Minimize to the system tray when: + char *sPFmsgMinSel; // msg: minimize button is selected. + char *sPFmsgCloseSel; // msg: close button is selected. + char *sPFmsgMinCloseSel; // msg: minimize or close button is selected. + + // .INI keys (don't translate) + char *sINIAutoSave; // Auto save workspace changes when minimize. + char *sINISwitchOnClick; // switch visibility on clicking the tray icon + char *sINIMintoTray; // Minimize to tray icon when... } CLIEXT_STR; // Client Extensions Context structure. Index: cli_extend.rc =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/cli_extend.rc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cli_extend.rc 19 Oct 2005 21:38:09 -0000 1.4 +++ cli_extend.rc 31 Oct 2005 21:39:48 -0000 1.5 @@ -176,13 +176,12 @@ GROUPBOX "",IDC_SSRVLIST,4,4,209,68 GROUPBOX "",IDC_STRAYICON,4,78,209,71 CONTROL "",IDC_CKAUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 11,90,171,13 - CONTROL "",IDC_CKSHOWONCLICK,"Button",BS_AUTOCHECKBOX | + 11,90,174,13 + CONTROL "",IDC_CKSWITCHONCLICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,104,172,10 - LTEXT "Miminize to the system tray when:",IDC_STATIC,12,117, - 129,9 - COMBOBOX IDC_COMBO1,12,130,144,15,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_SMIN,12,117,174,9 + COMBOBOX IDC_CBTRAYACTION,12,130,144,50,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP END Index: trayicon.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/trayicon.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- trayicon.h 15 Sep 2005 19:45:29 -0000 1.4 +++ trayicon.h 31 Oct 2005 21:39:48 -0000 1.5 @@ -29,6 +29,7 @@ // Client Extensions :: Tray Icon context. typedef struct { HMENU hMenu; // Trayicon context menu. + bool bClose; // should close window } CETRAYICON_CTX; extern bool BOAPI InstallTrayIconExtension ( GS *gs ); Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/resource.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- resource.h 19 Oct 2005 21:38:09 -0000 1.4 +++ resource.h 31 Oct 2005 21:39:48 -0000 1.5 @@ -45,8 +45,9 @@ #define IDC_SSRVLIST 1026 #define IDC_STRAYICON 1027 #define IDC_CKAUTOSAVE 1028 -#define IDC_CKSHOWONCLICK 1029 -#define IDC_COMBO1 1030 +#define IDC_CKSWITCHONCLICK 1029 +#define IDC_CBTRAYACTION 1030 +#define IDC_SMIN 1031 #define IDC_FIND 1080 #define IDC_SRVNAME 1081 #define IDC_SSRVNAME 1082 @@ -68,7 +69,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 128 #define _APS_NEXT_COMMAND_VALUE 40010 -#define _APS_NEXT_CONTROL_VALUE 1031 +#define _APS_NEXT_CONTROL_VALUE 1032 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-19 21:38:18
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31297/cli_extend Modified Files: cli_extend.dsp cli_extend.rc main.cpp main.h resource.h serverlist.cpp Added Files: config.cpp config.h Log Message: adding preference page. --- NEW FILE: config.h --- /* Client Extensions for Back Orifice XP Copyright (C) 2,004 - 2,005 Javier Aroche This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > Autor: Javier Aroche, j_aroche at users dot sourceforge dot net */ #ifndef __CONFIG_EXT_H_ #define __CONFIG_EXT_H_ #include <srv_linkage.h> extern BOOL CALLBACK PrefDlgProc ( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); #endif Index: main.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- main.cpp 15 Oct 2005 18:03:56 -0000 1.9 +++ main.cpp 19 Oct 2005 21:38:09 -0000 1.10 @@ -28,10 +28,14 @@ // 27-Jul-05 * Some changes to improve the installation/uninstallation // of the extensions. // 07-Aug-05 * Linking main.h header. +// > v0.94 16-Oct-05 * Linking to config.h +// * Register cli_extend preference page. // --------------------------------------------------- #include "serverlist.h" #include "trayicon.h" +#include "config.h" +#include "resource.h" #include "main.h" // ------------ Global Vars ------------------------------- @@ -72,6 +76,12 @@ "CliExtend Find Server Thread\0" "(All categories)\0" + +"Cli_Extend\0" +"Server List\0" +"Tray Icon\0" +"Auto-save workspace when minimizing to tray icon.\0" +"Show bogui on clicking the tray icon.\0" ; @@ -133,6 +143,10 @@ } else g_bTrayIconInst = false; + // Instalar la pagina de preferencias. + // Install preferences page. + cli->pRegisterPrefPage(gs,g_hInstance,PrefDlgProc,MAKEINTRESOURCE(IDD_PREFERENCES),NULL,g_Ctx->str.sPFtitle,NULL); + return true; } @@ -155,6 +169,8 @@ g_bTrayIconInst = false; } + cli->pUnregisterPrefPage(gs,g_Ctx->str.sPFtitle); + gs->fct.free(g_Ctx->str.pSpace, gs ); gs->fct.free(g_Ctx,gs); g_Ctx=NULL; @@ -168,7 +184,7 @@ // Plugin Information function: called by the Server, Client and Configutarion tool bool BOAPI PlugVer ( PLUGIN_INFO *pv ) { - pv->wVerLo = 93; + pv->wVerLo = 94; pv->wVerHi = 0; pv->wHiBOVer = 1; pv->wLoBOVer = 00; --- NEW FILE: config.cpp --- /* Client Extensions for Back Orifice XP Copyright (C) 2,004 - 2,005 Javier Aroche This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > Autor: Javier Aroche, j_aroche at users dot sourceforge dot net */ // --------------------------------------------------- // config.cpp: // Source Code of the CliExtend Preference page. // // History: // > 0.94 16-Oct-05 * File added to the project. // * Preference page proc defined. // --------------------------------------------------- #include "config.h" #include "resource.h" #include "main.h" // Cli_extend Preference page procedure. BOOL CALLBACK PrefDlgProc ( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { FCT *fct = &ggs->fct; CLI *cli = ggs->cli; API *api = &(ggs->api); VARS *gv = &ggs->gv; switch (uMsg) { // Iniciar el Dialogo --------------------------------- // Initailize Dialog ---------------------------------- case WM_INITDIALOG: { CLIEXT_STR *str = &g_Ctx->str; SetDlgItemText(hDlg,IDC_SSRVLIST, str->sPFlblsrvlist); SetDlgItemText(hDlg,IDC_STRAYICON,str->sPFlbltryicon); SetDlgItemText(hDlg,IDC_CKAUTOSAVE,str->sPFckautosave); SetDlgItemText(hDlg,IDC_CKSHOWONCLICK,str->sPFckshowclick); if (ggs->Log) ggs->Log->AddStr( ggs, " >CliExtend: Preference page created.\r\n"); return TRUE; } // ---------------------------------------------------- // Command Messages ----------------------------------- case WM_COMMAND: { switch (LOWORD(wParam)) { case IDOK: case IDCANCEL: ggs->api.pEndDialog( hDlg, 0 ); return TRUE; } break; } // ---------------------------------------------------- // Notify Messages ------------------------------------ case WM_NOTIFY: { switch (((NMHDR FAR *) lParam)->code) { case PSN_KILLACTIVE: { SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); return TRUE; } case PSN_RESET: // rest to the original values SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); return TRUE; } // switch (...) } // case WM_NOTIFY // ---------------------------------------------------- // Delete and Clean up this Window -------------------- case WM_DESTROY: if (ggs->Log) ggs->Log->AddStr( ggs, " >CliExtend: Preference page destroyed.\r\n"); return TRUE; } return FALSE; } Index: cli_extend.dsp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/cli_extend.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cli_extend.dsp 8 Aug 2005 22:04:12 -0000 1.4 +++ cli_extend.dsp 19 Oct 2005 21:38:09 -0000 1.5 @@ -99,6 +99,10 @@ # End Source File # Begin Source File +SOURCE=.\config.cpp +# End Source File +# Begin Source File + SOURCE=.\main.cpp # End Source File # Begin Source File @@ -135,6 +139,10 @@ # End Group # Begin Source File +SOURCE=.\config.h +# End Source File +# Begin Source File + SOURCE=.\main.h # End Source File # Begin Source File Index: cli_extend.rc =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/cli_extend.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cli_extend.rc 19 Sep 2005 18:39:54 -0000 1.3 +++ cli_extend.rc 19 Oct 2005 21:38:09 -0000 1.4 @@ -95,7 +95,7 @@ IDD_SRVLST DIALOGEX 0, 0, 379, 95 STYLE DS_SETFOREGROUND | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN PUSHBUTTON "",IDC_NEWMACHINE,4,17,16,14,BS_ICON | BS_LEFT | BS_TOP PUSHBUTTON "",IDC_DELETEMACHINE,4,32,16,14,BS_ICON | BS_LEFT | @@ -169,6 +169,22 @@ WS_VSCROLL | WS_TABSTOP END +IDD_PREFERENCES DIALOG DISCARDABLE 0, 0, 217, 153 +STYLE WS_POPUP | WS_VISIBLE +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "",IDC_SSRVLIST,4,4,209,68 + GROUPBOX "",IDC_STRAYICON,4,78,209,71 + CONTROL "",IDC_CKAUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,90,171,13 + CONTROL "",IDC_CKSHOWONCLICK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,11,104,172,10 + LTEXT "Miminize to the system tray when:",IDC_STATIC,12,117, + 129,9 + COMBOBOX IDC_COMBO1,12,130,144,15,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + ///////////////////////////////////////////////////////////////////////////// // @@ -202,6 +218,14 @@ TOPMARGIN, 3 BOTTOMMARGIN, 87 END + + IDD_PREFERENCES, DIALOG + BEGIN + LEFTMARGIN, 4 + RIGHTMARGIN, 213 + TOPMARGIN, 4 + BOTTOMMARGIN, 149 + END END #endif // APSTUDIO_INVOKED Index: main.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- main.h 15 Oct 2005 18:03:57 -0000 1.3 +++ main.h 19 Oct 2005 21:38:09 -0000 1.4 @@ -54,12 +54,18 @@ char *sFndSrvthrdname; // FindSrv Thread name char *sFSallcats; // Msg: "(All categories)" -} SRVLST_STR; + + char *sPFtitle; // Preference page title. + char *sPFlblsrvlist; // Label: server list + char *sPFlbltryicon; // Label: Tray Icon + char *sPFckautosave; // Check: Auto save changes + char *sPFckshowclick; // Check: Show on Click +} CLIEXT_STR; // Client Extensions Context structure. typedef struct { SRVLST2_CTX *slctx; // ServerList Context - SRVLST_STR str; // ServerList Strings + CLIEXT_STR str; // CliExtend Strings CETRAYICON_CTX *tictx; // TrayIcon Context. Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- serverlist.cpp 15 Oct 2005 18:03:57 -0000 1.9 +++ serverlist.cpp 19 Oct 2005 21:38:09 -0000 1.10 @@ -1083,7 +1083,7 @@ API *api = &(ggs->api); CLI *cli = (ggs->cli); SRVLST2_CTX *ctx = (SRVLST2_CTX *) api->pGetWindowLong(hDlg,GWL_USERDATA); - SRVLST_STR *str = &g_Ctx->str; + CLIEXT_STR *str = &g_Ctx->str; switch (msg) { @@ -2601,7 +2601,7 @@ { CLI *cli = ggs->cli; API *api = &(ggs->api); - SRVLST_STR *str = &g_Ctx->str; + CLIEXT_STR *str = &g_Ctx->str; switch (uMsg) { // ---------------------------------------------------- Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/resource.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- resource.h 15 Sep 2005 19:45:29 -0000 1.3 +++ resource.h 19 Oct 2005 21:38:09 -0000 1.4 @@ -15,6 +15,7 @@ #define IDR_CTX 123 #define IDD_FINDSRVEX 124 #define IDI_FIND 126 +#define IDD_PREFERENCES 127 #define IDC_SRVLST 1000 #define IDC_CAT 1001 #define IDC_SCAT 1002 @@ -41,6 +42,11 @@ #define IDC_SCATNAME 1022 #define IDC_CATEDIT 1023 #define IDC_SELCAT 1025 +#define IDC_SSRVLIST 1026 +#define IDC_STRAYICON 1027 +#define IDC_CKAUTOSAVE 1028 +#define IDC_CKSHOWONCLICK 1029 +#define IDC_COMBO1 1030 #define IDC_FIND 1080 #define IDC_SRVNAME 1081 #define IDC_SSRVNAME 1082 @@ -60,9 +66,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 127 +#define _APS_NEXT_RESOURCE_VALUE 128 #define _APS_NEXT_COMMAND_VALUE 40010 -#define _APS_NEXT_CONTROL_VALUE 1026 +#define _APS_NEXT_CONTROL_VALUE 1031 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 18:04:04
|
Update of /cvsroot/boxp/boxp/cli_extend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15176/cli_extend Modified Files: main.cpp main.h serverlist.cpp Log Message: [NEW] Delete confirmation messages in Server List. Index: main.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- main.cpp 15 Sep 2005 19:45:29 -0000 1.8 +++ main.cpp 15 Oct 2005 18:03:56 -0000 1.9 @@ -62,6 +62,7 @@ "Server Address can't be NULL!\0" "The category name can't be NULL.\0" +"Are you sure you want to delete this category?\0" "Cli_extend: Error\0" "Add/Edit Category\0" @@ -91,7 +92,8 @@ { if ( gs->nSize!=sizeof(GS) ) return false; - if ( gs->cli==NULL ) return false; + if ( gs->cli==NULL || gs->cli->nSize!=sizeof(CLI) ) + return false; #ifdef _DEBUG if (gs->Log) gs->Log->AddStr(gs, " >CliExtend: Init Plug. (C) 2004-05 Javier Aroche\r\n"); Index: main.h =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- main.h 15 Sep 2005 19:45:29 -0000 1.2 +++ main.h 15 Oct 2005 18:03:57 -0000 1.3 @@ -44,7 +44,8 @@ char *sErrNullcatname; // Error msg: category name can't be NULL. char *sErrNulladdress; // Error msg: address can't be NULL. - char *sErrTitle; + char *sErrDelCat; // Error msg: Are you sure you want to delete this category? + char *sErrTitle; // Error title for msgs boxes char *sACtitulo; // Titulo: Add Category char *sACscatname; // Msg: Category name Index: serverlist.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/cli_extend/serverlist.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serverlist.cpp 24 Sep 2005 18:47:18 -0000 1.8 +++ serverlist.cpp 15 Oct 2005 18:03:57 -0000 1.9 @@ -67,6 +67,7 @@ // // > v0.94 24-Sep-05 * Fix: Removed call to free(ctx,gs) when Destroys the ServerList window. // UninstallServerList function does the same call. +// 11-Oct-05 * New: Delete confirmation messages in Server List. // --------------------------------------------------- #include "main.h" @@ -1378,11 +1379,18 @@ // Obtener la informacion del servidor. // Get server info. SERVER_INFO *nfo = (SERVER_INFO *) Itm.lParam; - if ( nfo==NULL || ((SRVCAT *)Itm.lParam)->c==1 ) { + if ( nfo==NULL || ((SRVCAT *)Itm.lParam)->c==1 ) { // no server item cli->pSetStatusText( ggs, cli->str.sStatusReady ); return TRUE; } + // preguntar para quitar? + // ask to remove? + if ( fct->ProfileReadInt(ggs,NULL,cli->str.sINIDeleteConfirm,1)==1 ) { + if (api->pMessageBox(hDlg,cli->str.sSLmsgDelSrv,cli->str.sAppName,MB_ICONQUESTION|MB_YESNO)==IDNO) + return TRUE; + } + // Tiene un ServerDlg? // Have a ServerDlg? if ( nfo->ctx!=NULL ) @@ -1605,6 +1613,13 @@ TreeView_GetItem( ctx->hList, &Itm ); if ( Itm.iImage==3 ) { + // preguntar para quitar? + // ask to remove? + if ( fct->ProfileReadInt(ggs,NULL,cli->str.sINIDeleteConfirm,1)==1 ) { + if (api->pMessageBox(hDlg,str->sErrDelCat,ggs->cli->str.sSLCaption,MB_ICONQUESTION|MB_YESNO)==IDNO) + return TRUE; + } + api->pSendMessage( hDlg, WM_DELCATEGORY, Itm.lParam, 0 ); cli->bSave = true; cli->pSetStatusText( ggs, str->sSBcatdel ); |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 18:00:56
|
Update of /cvsroot/boxp/boxp/boxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14030/boxp/include Modified Files: srv_linkage.h Log Message: bogui changes: [NEW] Delete confirmations added in Plugins dialog and ServerList. [NEW] Changes in InteractiveDlgProc to support Most Recently Used server addresses. Index: srv_linkage.h =================================================================== RCS file: /cvsroot/boxp/boxp/boxp/include/srv_linkage.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- srv_linkage.h 26 Sep 2005 22:10:47 -0000 1.10 +++ srv_linkage.h 15 Oct 2005 18:00:48 -0000 1.11 @@ -1681,6 +1681,7 @@ char *sSLbtndelsrv; // Botón: "Delete Server". char *sSLbtnconsrv; // Botón: "Connect Server". char *sSLbtnfindsrv; // Botón: "Find Server" + char *sSLmsgDelSrv; // Msg: "Are you sure you want to delete this server?" // Interactive connect/listen Strings char *sICLdlgconn; // Titulo: "Connect To". @@ -1800,6 +1801,7 @@ char *sPCErrWrongPlug; // Msg: "Wrong BOXP Plugin" char *sPCErrInitPlug; // Msg: "Error initializing plugin" char *sPCErrRemPlug; // Msg: error removing plugin + char *sPCMsgRemPlug; // Msg: "Are you sure you want to remove this plugin?" char *sPCtitle; // Label: "Plugins Cfg Dialog Title" char *sPCPlugLoaded; // Label: "Plugins Loaded" char *sPCvars; // Label: "Option Variables" @@ -1841,6 +1843,8 @@ HICON hicoBoguiBig; // Main Frame big icon. HICON hicoBoguiSml; // Main Frame small icon. + char pMRUSrvAddress[MAX_MRU_SRVADD][64]; // Most recently used server addresses + // Workspace stuff. char svLastDocFile[MAX_PATH+1]; // Last BOGUI Document used char svDocFile[MAX_PATH+1]; // BOGUI Document file path. |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 17:48:53
|
Update of /cvsroot/boxp/boxp/bogui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11123/bogui/src Modified Files: bogui.cpp util.cpp Log Message: [NEW] Delete confirmations added in Plugins dialog and ServerList. [NEW] Changes in InteractiveDlgProc to support Most Recently Used server addresses. Index: bogui.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/src/bogui.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- bogui.cpp 26 Sep 2005 22:05:48 -0000 1.15 +++ bogui.cpp 15 Oct 2005 17:48:35 -0000 1.16 @@ -56,6 +56,7 @@ // server dialog. // * Fix: ServerList menu and toolbar button wrong status when ServerList // is visible at start up. +// 11-Oct-05 * New: Delete confirmations added in Plugins dialog and ServerList dialog. ///////////////////////////////////////////////////////////////////// /*-------------------{ Documentación/Documentation }--------------------- @@ -2730,8 +2731,15 @@ ListView_GetItem( ctx->hList, &lvi ); if( lvi.state & LVIS_SELECTED ) { + // preguntar para quitar el plugin? + // ask to remove the plugin? + if ( fct->ProfileReadInt(ggs,NULL,cli->str.sINIDeleteConfirm,1)==1 ) { + if ( api->pMessageBox( hDlg, cli->str.sPCMsgRemPlug, cli->str.sAppName, MB_YESNO|MB_ICONQUESTION )==IDNO ) + return TRUE; + } + if ( fct->RemovePlugin( ggs, i )==false ) - api->pMessageBox( hDlg, cli->str.sPCErrRemPlug, cli->str.sAppName, MB_OK|MB_ICONERROR|MB_SYSTEMMODAL ); + api->pMessageBox( hDlg, cli->str.sPCErrRemPlug, cli->str.sAppName, MB_OK|MB_ICONERROR ); else { ListView_DeleteItem( ctx->hList, i ); cli->pSetStatusText( ggs, cli->str.sSBplgdel ); @@ -3468,6 +3476,13 @@ ListView_GetItem( ctx->hList, &lvi ); if( lvi.state & LVIS_SELECTED ) { + // preguntar para quitar? + // ask to remove? + if ( fct->ProfileReadInt(ggs,NULL,cli->str.sINIDeleteConfirm,1)==1 ) { + if (api->pMessageBox(hDlg,cli->str.sSLmsgDelSrv,cli->str.sAppName,MB_ICONQUESTION|MB_YESNO)==IDNO) + return TRUE; + } + SERVER_INFO *nfo = (SERVER_INFO *) lvi.lParam; if ( nfo->ctx!=NULL ) api->pDestroyWindow( nfo->hWnd ); Index: util.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/src/util.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- util.cpp 24 Sep 2005 18:41:47 -0000 1.4 +++ util.cpp 15 Oct 2005 17:48:35 -0000 1.5 @@ -19,6 +19,11 @@ /////////////////////////////////////////////////////// // util.cpp: misc functions for the Window BO client // +// +// History: +// beta 8 14-Oct-05 * Start record file changes. +// * New: Changes in InteractiveDlgProc to support Most Recently Used addresses +// /////////////////////////////////////////////////////// #include <srv_linkage.h> @@ -771,17 +776,29 @@ } } + hWnd= api->pGetDlgItem( hDlg, IDC_ADDRESS ); if ( !ctx->bListen ) { - hWnd= api->pGetDlgItem( hDlg, IDC_ADDRESS ); + SERVER_INFO *srv = cli->pSrvList; while ( srv!=NULL ) { txt = srv->svAddress; - api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 0, (LPARAM) txt); + api->pSendMessage( hWnd, CB_ADDSTRING, (WPARAM) 0, (LPARAM) txt); srv = srv->next; } } + for(i=MAX_MRU_SRVADD-1; i>=0; i--) + { + txt=cli->pMRUSrvAddress[i]; + if(*txt!=0) { + api->pSendMessage( hWnd, CB_INSERTSTRING, (WPARAM) 0, (LPARAM) txt); + } + } + + + + #ifdef _LOGGING_ if (ggs->Log) ggs->Log->AddStrf( ggs, " Interactive Dialog Created. Context address: %#x\r\n\0",ctx ); #endif @@ -795,12 +812,33 @@ switch ( wID ) { case IDOK: + { ctx->bFinish=TRUE; // copy the data SendDlgItemMessage( hDlg, IDC_CONNECTION_TYPE , WM_GETTEXT,10, (LPARAM) ctx->sNet ); SendDlgItemMessage( hDlg, IDC_ENCRYPTION_ENGINE, WM_GETTEXT,10, (LPARAM) ctx->sEnc ); SendDlgItemMessage( hDlg, IDC_AUTH_HANDLER,WM_GETTEXT,10, (LPARAM) ctx->sAuth ); - SendDlgItemMessage( hDlg, IDC_ADDRESS ,WM_GETTEXT, 50, (LPARAM) ctx->sBind ); + SendDlgItemMessage( hDlg, IDC_ADDRESS ,WM_GETTEXT, 64, (LPARAM) ctx->sBind ); SendDlgItemMessage( hDlg, IDC_ENCKEY ,WM_GETTEXT, 254, (LPARAM) ctx->EncKey ); + + // store address used + for (int i=0; i<MAX_MRU_SRVADD; i++) + { + if ( api->plstrcmp(ctx->sBind,cli->pMRUSrvAddress[i])==0 ) { + *cli->pMRUSrvAddress[i]=0; + for (int j=i; j<MAX_MRU_SRVADD-1; j++) { + api->plstrcpy(cli->pMRUSrvAddress[j],cli->pMRUSrvAddress[j+1]); + } + break; + } + } + + for (i=MAX_MRU_SRVADD-2; i>=0; i--) + { + if (*cli->pMRUSrvAddress[i]!=0) + api->plstrcpy(cli->pMRUSrvAddress[i+1],cli->pMRUSrvAddress[i]); + } + api->plstrcpy(cli->pMRUSrvAddress[0],ctx->sBind); + } case IDCANCEL: // Exit api->pEndDialog( hDlg, 1 ); return TRUE; |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 17:48:53
|
Update of /cvsroot/boxp/boxp/bogui/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11123/bogui/include Modified Files: bogui.h cli_strings.h resource.h util.h Log Message: [NEW] Delete confirmations added in Plugins dialog and ServerList. [NEW] Changes in InteractiveDlgProc to support Most Recently Used server addresses. Index: util.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/util.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- util.h 4 Apr 2005 23:10:25 -0000 1.2 +++ util.h 15 Oct 2005 17:48:35 -0000 1.3 @@ -37,7 +37,7 @@ char sAuth[10]; char sEnc[10]; char sNet[10]; - char sBind[50]; + char sBind[65]; char EncKey[255]; BOOL bFinish; bool bListen; Index: cli_strings.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/cli_strings.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- cli_strings.h 26 Sep 2005 22:05:48 -0000 1.9 +++ cli_strings.h 15 Oct 2005 17:48:35 -0000 1.10 @@ -106,6 +106,7 @@ "Delete Server\0" "Connect Server\0" "Find Server\0" +"Are you sure you want to delete this server?\0" // Interactive connect/listen Strings "Connect To\0" @@ -225,6 +226,7 @@ "Wrong BOXP Plugin.\0" "Error initializing plugin.\0" "Plugin could not be removed.\0" +"Are you sure you want to remove this plugin?\0" "Plugins Configuration\0" "Plugins Loaded:\0" "Option Variables\0" Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/resource.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- resource.h 26 Sep 2005 22:05:48 -0000 1.8 +++ resource.h 15 Oct 2005 17:48:35 -0000 1.9 @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by D:\boxp\bogui\bogui.rc +// Used by C:\boxp\bogui\bogui.rc // #define IDR_MAINFRAME 101 #define IDI_MAINFRAME 102 Index: bogui.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/bogui.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bogui.h 30 Jul 2005 22:27:23 -0000 1.7 +++ bogui.h 15 Oct 2005 17:48:35 -0000 1.8 @@ -219,6 +219,8 @@ #define WM_SETBKCOLOR WM_USER +38 #define WM_SETIMGSIZE WM_USER +39 +#define MAX_MRU_SRVADD 16 + #ifdef _BOXPGUI_ extern GS * ggs; // Only one global variable void * (BOAPI APP_Init) ( GS *gs ); |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 17:48:50
|
Update of /cvsroot/boxp/boxp/bogui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11123/bogui Modified Files: bogui.rc Log Message: [NEW] Delete confirmations added in Plugins dialog and ServerList. [NEW] Changes in InteractiveDlgProc to support Most Recently Used server addresses. Index: bogui.rc =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/bogui.rc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- bogui.rc 26 Sep 2005 22:05:48 -0000 1.9 +++ bogui.rc 15 Oct 2005 17:48:35 -0000 1.10 @@ -382,7 +382,7 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "",IDOK,125,139,50,14 PUSHBUTTON "",IDCANCEL,69,139,50,14 @@ -396,9 +396,9 @@ LTEXT "",IDC_STC_AUTH,5,79,170,8 COMBOBOX IDC_AUTH_HANDLER,5,88,170,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_ADDRESS,5,15,170,40,CBS_DROPDOWN | CBS_SORT | + COMBOBOX IDC_ADDRESS,5,15,170,61,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - ICON IDI_ANTENA,IDC_STATIC,5,133,21,20 + ICON IDI_ANTENA,IDC_STATIC,5,133,20,20 LTEXT "",IDC_STC_KEY,5,105,170,8 EDITTEXT IDC_ENCKEY,5,115,170,12,ES_AUTOHSCROLL | NOT WS_BORDER, WS_EX_STATICEDGE |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-10-15 17:47:02
|
Update of /cvsroot/boxp/boxp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10880 Modified Files: changelog.txt Log Message: bogui and cli_extend changes. Index: changelog.txt =================================================================== RCS file: /cvsroot/boxp/boxp/changelog.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- changelog.txt 26 Sep 2005 22:01:45 -0000 1.13 +++ changelog.txt 15 Oct 2005 17:46:54 -0000 1.14 @@ -44,6 +44,9 @@ > [NEW] Client preferences strings moved to CLISTR structure. > [FIX] ServerList menu and toolbar button wrong status when ServerList is visible at start up. + > [NEW] Delete confirmations added in Plugins dialog and ServerList. + > [NEW] Changes in InteractiveDlgProc to support Most Recently Used + server addresses. * cli_extend changes: > [FIX] The Background color of the ServerList isn't repainted when a window in from of this is minimized. WM_ERASEBKGND message disabled. @@ -54,6 +57,7 @@ the context menu. > [FIX] Removed call to free(ctx,gs) when Destroys the ServerList window. UninstallServerList function does the same call. + > [NEW] Delete confirmation messages in Server List. * srv_trayicon changes: > [FIX] When the BOXP server has more that one connection, trayicon crashes when gets the user name for the connected sockets. |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-09-26 22:15:38
|
Update of /cvsroot/boxp/boxp/srv_trayicon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10960/srv_trayicon Modified Files: trayicon.cpp Log Message: [NEW] Hides the dialog when minimize it, like cli_extend does. Index: trayicon.cpp =================================================================== RCS file: /cvsroot/boxp/boxp/srv_trayicon/trayicon.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- trayicon.cpp 15 Sep 2005 19:43:39 -0000 1.4 +++ trayicon.cpp 26 Sep 2005 22:15:30 -0000 1.5 @@ -742,7 +742,7 @@ // Show the Main Dialog ------------------------ case IDM_SHOW: - api->pShowWindow(hDlg,SW_SHOW); + api->pShowWindow(hDlg,SW_RESTORE); SetForegroundWindow(hDlg); return TRUE; @@ -1178,7 +1178,7 @@ { // Show the Main Dialog --------------------------------------- case WM_LBUTTONDBLCLK: - api->pShowWindow(hDlg,SW_SHOW); + api->pShowWindow(hDlg,SW_RESTORE); SetForegroundWindow(hDlg); return TRUE; @@ -1235,6 +1235,17 @@ return TRUE; } + // If Dialog is minimized, must hide it. ------------------ + // Si el dialogo es minimizado, debe esconderse. + case WM_ACTIVATE: + { + if ( (BOOL) HIWORD(wParam) ) { + api->pShowWindow(hDlg,SW_HIDE); + return TRUE; + } + return FALSE; + } + // Destroy this Dialog and quit.--------------------------- case WM_DESTROY: if ( tictx ) { |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-09-26 22:10:55
|
Update of /cvsroot/boxp/boxp/boxp/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8231/boxp/include Modified Files: srv_linkage.h Log Message: Changes for bogui client preferences strings and new .INI keynames. Index: srv_linkage.h =================================================================== RCS file: /cvsroot/boxp/boxp/boxp/include/srv_linkage.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- srv_linkage.h 19 Sep 2005 18:35:44 -0000 1.9 +++ srv_linkage.h 26 Sep 2005 22:10:47 -0000 1.10 @@ -1648,6 +1648,9 @@ char *sINIStartupAction;// Startup Action: Show Welcome dlg=1, Load last workspace=2, create new workspace=0 char *sINIShowStatusBar;// Show status bar at start up? char *sINISaveAtExit; // Save workspace changes at exit? + char *sINIKeepSrvConnOnClose; // Keep connection on close server dialog + char *sINIEnableFlatBtns; // Enable Flat buttons style. + char *sINIDeleteConfirm;// Delete Confirmation dialog char *sINIMaximized; // Show maximized the main frame? char *sINIMainFrmX; // Specifies the position of the left edge of the window. char *sINIMainFrmY; // Specifies the position of the right edge of the window @@ -1777,6 +1780,19 @@ char *sFSbtncancel; // Botón: Cancel char *sFSmsgendfile; // Msg: Passed the end fo the file. + // Client Preferences Strings + char *sPPlbllanguage; // Label: "Client Language:" + char *sPPckshowsrvlst; // Check: "Show Server List" + char *sPPckshowstatus; // Check: "Show Status Bar" + char *sPPcksavewrkspc; // Check: "Save workspace changes at exit" + char *sPPckflatbttn; // Check: "Enable Flat buttons" + char *sPPcksrvdlgconn; // Check: "Keep connection on close server dialog" + char *sPPckdeletedlg; // Check: "Delete confirmation dialog" + char *sPPlblstartup; // Label: "At start up:" + char *sPPrdwelcome; // Radio: "Show Welcome dialog" + char *sPPrdnewwrkspc; // Radio: "Create new workspace" + char *sPPrdloadlastwk; // Radio: "Load last workspace" + // Plugins Configuration Dialog Strings char *sPCErrLoadPlug; // Msg: "Unable load DLL File" char *sPCErrNotFuncs; // Msg: "Couldn't found plug-in functions" |
|
From: Javier A. \(RA\) <j_a...@us...> - 2005-09-26 22:05:58
|
Update of /cvsroot/boxp/boxp/bogui/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6083/bogui/include Modified Files: cli_strings.h resource.h Log Message: minor changes for client preferences. Added delete confirmation preference. Index: cli_strings.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/cli_strings.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- cli_strings.h 24 Sep 2005 18:41:47 -0000 1.8 +++ cli_strings.h 26 Sep 2005 22:05:48 -0000 1.9 @@ -75,6 +75,7 @@ "SaveAtExit\0" "KeepSrvConnOnClose\0" "EnableFlatBtns\0" +"DeleteConfirm\0" "MainFrmMaximized\0" "MainFrmX\0" "MainFrmY\0" @@ -211,6 +212,7 @@ "Save workspace changes at exit\0" "Enable Flat buttons\0" "Keep connection on close server dialog\0" +"Delete confirmation dialog\0" "At start up:\0" "Show Welcome dialog\0" "Create new workspace\0" Index: resource.h =================================================================== RCS file: /cvsroot/boxp/boxp/bogui/include/resource.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- resource.h 24 Sep 2005 18:41:47 -0000 1.7 +++ resource.h 26 Sep 2005 22:05:48 -0000 1.8 @@ -137,6 +137,7 @@ #define IDC_CKSAVEATEXIT 1092 #define IDC_CKFLATBTN 1093 #define IDC_CKSRVDLG_CLOSE 1094 +#define IDC_CKDELDLG 1095 #define IDM_NEWSRV 40001 #define IDM_EDITSRV 40002 #define IDM_DELETESRV 40003 @@ -170,7 +171,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 150 #define _APS_NEXT_COMMAND_VALUE 40155 -#define _APS_NEXT_CONTROL_VALUE 1095 +#define _APS_NEXT_CONTROL_VALUE 1096 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif |