various minor fixes and improvements
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 5 Dec 2008 00:03:13 +0000 (00:03 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 5 Dec 2008 00:03:13 +0000 (00:03 +0000)
17 files changed:
ChangeLog
TODO
src/console/win32/DefineGraphDlg.h
src/console/win32/GraphFrame.cpp
src/console/win32/GraphFrame.h
src/console/win32/GraphManagerDlg.cpp
src/console/win32/GraphSettingsPage.cpp
src/console/win32/GraphSettingsPage.h
src/console/win32/ObjectOverview.cpp
src/console/win32/nxcon.clw
src/console/win32/nxcon.rc
src/console/win32/resource.h
src/install/windows/nxav.exe.manifest
src/install/windows/nxcon.exe.manifest
src/install/windows/nxmc.exe.manifest
src/install/windows/nxnotify.exe.manifest
src/server/core/isc.cpp

index 057ef4a..210a9b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
        - Added support for negative values on graphs
        - Implemented cut/copy/paste in event policy editor
 - Java API introduced
-- Fixed issues: #31, #74, #146, #235, #236, #237, #238
+- Fixed issues: #31, #74, #146, #218, #235, #236, #237, #238
 
 
 *
diff --git a/TODO b/TODO
index bd0f385..76de38a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,9 +4,9 @@
 For 0.2.23:
 
 - hide HP-UX unused autoport aggregation interfaces
-- show status in object overview
 - edit predefined graphs
 - nxdbmgr: fix errors like template has reference to non-existing node object
+- make template status always normal + issue 228
 
 
 GENERAL:
index f9e9614..08bb960 100644 (file)
@@ -14,6 +14,7 @@ class CDefineGraphDlg : public CDialog
 {
 // Construction
 public:
+       CString m_strConfig;
        NXC_GRAPH_ACL_ENTRY * m_pACL;
        DWORD m_dwACLSize;
        CDefineGraphDlg(CWnd* pParent = NULL);   // standard constructor
index aec2988..840d634 100644 (file)
@@ -295,6 +295,7 @@ void CGraphFrame::OnGraphProperties()
    CGraphDataPage pgData;
 
    // Create "Settings" page
+       pgSettings.m_strTitle = m_szSubTitle;
    pgSettings.m_bAutoscale = m_wndGraph.m_bAutoScale;
    pgSettings.m_bShowGrid = m_wndGraph.m_bShowGrid;
    pgSettings.m_bRuler = m_wndGraph.m_bShowRuler;
@@ -331,6 +332,19 @@ void CGraphFrame::OnGraphProperties()
    dlg.m_psh.dwFlags |= PSH_NOAPPLYNOW;
    if (dlg.DoModal() == IDOK)
    {
+               nx_strncpy(m_szSubTitle, pgSettings.m_strTitle, MAX_DB_STRING);
+
+               CString strFullString, strTitle;
+
+          if (strFullString.LoadString(IDR_DCI_HISTORY_GRAPH))
+                  AfxExtractSubString(strTitle, strFullString, CDocTemplate::docName);
+
+      strTitle += " - [";
+      strTitle += m_szSubTitle;
+      strTitle += "]";
+          SetTitle(strTitle);
+               OnUpdateFrameTitle(TRUE);
+
       m_dwNumItems = pgData.m_dwNumItems;
       memcpy(m_ppItems, pgData.m_ppItems, sizeof(DCIInfo *) * MAX_GRAPH_ITEMS);
 
index 486df92..0ab75c6 100644 (file)
@@ -73,7 +73,7 @@ protected:
        DWORD m_dwNumTimeUnits;
        int m_iTimeUnit;
        int m_iTimeFrameType;
-       TCHAR m_szSubTitle[256];
+       TCHAR m_szSubTitle[MAX_DB_STRING];
        DWORD m_dwSeconds;
        CGraphStatusBar m_wndStatusBar;
        UINT m_hTimer;
index d7b91a2..e55f607 100644 (file)
@@ -312,18 +312,17 @@ void CGraphManagerDlg::OnButtonProperties()
        dlg.m_strName = g_pGraphList[i].pszName;
        dlg.m_dwACLSize = g_pGraphList[i].dwAclSize;
        dlg.m_pACL = (NXC_GRAPH_ACL_ENTRY *)nx_memdup(g_pGraphList[i].pACL, sizeof(NXC_GRAPH_ACL_ENTRY) * g_pGraphList[i].dwAclSize);
+       dlg.m_strConfig = g_pGraphList[i].pszConfig;
        if (dlg.DoModal() == IDOK)
        {
                graph.dwId = dwGraphId;
                graph.dwOwner = g_pGraphList[i].dwOwner;
                graph.dwAclSize = dlg.m_dwACLSize;
                graph.pACL = dlg.m_pACL;
-               graph.pszName = _tcsdup(g_pGraphList[i].pszName);
-               graph.pszConfig = _tcsdup(g_pGraphList[i].pszConfig);
+               graph.pszName = (TCHAR *)dlg.m_strName.operator LPCTSTR();
+               graph.pszConfig = (TCHAR *)dlg.m_strConfig.operator LPCTSTR();
                dwResult = DoRequestArg2(NXCDefineGraph, g_hSession, &graph, _T("Updating predefined graph settings..."));
                if (dwResult != RCC_SUCCESS)
                        theApp.ErrorBox(dwResult, _T("Cannot update predefined graph settings: %s"));
-               free(graph.pszName);
-               free(graph.pszConfig);
        }
 }
index ed55c62..7fa1406 100644 (file)
@@ -40,6 +40,7 @@ CGraphSettingsPage::CGraphSettingsPage() : CPropertyPage(CGraphSettingsPage::IDD
        m_bShowLegend = FALSE;
        m_bEnableZoom = FALSE;
        m_bShowHostNames = FALSE;
+       m_strTitle = _T("");
        //}}AFX_DATA_INIT
 
    m_iTimeUnit = 0;
@@ -70,6 +71,8 @@ void CGraphSettingsPage::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_CHECK_LEGEND, m_bShowLegend);
        DDX_Check(pDX, IDC_CHECK_ZOOM, m_bEnableZoom);
        DDX_Check(pDX, IDC_CHECK_HOSTNAMES, m_bShowHostNames);
+       DDX_Text(pDX, IDC_EDIT_TITLE, m_strTitle);
+       DDV_MaxChars(pDX, m_strTitle, 127);
        //}}AFX_DATA_MAP
 
        DDX_Control(pDX, IDC_CB_BACKGROUND, m_wndCSBackground);
index 4ad7d42..3109022 100644 (file)
@@ -51,6 +51,7 @@ public:
        BOOL    m_bShowLegend;
        BOOL    m_bEnableZoom;
        BOOL    m_bShowHostNames;
+       CString m_strTitle;
        //}}AFX_DATA
 
 
index ccea516..e908af2 100644 (file)
@@ -187,6 +187,7 @@ void CObjectOverview::Refresh()
        {
                InsertItem(_T("ID"), m_pObject->dwId);
                InsertItem(_T("Class"), g_szObjectClass[m_pObject->iClass]);
+               InsertItem(_T("Status"), g_szStatusText[m_pObject->iStatus]);
                if (m_pObject->dwIpAddr != 0)
                        InsertItem(_T("IP Address"), IpToStr(m_pObject->dwIpAddr, szTemp));
 
index 0bf9da1..e3895ec 100644 (file)
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CGroupPropDlg
+LastClass=CGraphSettingsPage
 LastTemplate=CMDIChildWnd
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
@@ -19,18 +19,18 @@ ResourceCount=258
 Resource1=IDD_EDIT_TRAP (English (U.S.))
 Resource2=IDM_CONTEXT
 Resource3=IDD_EDIT_RULE_SCRIPT (English (U.S.))
-Resource4=IDD_EDIT_RULE_SCRIPT
-Resource5=IDA_NODE_POLLER
+Resource4=IDD_EDIT_TRAP_ARG
+Resource5=IDD_SELECT_MAP
 Class2=CChildView
 Class5=CAboutDlg
 Class6=CControlPanel
 Class8=CMapFrame
 Class10=CLoginDialog
-Resource6=IDD_SELECT_EVENT
+Resource6=IDA_EVENT_EDITOR
 Class11=CProgressDialog
-Resource7=IDA_SERVER_CFG_EDITOR
+Resource7=IDD_CREATE_MP
 Class12=CAddrEntryDlg
-Resource8=IDD_GRAPH_PROP_STYLES
+Resource8=IDD_EDIT_IP_SUBNET
 Class13=CObjectPropDlg
 Resource9=IDD_ACTION_PROPERTIES (English (U.S.))
 Resource10=IDA_AGENT_CFG_EDITOR (English (U.S.))
@@ -46,45 +46,45 @@ Resource17=IDD_NEW_USER (English (U.S.))
 Class16=CDebugFrame
 Resource18=IDA_EPP (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDD_CREATE_NETMAP
+Resource20=IDD_CHANGE_PASSWORD
 Class17=CObjectPreview
 Resource21=IDA_TRAP_EDITOR (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_OBJECT_VPNC_GENERAL
+Resource22=IDD_DCI_COLLECTION
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
 Resource23=IDD_GRAPH_PROPERTIES (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
-Resource24=IDA_DC_EDITOR
+Resource24=IDD_SELECT_TRAP
 Class26=CRequestProcessingDlg
 Resource25=IDD_CREATE_IF_DCI (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDD_ABOUTBOX
+Resource27=IDD_IMPORT_CA_CERT
 Resource28=IDD_THRESHOLD (English (U.S.))
 Class27=CObjectPropsGeneral
 Resource29=IDD_OBJTOOL_OPTIONS (English (U.S.))
 Class28=CObjectPropsSecurity
 Resource30=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
-Resource31=IDA_NETMAP
-Resource32=IDD_CHANGE_PASSWORD
+Resource31=IDD_COND_DCI_PROP
+Resource32=IDD_CLUSTER_RESOURCE
 Class29=CUserSelectDlg
-Resource33=IDD_MAP_LINK
+Resource33=IDD_OBJTOOL_GENERAL
 Class30=CUserEditor
 Resource34=IDD_DCI_PROPERTIES
 Class31=CNewUserDlg
-Resource35=IDD_OBJECT_PRESENTATION
-Resource36=IDD_OBJECT_TRUSTED_NODES
+Resource35=IDA_ACTION_EDITOR
+Resource36=IDD_SNMP_WALK
 Class32=CUserPropDlg
 Resource37=IDD_SELECT_USER (English (U.S.))
-Resource38=IDD_SNMP_WALK
+Resource38=IDD_NEW_ACTION
 Class33=CGroupPropDlg
-Resource39=IDD_DCI_COLLECTION
-Resource40=IDD_NEW_ACTION
-Resource41=IDD_EDIT_IP_SUBNET
+Resource39=IDR_MAINFRAME
+Resource40=IDA_LAST_VALUES
+Resource41=IDD_EDIT_RULE_SCRIPT
 Resource42=IDD_MIB_BROWSER (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
@@ -99,56 +99,56 @@ Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
 Resource46=IDD_DISCOVERY_RANGES (English (U.S.))
-Resource47=IDD_SELECT_INTERNAL_ITEM
-Resource48=IDD_SET_PASSWORD
+Resource47=IDA_SITUATION_MANAGER
+Resource48=IDD_CREATE_NETMAP
 Class43=CThresholdDlg
 Resource49=IDD_EDIT_EVENT (English (U.S.))
-Resource50=IDD_OBJECT_COND_GENERAL
+Resource50=IDD_CREATE_NODE
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
 Resource51=IDD_OBJECT_IF_GENERAL (English (U.S.))
-Resource52=IDD_COND_DCI_PROP
+Resource52=IDD_DATA_QUERY
 Class48=CObjectSelDlg
-Resource53=IDD_DEFINE_GRAPH
-Resource54=IDD_NEW_USER
+Resource53=IDD_CREATE_VPNC
+Resource54=IDD_EDIT_RULE_SITUATION
 Class49=CRuleCommentDlg
-Resource55=IDD_OBJECT_NODE_GENERAL
+Resource55=IDD_CREATE_IF_DCI
 Class50=CEventSelDlg
-Resource56=IDD_EDIT_RULE_COMMENT
+Resource56=IDA_NETMAP
 Resource57=IDD_COND_DCI_PROP (English (U.S.))
-Resource58=IDA_EVENT_EDITOR
+Resource58=IDD_AGENT_CONFIG
 Resource59=IDD_GROUP_PROPERTIES (English (U.S.))
 Resource60=IDD_DISCOVERY_GENERAL (English (U.S.))
 Class51=CObjectPropsPresentation
 Resource61=IDD_SET_PASSWORD (English (U.S.))
-Resource62=IDD_ADDR_ENTRY
+Resource62=IDD_CREATE_NETSRV
 Class52=CRuleSeverityDlg
-Resource63=IDD_CREATE_MP
+Resource63=IDD_OBJECT_NETSRV_GENERAL
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
 Resource64=IDD_CHANGE_IP (English (U.S.))
-Resource65=IDA_DATA_VIEW
+Resource65=IDD_OBJECT_CLUSTER_GENERAL
 Resource66=IDD_DCI_THRESHOLDS (English (U.S.))
 Resource67=IDD_GRAPH_PROP_SETTINGS (English (U.S.))
 Resource68=IDD_CREATE_VPNC (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
-Resource69=IDD_OBJECT_CLUSTER_GENERAL
-Resource70=IDD_OBJECT_COND_DATA
+Resource69=IDD_GRAPH_PROP_DATA
+Resource70=IDD_GRAPH_PROP_STYLES
 Class57=CNewActionDlg
-Resource71=IDD_OBJECT_CLUSTER_RESOURCES
+Resource71=IDD_LASTVAL_PROP
 Class58=CEditActionDlg
-Resource72=IDD_OBJTOOL_GENERAL
+Resource72=IDD_EDIT_RULE_COMMENT
 Class59=CActionSelDlg
-Resource73=IDD_FATAL_ERROR
+Resource73=IDD_EDIT_VARIABLE
 Resource74=IDD_OBJECT_COND_SCRIPT (English (U.S.))
 Resource75=IDD_EDIT_TRAP_ARG (English (U.S.))
-Resource76=IDA_OBJECT_BROWSER
+Resource76=IDD_OBJECT_COND_SCRIPT
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
-Resource77=IDA_GRAPH
+Resource77=IDD_DISCOVERY_TARGETS
 Class62=CCreateNodeDlg
 Resource78=IDA_CERT_MANAGER (English (U.S.))
 Resource79=IDT_MAP (English (U.S.))
@@ -158,31 +158,31 @@ Resource81=IDD_CREATE_CLUSTER (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
-Resource83=IDD_CREATE_CONTAINER
-Resource84=IDD_DISCOVERY_TARGETS
+Resource83=IDA_DC_EDITOR
+Resource84=IDD_DISCOVERY_COMMUNITIES
 Class66=CCreateTemplateDlg
 Class67=CCreateTGDlg
-Resource85=IDD_THRESHOLD
-Resource86=IDD_ADD_DCI
+Resource85=IDA_OBJECT_BROWSER
+Resource86=IDD_CREATE_TEMPLATE
 Class68=CTrapEditor
-Resource87=IDA_ALARM_BROWSER
-Resource88=IDA_MDI_DEFAULT
-Resource89=IDD_SET_CHILD_MGMT_STATUS
+Resource87=IDD_GROUP_PROPERTIES
+Resource88=IDD_SELECT_USER
+Resource89=IDA_OBJECT_COMMENTS
 Class69=CDataQueryDlg
-Resource90=IDD_CHANGE_IP
+Resource90=IDD_EDIT_RULE_SEVERITY
 Class70=CTrapEditDlg
 Resource91=IDD_SET_CHILD_MGMT_STATUS (English (U.S.))
 Class71=CTrapParamDlg
-Resource92=IDD_DATA_QUERY
-Resource93=IDD_EDIT_TRAP_ARG
+Resource92=IDD_DCI_SCHEDULE
+Resource93=IDA_NODE_POLLER
 Class72=CGraphPropDlg
 Class73=CColorSelector
 Class74=CPackageMgr
-Resource94=IDD_SAVE_AGENT_CFG
+Resource94=IDD_THRESHOLD
 Resource95=IDD_IMPORT_CA_CERT (English (U.S.))
 Resource96=IDD_SUBMAP_BKGND (English (U.S.))
 Resource97=IDD_DISCOVERY_TARGETS (English (U.S.))
-Resource98=IDD_CREATE_CONDITION
+Resource98=IDD_CREATE_CONTAINER
 Resource99=IDA_NODE_POLLER (English (U.S.))
 Resource100=IDD_CREATE_MP (English (U.S.))
 Resource101=IDM_VIEW_SPECIFIC (English (U.S.))
@@ -244,7 +244,7 @@ Class102=CWaitView
 Class103=CWebBrowser
 Class104=CSyslogBrowser
 Class105=CLPPList
-Resource129=IDA_AGENT_CFG_EDITOR
+Resource129=IDD_SELECT_MP
 Class106=CDCISchedulePage
 Resource130=IDD_FATAL_ERROR (English (U.S.))
 Class107=CObjectPropsStatus
@@ -270,113 +270,113 @@ Class119=CMapControlBox
 Resource138=IDD_MANAGE_GRAPHS (English (U.S.))
 Class120=CSubmapBkgndDlg
 Resource139=IDD_USER_PROPERTIES (English (U.S.))
-Resource140=IDD_CREATE_TG
-Resource141=IDD_OBJECT_RELATIONS
-Resource142=IDD_CREATE_IF_DCI
-Resource143=IDD_CREATE_NETSRV
-Resource144=IDD_CP_GENERAL
-Resource145=IDA_PACKAGE_MGR
-Resource146=IDD_CREATE_NODE
-Resource147=IDD_NEW_OBJECT_TOOL
-Resource148=IDA_TRAP_EDITOR
-Resource149=IDD_SELECT_MP
-Resource150=IDA_MAP_MANAGER
-Resource151=IDD_OBJECT_COND_SCRIPT
-Resource152=IDD_EDIT_RULE_SITUATION
-Resource153=IDA_AGENT_CONFIG_MANAGER
-Resource154=IDD_LASTVAL_PROP
-Resource155=IDD_DISCOVERY_RANGES
-Resource156=IDD_CREATE_CLUSTER
-Resource157=IDD_CREATE_VPNC
-Resource158=IDD_SUBMAP_BKGND
-Resource159=IDD_DISCOVERY_COMMUNITIES
-Resource160=IDD_DCI_THRESHOLDS
-Resource161=IDD_IMPORT_CA_CERT
-Resource162=IDD_OBJECT_NETSRV_GENERAL
-Resource163=IDD_SELECT_MAP
-Resource164=IDD_REQUEST_PROCESSING
-Resource165=IDD_OBJTOOL_COLUMNS
-Resource166=IDA_OBJECT_TOOLS_EDITOR
-Resource167=IDD_EDIT_RULE_OPTIONS
-Resource168=IDD_DCI_SCHEDULE
-Resource169=IDA_SCRIPT_MANAGER
-Resource170=IDA_CERT_MANAGER
-Resource171=IDD_EDIT_VARIABLE
+Resource140=IDA_DATA_VIEW
+Resource141=IDD_REQUEST_PROCESSING
+Resource142=IDD_OBJECT_STATUS
+Resource143=IDD_EDIT_EVENT
+Resource144=IDA_PACKAGE_MGR
+Resource145=IDD_DISCOVERY_RANGES
+Resource146=IDA_OBJECT_TOOLS_EDITOR
+Resource147=IDD_SELECT_EVENT
+Resource148=IDD_DISCOVERY_GENERAL
+Resource149=IDD_OBJECT_NODE_POLL
+Resource150=IDD_CREATE_TG
+Resource151=IDD_DCI_TRANSFORM
+Resource152=IDD_OBJTOOL_COLUMNS
+Resource153=IDD_OBJECT_CLUSTER_RESOURCES
+Resource154=IDD_NEW_USER
+Resource155=IDD_INPUT_BOX
+Resource156=IDD_GRAPH_PROP_SETTINGS
+Resource157=IDD_SET_PASSWORD
+Resource158=IDD_ACTION_PROPERTIES
+Resource159=IDD_OBJTOOL_OPTIONS
+Resource160=IDA_MDI_DEFAULT
+Resource161=IDA_AGENT_CONFIG_MANAGER
+Resource162=IDD_OBJECT_NODE_GENERAL
+Resource163=IDD_SUBMAP_BKGND
+Resource164=IDD_OBJECT_IF_GENERAL
+Resource165=IDD_CREATE_CLUSTER
+Resource166=IDD_UPGRADE
+Resource167=IDD_CHANGE_IP
+Resource168=IDD_MIB_BROWSER
+Resource169=IDD_CP_GENERAL
+Resource170=IDD_FATAL_ERROR
+Resource171=IDD_ADD_DCI
 Class121=CModuleManager
 Class122=CDesktopManager
-Resource172=IDD_CREATE_TEMPLATE
-Resource173=IDD_OBJECT_IF_GENERAL
+Resource172=IDD_SAVE_AGENT_CFG
+Resource173=IDD_NEW_OBJECT_TOOL
 Class123=CCreateCondDlg
 Class124=CCondPropsGeneral
 Class125=CCondPropsScript
 Class126=CCondPropsData
-Resource174=IDA_LAST_VALUES
+Resource174=IDD_ADDR_ENTRY
 Class127=CAddDCIDlg
-Resource175=IDD_INPUT_BOX
+Resource175=IDD_ABOUTBOX
 Class128=CCondDCIPropDlg
-Resource176=IDA_EPP
+Resource176=IDD_OBJECT_COND_DATA
 Class129=CAgentConfigMgr
-Resource177=IDD_REMOVE_TEMPLATE
-Resource178=IDD_MANAGE_GRAPHS
+Resource177=IDD_EDIT_RULE_ALARM
+Resource178=IDD_OBJECT_VPNC_GENERAL
 Class130=CAgentCfgDlg
 Class131=CObjectCommentsEditor
-Resource179=IDD_SELECT_SITUATION
+Resource179=IDD_REMOVE_TEMPLATE
 Class132=CRuleScriptDlg
 Class133=CDetailsView
-Resource180=IDD_DCI_TRANSFORM
+Resource180=IDA_SCRIPT_MANAGER
 Class134=CDiscoveryPropGeneral
-Resource181=IDD_GROUP_PROPERTIES
+Resource181=IDD_DESKTOP_SAVE_AS
 Class135=CDiscoveryPropTargets
-Resource182=IDD_SELECT_USER
+Resource182=IDD_SELECT_SITUATION
 Class136=CDiscoveryPropAddrList
-Resource183=IDD_MIB_BROWSER
+Resource183=IDA_EPP
 Class138=CObjectView
 Class139=CObjectOverview
 Class140=CAlarmView
 Class141=CObjectDepView
-Resource184=IDD_DESKTOP_SAVE_AS
+Resource184=IDD_OBJECT_GENERAL
 Class137=CObjectBrowser
 Class142=CCreateMPDlg
-Resource185=IDD_EDIT_TRAP
+Resource185=IDA_CERT_MANAGER
 Class143=CSelectMPDlg
-Resource186=IDD_EDIT_RULE_SEVERITY
+Resource186=IDA_TRAP_EDITOR
 Class144=CTrapSelDlg
-Resource187=IDD_UPGRADE
+Resource187=IDD_DEFINE_GRAPH
 Class145=CConsoleUpgradeDlg
-Resource188=IDD_USER_PROPERTIES
+Resource188=IDD_OBJECT_TRUSTED_NODES
 Class146=CCreateClusterDlg
-Resource189=IDD_GRAPH_PROP_DATA
+Resource189=IDD_OBJECT_COND_GENERAL
 Class147=CClusterPropsGeneral
-Resource190=IDA_SITUATION_MANAGER
+Resource190=IDD_MANAGE_GRAPHS
 Class148=CClusterPropsResources
-Resource191=IDD_OBJECT_NODE_POLL
+Resource191=IDD_OBJECT_CAPS
 Class149=CClusterResDlg
-Resource192=IDA_ACTION_EDITOR
+Resource192=IDD_DCI_THRESHOLDS
 Class150=CClusterView
 Class151=CExtEditCtrl
-Resource193=IDD_OBJECT_CAPS
+Resource193=IDD_MAP_LINK
 Class152=CFatalErrorDlg
-Resource194=IDD_SELECT_TRAP
+Resource194=IDD_OBJECT_RELATIONS
 Class153=CDefineGraphDlg
-Resource195=IDD_OBJECT_GENERAL
+Resource195=IDD_SELECT_AGENT_PARAM
 Class154=CGraphManagerDlg
-Resource196=IDD_DCI_DATA_EXPORT
+Resource196=IDD_USER_PROPERTIES
 Class155=CGraphStylePage
 Class156=CNodePerfView
 Class157=CCertManager
-Resource197=IDD_SELECT_AGENT_PARAM
+Resource197=IDA_MAP_MANAGER
 Class158=CImportCertDlg
-Resource198=IDD_SELECT_OBJECT
+Resource198=IDA_ALARM_BROWSER
 Class159=CNodeTopologyView
 Class160=CObjectStatusBar
 Class161=CObjectTree
 Resource199=IDM_VIEW_SPECIFIC
 Class162=CChildMgmtStatusDlg
-Resource200=IDD_OBJECT_SECURITY
+Resource200=IDD_EDIT_RULE_OPTIONS
 Class163=CCreateIfDCIDlg
 Class164=CNodeLastValuesView
 Class165=CObjectSubordinateView
-Resource201=IDD_OBJECT_STATUS
+Resource201=IDD_SELECT_OBJECT
 Class166=CMapLinkPropDlg
 Resource202=IDD_INPUT_BOX (English (U.S.))
 Resource203=IDD_EDIT_RULE_SEVERITY (English (U.S.))
@@ -430,21 +430,21 @@ Class172=CRuleSituationDlg
 Resource245=IDD_UPGRADE (English (U.S.))
 Class173=CObjectPropsTrustedNodes
 Resource246=IDD_OBJECT_TRUSTED_NODES (English (U.S.))
-Resource247=IDD_SELECT_ACTION
-Resource248=IDD_EDIT_EVENT
-Resource249=IDD_CLUSTER_RESOURCE
-Resource250=IDD_AGENT_CONFIG
-Resource251=IDD_EDIT_RULE_ALARM
-Resource252=IDR_MAINFRAME
-Resource253=IDD_DISCOVERY_GENERAL
-Resource254=IDD_ACTION_PROPERTIES
+Resource247=IDA_AGENT_CFG_EDITOR
+Resource248=IDD_SET_CHILD_MGMT_STATUS
+Resource249=IDD_DCI_DATA_EXPORT
+Resource250=IDD_EDIT_TRAP
+Resource251=IDA_GRAPH
+Resource252=IDD_CREATE_CONDITION
+Resource253=IDD_SELECT_INTERNAL_ITEM
+Resource254=IDA_SERVER_CFG_EDITOR
 Class174=CMapSelDlg
 Class175=CMapManager
-Resource255=IDD_GRAPH_PROP_SETTINGS
-Resource256=IDA_OBJECT_COMMENTS
+Resource255=IDD_OBJECT_SECURITY
+Resource256=IDD_SELECT_ACTION
 Class176=CCreateNetMapDlg
 Class177=CObjectTreeCtrl
-Resource257=IDD_OBJTOOL_OPTIONS
+Resource257=IDD_OBJECT_PRESENTATION
 Class178=CObjectPropsCustomAttrs
 Class179=CSyslogParserCfg
 Resource258=IDD_OBJECT_CUSTOM_ATTRS
@@ -4777,42 +4777,44 @@ Control6=IDC_STATIC,static,1342308352
 [DLG:IDD_GRAPH_PROP_SETTINGS]
 Type=1
 Class=CGraphSettingsPage
-ControlCount=35
-Control1=IDC_CHECK_GRID,button,1342242819
-Control2=IDC_CHECK_AUTOSCALE,button,1342242819
-Control3=IDC_CHECK_LEGEND,button,1342242819
-Control4=IDC_CHECK_RULER,button,1342242819
-Control5=IDC_CHECK_HOSTNAMES,button,1342242819
-Control6=IDC_CHECK_ZOOM,button,1342242819
-Control7=IDC_CHECK_REFRESH,button,1342242819
-Control8=IDC_EDIT_REFRESH,edit,1350639744
-Control9=IDC_CB_BACKGROUND,button,1342242816
-Control10=IDC_CB_TEXT,button,1342242816
-Control11=IDC_CB_AXIS,button,1342242816
-Control12=IDC_CB_SELECTION,button,1342242816
-Control13=IDC_CB_GRID,button,1342242816
-Control14=IDC_CB_RULER,button,1342242816
-Control15=IDC_RADIO_FIXED,button,1342373897
-Control16=IDC_DATE_FROM,SysDateTimePick32,1342242864
-Control17=IDC_TIME_FROM,SysDateTimePick32,1342242873
-Control18=IDC_DATE_TO,SysDateTimePick32,1342242864
-Control19=IDC_TIME_TO,SysDateTimePick32,1342242873
-Control20=IDC_RADIO_FROM_NOW,button,1342242825
-Control21=IDC_EDIT_COUNT,edit,1350639744
-Control22=IDC_COMBO_UNITS,combobox,1344339971
-Control23=IDC_STATIC,static,1342308352
+ControlCount=37
+Control1=IDC_EDIT_TITLE,edit,1350631552
+Control2=IDC_CHECK_GRID,button,1342242819
+Control3=IDC_CHECK_AUTOSCALE,button,1342242819
+Control4=IDC_CHECK_LEGEND,button,1342242819
+Control5=IDC_CHECK_RULER,button,1342242819
+Control6=IDC_CHECK_HOSTNAMES,button,1342242819
+Control7=IDC_CHECK_ZOOM,button,1342242819
+Control8=IDC_CHECK_REFRESH,button,1342242819
+Control9=IDC_EDIT_REFRESH,edit,1350639744
+Control10=IDC_CB_BACKGROUND,button,1342242816
+Control11=IDC_CB_TEXT,button,1342242816
+Control12=IDC_CB_AXIS,button,1342242816
+Control13=IDC_CB_SELECTION,button,1342242816
+Control14=IDC_CB_GRID,button,1342242816
+Control15=IDC_CB_RULER,button,1342242816
+Control16=IDC_RADIO_FIXED,button,1342373897
+Control17=IDC_DATE_FROM,SysDateTimePick32,1342242864
+Control18=IDC_TIME_FROM,SysDateTimePick32,1342242873
+Control19=IDC_DATE_TO,SysDateTimePick32,1342242864
+Control20=IDC_TIME_TO,SysDateTimePick32,1342242873
+Control21=IDC_RADIO_FROM_NOW,button,1342242825
+Control22=IDC_EDIT_COUNT,edit,1350639744
+Control23=IDC_COMBO_UNITS,combobox,1344339971
 Control24=IDC_STATIC,static,1342308352
 Control25=IDC_STATIC,static,1342308352
 Control26=IDC_STATIC,static,1342308352
 Control27=IDC_STATIC,static,1342308352
-Control28=IDC_STATIC,button,1342177287
-Control29=IDC_STATIC_REFRESH,static,1342308352
-Control30=IDC_STATIC_SECONDS,static,1342308352
-Control31=IDC_STATIC,button,1342177287
+Control28=IDC_STATIC,static,1342308352
+Control29=IDC_STATIC,button,1342177287
+Control30=IDC_STATIC_REFRESH,static,1342308352
+Control31=IDC_STATIC_SECONDS,static,1342308352
 Control32=IDC_STATIC,button,1342177287
-Control33=IDC_STATIC_FROM,static,1342308352
-Control34=IDC_STATIC_TO,static,1342308352
-Control35=IDC_STATIC,static,1342308352
+Control33=IDC_STATIC,button,1342177287
+Control34=IDC_STATIC_FROM,static,1342308352
+Control35=IDC_STATIC_TO,static,1342308352
+Control36=IDC_STATIC,static,1342308352
+Control37=IDC_STATIC,static,1342308352
 
 [DLG:IDD_GRAPH_PROP_DATA]
 Type=1
index fe20346..232d127 100644 (file)
@@ -2396,73 +2396,75 @@ BEGIN
     LTEXT           "Existing desktop configurations",IDC_STATIC,7,39,98,8
 END
 
-IDD_GRAPH_PROP_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 161
+IDD_GRAPH_PROP_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 187
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Settings"
 FONT 8, "MS Sans Serif"
 BEGIN
+    EDITTEXT        IDC_EDIT_TITLE,7,16,283,14,ES_AUTOHSCROLL
     CONTROL         "Show &grid lines",IDC_CHECK_GRID,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,18,63,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,44,63,10
     CONTROL         "&Autoscale",IDC_CHECK_AUTOSCALE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,100,18,47,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,100,44,47,10
     CONTROL         "Show &legend",IDC_CHECK_LEGEND,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,31,57,10
+                    WS_TABSTOP,14,57,57,10
     CONTROL         "Show r&uler",IDC_CHECK_RULER,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,100,31,49,10
+                    WS_TABSTOP,100,57,49,10
     CONTROL         "Show &host names",IDC_CHECK_HOSTNAMES,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,43,72,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,69,72,10
     CONTROL         "Enable &zoom",IDC_CHECK_ZOOM,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,100,43,57,10
+                    WS_TABSTOP,100,69,57,10
     CONTROL         "&Refresh automatically",IDC_CHECK_REFRESH,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,14,56,83,10
-    EDITTEXT        IDC_EDIT_REFRESH,67,70,30,14,ES_AUTOHSCROLL | ES_NUMBER
-    PUSHBUTTON      "X",IDC_CB_BACKGROUND,57,103,27,12
-    PUSHBUTTON      "X",IDC_CB_TEXT,128,103,27,12
-    PUSHBUTTON      "X",IDC_CB_AXIS,57,119,27,12
-    PUSHBUTTON      "X",IDC_CB_SELECTION,128,119,27,12
-    PUSHBUTTON      "X",IDC_CB_GRID,57,135,27,12
-    PUSHBUTTON      "X",IDC_CB_RULER,128,135,27,12
+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,82,83,10
+    EDITTEXT        IDC_EDIT_REFRESH,67,96,30,14,ES_AUTOHSCROLL | ES_NUMBER
+    PUSHBUTTON      "X",IDC_CB_BACKGROUND,57,129,27,12
+    PUSHBUTTON      "X",IDC_CB_TEXT,128,129,27,12
+    PUSHBUTTON      "X",IDC_CB_AXIS,57,145,27,12
+    PUSHBUTTON      "X",IDC_CB_SELECTION,128,145,27,12
+    PUSHBUTTON      "X",IDC_CB_GRID,57,161,27,12
+    PUSHBUTTON      "X",IDC_CB_RULER,128,161,27,12
     CONTROL         "&Fixed time frame",IDC_RADIO_FIXED,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,171,19,67,10
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,171,45,67,10
     CONTROL         "DateTimePicker1",IDC_DATE_FROM,"SysDateTimePick32",
-                    DTS_RIGHTALIGN | DTS_APPCANPARSE | WS_TABSTOP,171,42,62,
+                    DTS_RIGHTALIGN | DTS_APPCANPARSE | WS_TABSTOP,171,68,62,
                     15
     CONTROL         "DateTimePicker2",IDC_TIME_FROM,"SysDateTimePick32",
                     DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
-                    WS_TABSTOP | 0x8,237,42,46,15
+                    WS_TABSTOP | 0x8,237,68,46,15
     CONTROL         "DateTimePicker1",IDC_DATE_TO,"SysDateTimePick32",
-                    DTS_RIGHTALIGN | DTS_APPCANPARSE | WS_TABSTOP,171,71,62,
+                    DTS_RIGHTALIGN | DTS_APPCANPARSE | WS_TABSTOP,171,97,62,
                     15
     CONTROL         "DateTimePicker2",IDC_TIME_TO,"SysDateTimePick32",
                     DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
-                    WS_TABSTOP | 0x8,237,71,46,15
+                    WS_TABSTOP | 0x8,237,97,46,15
     CONTROL         "&Back from now",IDC_RADIO_FROM_NOW,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,171,97,63,10
-    EDITTEXT        IDC_EDIT_COUNT,171,110,40,14,ES_AUTOHSCROLL | ES_NUMBER
-    COMBOBOX        IDC_COMBO_UNITS,216,111,68,63,CBS_DROPDOWNLIST | 
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,171,123,63,10
+    EDITTEXT        IDC_EDIT_COUNT,171,136,40,14,ES_AUTOHSCROLL | ES_NUMBER
+    COMBOBOX        IDC_COMBO_UNITS,216,137,68,63,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Background",IDC_STATIC,13,105,40,8
-    LTEXT           "Axis lines",IDC_STATIC,13,121,30,8
-    LTEXT           "Grid lines",IDC_STATIC,13,137,30,8
-    LTEXT           "Text",IDC_STATIC,94,105,15,8
-    LTEXT           "Selection",IDC_STATIC,94,121,30,8
-    GROUPBOX        "Options",IDC_STATIC,7,7,153,83
-    LTEXT           "Refresh interval",IDC_STATIC_REFRESH,14,73,50,8
-    LTEXT           "seconds",IDC_STATIC_SECONDS,101,73,28,8
-    GROUPBOX        "Colors",IDC_STATIC,7,93,154,61
-    GROUPBOX        "Time Frame",IDC_STATIC,165,7,125,147
-    LTEXT           "From",IDC_STATIC_FROM,171,32,16,8
-    LTEXT           "To",IDC_STATIC_TO,171,61,10,8
-    LTEXT           "Ruler",IDC_STATIC,94,137,18,8
-END
-
-IDD_GRAPH_PROP_DATA DIALOGEX 0, 0, 297, 174
+    LTEXT           "Background",IDC_STATIC,13,131,40,8
+    LTEXT           "Axis lines",IDC_STATIC,13,147,30,8
+    LTEXT           "Grid lines",IDC_STATIC,13,163,30,8
+    LTEXT           "Text",IDC_STATIC,94,131,15,8
+    LTEXT           "Selection",IDC_STATIC,94,147,30,8
+    GROUPBOX        "Options",IDC_STATIC,7,33,153,83
+    LTEXT           "Refresh interval",IDC_STATIC_REFRESH,14,99,50,8
+    LTEXT           "seconds",IDC_STATIC_SECONDS,101,99,28,8
+    GROUPBOX        "Colors",IDC_STATIC,7,119,154,61
+    GROUPBOX        "Time Frame",IDC_STATIC,165,33,125,147
+    LTEXT           "From",IDC_STATIC_FROM,171,58,16,8
+    LTEXT           "To",IDC_STATIC_TO,171,87,10,8
+    LTEXT           "Ruler",IDC_STATIC,94,163,18,8
+    LTEXT           "Title",IDC_STATIC,7,7,14,8
+END
+
+IDD_GRAPH_PROP_DATA DIALOGEX 0, 0, 297, 187
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Data Sources"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "List1",IDC_LIST_DCI,"SysListView32",LVS_REPORT | 
-                    LVS_SHOWSELALWAYS | WS_TABSTOP,7,7,226,160,
+                    LVS_SHOWSELALWAYS | WS_TABSTOP,7,7,226,173,
                     WS_EX_CLIENTEDGE
     PUSHBUTTON      "&Add...",IDC_BUTTON_ADD,240,7,50,14
     PUSHBUTTON      "&Delete",IDC_BUTTON_DELETE,240,25,50,14
@@ -3236,7 +3238,7 @@ END
 IDD_DEFINE_GRAPH DIALOGEX 0, 0, 279, 196
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Define Graph"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     EDITTEXT        IDC_EDIT_NAME,7,17,265,14,ES_AUTOHSCROLL
     CONTROL         "List1",IDC_LIST_USERS,"SysListView32",LVS_REPORT | 
@@ -3272,14 +3274,14 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,270,45,50,14
 END
 
-IDD_GRAPH_PROP_STYLES DIALOGEX 0, 0, 297, 174
+IDD_GRAPH_PROP_STYLES DIALOGEX 0, 0, 297, 187
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Item Style"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     CONTROL         "List1",IDC_LIST_ITEMS,"SysListView32",LVS_REPORT | 
                     LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_OWNERDRAWFIXED | 
-                    LVS_NOSORTHEADER | WS_TABSTOP,7,7,283,160,
+                    LVS_NOSORTHEADER | WS_TABSTOP,7,7,283,173,
                     WS_EX_CLIENTEDGE
 END
 
@@ -3912,7 +3914,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 290
         TOPMARGIN, 7
-        BOTTOMMARGIN, 154
+        BOTTOMMARGIN, 180
     END
 
     IDD_GRAPH_PROP_DATA, DIALOG
@@ -3920,7 +3922,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 290
         TOPMARGIN, 7
-        BOTTOMMARGIN, 167
+        BOTTOMMARGIN, 180
     END
 
     IDD_LASTVAL_PROP, DIALOG
@@ -4256,7 +4258,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 290
         TOPMARGIN, 7
-        BOTTOMMARGIN, 167
+        BOTTOMMARGIN, 180
     END
 
     IDD_IMPORT_CA_CERT, DIALOG
index ea5a312..485d13e 100644 (file)
 #define IDC_CHECK_REGISTER_AGENTS       1532
 #define IDC_CHECK_ACCESS_FILES          1533
 #define IDC_RADIO_FORWARD               1536
+#define IDC_EDIT_TITLE                  1537
 #define IDR_WEB_BROWSER                 8100
 #define IDR_SYSLOG_BROWSER              8101
 #define IDR_LPP_EDITOR                  8102
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        391
 #define _APS_NEXT_COMMAND_VALUE         33109
-#define _APS_NEXT_CONTROL_VALUE         1537
+#define _APS_NEXT_CONTROL_VALUE         1538
 #define _APS_NEXT_SYMED_VALUE           135
 #endif
 #endif
index 58b38d6..dcf7261 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
   <dependency>
     <dependentAssembly>
index 58b38d6..dcf7261 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
   <dependency>
     <dependentAssembly>
index 58b38d6..dcf7261 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
   <dependency>
     <dependentAssembly>
index 58b38d6..dcf7261 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
   <dependency>
     <dependentAssembly>
index f7b1fe7..533924e 100644 (file)
@@ -27,7 +27,7 @@
 // Constants
 //
 
-#define MAX_MSG_SIZE       32768
+#define MAX_MSG_SIZE       262144
 
 #define ISC_STATE_INIT        0
 #define ISC_STATE_CONNECTED   1