- Added selection of internal parameters in DCI configuration dialog
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 23 Jan 2005 19:04:18 +0000 (19:04 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 23 Jan 2005 19:04:18 +0000 (19:04 +0000)
- Added automatic DCI data type selection based on selected parameter

12 files changed:
.gitattributes
TODO
src/console/win32/DCIPropPage.cpp
src/console/win32/DCIPropPage.h
src/console/win32/InternalItemSelDlg.cpp [new file with mode: 0644]
src/console/win32/InternalItemSelDlg.h [new file with mode: 0644]
src/console/win32/MIBBrowserDlg.cpp
src/console/win32/MIBBrowserDlg.h
src/console/win32/nxcon.clw
src/console/win32/nxcon.dsp
src/console/win32/nxcon.rc
src/console/win32/resource.h

index 60a3daf..dbd0bbe 100644 (file)
@@ -319,6 +319,8 @@ src/console/win32/GraphPropDlg.cpp -text
 src/console/win32/GraphPropDlg.h -text
 src/console/win32/GroupPropDlg.cpp -text
 src/console/win32/GroupPropDlg.h -text
+src/console/win32/InternalItemSelDlg.cpp -text
+src/console/win32/InternalItemSelDlg.h -text
 src/console/win32/LoginDialog.cpp -text
 src/console/win32/LoginDialog.h -text
 src/console/win32/MIBBrowserDlg.cpp -text
diff --git a/TODO b/TODO
index 010f6fc..a23cb34 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,8 +23,7 @@ GENERAL:
 - View and update agent's configuration from server
 - Add diff() method for DCI thresholds
 - Planned outages (maintenance schedule)
-- NxAdm -- status, stop server
-- NxDbMgr -- backup before db recover
+- Add "Last collected values" view for each node
 
 
 SERVER:
@@ -40,7 +39,6 @@ SERVER:
 - On startup, server must read last poll time from database for each DCI
 - Optimize SNMP subsystem
 - Add special handling for HP iLO boards
-- Multiple status pollers
 - Housekeeping for DCI
 - Add logging API for database drivers
 - DCI transformation scripts (probably Perl?)
@@ -58,6 +56,8 @@ SERVER:
 - Bug: after server restart, all empty key and ack_key fields in EPP contains
   strings of one space character instead of empty string, which cause
   very interesting effects with alarms autoacknowlegement
+- NxAdm -- status, stop server
+- NxDbMgr -- backup before db recover
 
 
 CORE AGENT:
@@ -85,8 +85,6 @@ SOLARIS AGENT:
 
 WINDOWS CONSOLE:
 
-- Automatically select data type in DCI configuration dialog based on
-  selected parameter
 - Add parameter selection for native agents in DCI configuration dialog
 - Find good graph creation library
 - Enlarge 16x16 status overlay icons
index 2563be8..13a2c6d 100644 (file)
@@ -5,6 +5,7 @@
 #include "nxcon.h"
 #include "DCIPropPage.h"
 #include "MIBBrowserDlg.h"
+#include "InternalItemSelDlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -82,7 +83,6 @@ BOOL CDCIPropPage::OnInitDialog()
    for(i = 0; i < 3; i++)
       m_wndOriginList.AddString(g_pszItemOriginLong[i]);
    m_wndOriginList.SelectString(-1, g_pszItemOriginLong[m_iOrigin]);
-   m_wndSelectButton.EnableWindow(m_iOrigin == DS_SNMP_AGENT);
        
    // Add data types
    for(i = 0; i < 6; i++)
@@ -98,6 +98,43 @@ BOOL CDCIPropPage::OnInitDialog()
 //
 
 void CDCIPropPage::OnButtonSelect() 
+{
+   switch(m_iOrigin)
+   {
+      case DS_NATIVE_AGENT:
+         break;
+      case DS_SNMP_AGENT:
+         SelectSNMPItem();
+         break;
+      case DS_INTERNAL:
+         SelectInternalItem();
+         break;
+      default:
+         break;
+   }
+}
+
+
+//
+// Handler for selection change in origin combo box
+//
+
+void CDCIPropPage::OnSelchangeComboOrigin() 
+{
+   TCHAR szBuffer[256];
+
+   m_wndOriginList.GetWindowText(szBuffer, 256);
+   for(m_iOrigin = 0; m_iOrigin < 2; m_iOrigin++)
+      if (!strcmp(szBuffer, g_pszItemOriginLong[m_iOrigin]))
+         break;
+}
+
+
+//
+// Select SNMP parameter
+//
+
+void CDCIPropPage::SelectSNMPItem()
 {
    CMIBBrowserDlg dlg;
    TCHAR *pDot, szBuffer[1024];
@@ -121,18 +158,26 @@ void CDCIPropPage::OnButtonSelect()
       _stprintf(szBuffer, _T(".%lu"), dlg.m_dwInstance);
       dlg.m_strOID += szBuffer;
       m_wndEditName.SetWindowText(dlg.m_strOID);
+      m_wndTypeList.SelectString(-1, g_pszItemDataType[dlg.m_iDataType]);
+      m_wndEditName.SetFocus();
    }
 }
 
 
 //
-// Handler for selection change in origin combo box
+// Select internal item (like Status)
 //
 
-void CDCIPropPage::OnSelchangeComboOrigin() 
+void CDCIPropPage::SelectInternalItem()
 {
-   char szBuffer[256];
+   CInternalItemSelDlg dlg;
 
-   m_wndOriginList.GetWindowText(szBuffer, 256);
-   m_wndSelectButton.EnableWindow(!strcmp(szBuffer, g_pszItemOriginLong[DS_SNMP_AGENT]));
+   dlg.m_pNode = m_pNode;
+   if (dlg.DoModal() == IDOK)
+   {
+      m_wndEditName.SetWindowText(dlg.m_szItemName);
+      SetDlgItemText(IDC_EDIT_DESCRIPTION, dlg.m_szItemDescription);
+      m_wndTypeList.SelectString(-1, g_pszItemDataType[dlg.m_iDataType]);
+      m_wndEditName.SetFocus();
+   }
 }
index 57bc23a..1c78039 100644 (file)
@@ -46,6 +46,8 @@ public:
 
 // Implementation
 protected:
+       void SelectInternalItem(void);
+       void SelectSNMPItem(void);
 
        // Generated message map functions
        //{{AFX_MSG(CDCIPropPage)
diff --git a/src/console/win32/InternalItemSelDlg.cpp b/src/console/win32/InternalItemSelDlg.cpp
new file mode 100644 (file)
index 0000000..946b560
--- /dev/null
@@ -0,0 +1,144 @@
+// InternalItemSelDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "nxcon.h"
+#include "InternalItemSelDlg.h"
+#include "DataQueryDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
+//
+// Static data
+//
+
+static struct __item_info
+{
+   DWORD dwMatchFlags;
+   int iDataType;
+   TCHAR *pszName;
+   TCHAR *pszDescription;
+} m_itemList[] =
+{
+   { NF_IS_LOCAL_MGMT, DCI_DT_FLOAT, _T("Server.AverageConfigurationPollerQueueSize"), _T("Average length of configuration poller queue for last minute") },
+   { NF_IS_LOCAL_MGMT, DCI_DT_FLOAT, _T("Server.AverageDBWriterQueueSize"), _T("Average length of database writer's request queue for last minute") },
+   { NF_IS_LOCAL_MGMT, DCI_DT_UINT, _T("Server.AverageDCIQueuingTime"), _T("Average time to queue DCI for polling for last minute") },
+   { NF_IS_LOCAL_MGMT, DCI_DT_FLOAT, _T("Server.AverageDCPollerQueueSize"), _T("Average length of data collection poller's request queue for last minute") },
+   { NF_IS_LOCAL_MGMT, DCI_DT_FLOAT, _T("Server.AverageStatusPollerQueueSize"), _T("Average length of status poller queue for last minute") },
+   { 0, DCI_DT_INT, _T("Status"), _T("Status") },
+   { 0, 0, NULL, NULL }
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CInternalItemSelDlg dialog
+
+
+CInternalItemSelDlg::CInternalItemSelDlg(CWnd* pParent /*=NULL*/)
+       : CDialog(CInternalItemSelDlg::IDD, pParent)
+{
+       //{{AFX_DATA_INIT(CInternalItemSelDlg)
+               // NOTE: the ClassWizard will add member initialization here
+       //}}AFX_DATA_INIT
+}
+
+
+void CInternalItemSelDlg::DoDataExchange(CDataExchange* pDX)
+{
+       CDialog::DoDataExchange(pDX);
+       //{{AFX_DATA_MAP(CInternalItemSelDlg)
+       DDX_Control(pDX, IDC_LIST_PARAMETERS, m_wndListCtrl);
+       //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CInternalItemSelDlg, CDialog)
+       //{{AFX_MSG_MAP(CInternalItemSelDlg)
+       ON_BN_CLICKED(IDC_BUTTON_GET, OnButtonGet)
+       //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CInternalItemSelDlg message handlers
+
+BOOL CInternalItemSelDlg::OnInitDialog() 
+{
+   DWORD i;
+   int iItem;
+   RECT rect;
+
+       CDialog::OnInitDialog();
+
+   m_wndListCtrl.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_UNDERLINEHOT);
+   m_wndListCtrl.SetHoverTime(0x7FFFFFFF);
+   m_wndListCtrl.GetClientRect(&rect);
+   m_wndListCtrl.InsertColumn(0, _T("Parameter name"), LVCFMT_LEFT, 220);
+   m_wndListCtrl.InsertColumn(1, _T("Type"), LVCFMT_LEFT, 80);
+   m_wndListCtrl.InsertColumn(2, _T("Description"), LVCFMT_LEFT,
+                              rect.right - 300 - GetSystemMetrics(SM_CXVSCROLL));
+       
+   for(i = 0; m_itemList[i].pszName != NULL; i++)
+      if ((m_pNode->node.dwFlags & m_itemList[i].dwMatchFlags) ||
+          (m_itemList[i].dwMatchFlags == 0))
+      {
+         iItem = m_wndListCtrl.InsertItem(0x7FFFFFFF, m_itemList[i].pszName);
+         if (iItem != -1)
+         {
+            m_wndListCtrl.SetItemData(iItem, i);
+            m_wndListCtrl.SetItemText(iItem, 1, g_pszItemDataType[m_itemList[i].iDataType]);
+            m_wndListCtrl.SetItemText(iItem, 2, m_itemList[i].pszDescription);
+         }
+      }
+
+       return TRUE;
+}
+
+
+//
+// Handler for OK button
+//
+
+void CInternalItemSelDlg::OnOK() 
+{
+   if (m_wndListCtrl.GetSelectedCount() == 0)
+   {
+      MessageBox(_T("You must select parameter from the list before pressing OK!"),
+                 _T("Warning"), MB_OK | MB_ICONEXCLAMATION);
+   }
+       else
+   {
+      DWORD dwIndex;
+
+      dwIndex = m_wndListCtrl.GetItemData(m_wndListCtrl.GetSelectionMark());
+      _tcsncpy(m_szItemName, m_itemList[dwIndex].pszName, MAX_DB_STRING);
+      _tcsncpy(m_szItemDescription, m_itemList[dwIndex].pszDescription, MAX_DB_STRING);
+      m_iDataType = m_itemList[dwIndex].iDataType;
+          CDialog::OnOK();
+   }
+}
+
+
+//
+// Handler for "Get..." button
+//
+
+void CInternalItemSelDlg::OnButtonGet() 
+{
+   if (m_wndListCtrl.GetSelectedCount() != 0)
+   {
+      CDataQueryDlg dlg;
+      DWORD dwIndex;
+
+      dwIndex = m_wndListCtrl.GetItemData(m_wndListCtrl.GetSelectionMark());
+      dlg.m_dwObjectId = m_pNode->dwId;
+      dlg.m_strNode = (LPCTSTR)m_pNode->szName;
+      dlg.m_strParameter = (LPCTSTR)m_itemList[dwIndex].pszName;
+      dlg.m_iOrigin = DS_INTERNAL;
+      dlg.DoModal();
+   }
+}
diff --git a/src/console/win32/InternalItemSelDlg.h b/src/console/win32/InternalItemSelDlg.h
new file mode 100644 (file)
index 0000000..4f7c719
--- /dev/null
@@ -0,0 +1,52 @@
+#if !defined(AFX_INTERNALITEMSELDLG_H__7FB54353_A470_4928_B35C_9532A93FDAC9__INCLUDED_)
+#define AFX_INTERNALITEMSELDLG_H__7FB54353_A470_4928_B35C_9532A93FDAC9__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// InternalItemSelDlg.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CInternalItemSelDlg dialog
+
+class CInternalItemSelDlg : public CDialog
+{
+// Construction
+public:
+       int m_iDataType;
+       TCHAR m_szItemDescription[MAX_DB_STRING];
+       TCHAR m_szItemName[MAX_DB_STRING];
+       NXC_OBJECT *m_pNode;
+       CInternalItemSelDlg(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+       //{{AFX_DATA(CInternalItemSelDlg)
+       enum { IDD = IDD_SELECT_INTERNAL_ITEM };
+       CListCtrl       m_wndListCtrl;
+       //}}AFX_DATA
+
+
+// Overrides
+       // ClassWizard generated virtual function overrides
+       //{{AFX_VIRTUAL(CInternalItemSelDlg)
+       protected:
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+       //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+       // Generated message map functions
+       //{{AFX_MSG(CInternalItemSelDlg)
+       virtual BOOL OnInitDialog();
+       virtual void OnOK();
+       afx_msg void OnButtonGet();
+       //}}AFX_MSG
+       DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_INTERNALITEMSELDLG_H__7FB54353_A470_4928_B35C_9532A93FDAC9__INCLUDED_)
index 53f3ac6..03a1fd6 100644 (file)
@@ -195,6 +195,7 @@ void CMIBBrowserDlg::OnSelchangedTreeMib(NMHDR *pNMHDR, LRESULT *pResult)
    m_wndEditStatus.SetWindowText(CodeToText(pNode->status, g_ctSnmpMibStatus, ""));
    m_wndEditAccess.SetWindowText(CodeToText(pNode->access, g_ctSnmpMibAccess, ""));
    m_wndEditType.SetWindowText(CodeToText(pNode->type, g_ctSnmpMibType, ""));
+   m_iSnmpDataType = pNode->type;   // Store data type of current node
 
    pszTemp = BuildSymbolicOIDString(pNode, m_dwInstance);
    m_wndEditOIDText.SetWindowText(pszTemp);
@@ -415,6 +416,28 @@ void CMIBBrowserDlg::OnOK()
    // set input box text to correct number
    if (!m_bUseInstance)
       m_wndEditInstance.SetWindowText(_T("0"));
+
+   // Convert SNMP data type to NetXMS data type
+   switch(m_iSnmpDataType)
+   {
+      case TYPE_INTEGER:
+      case TYPE_INTEGER32:
+         m_iDataType = DCI_DT_INT;
+         break;
+      case TYPE_COUNTER:
+      case TYPE_GAUGE:
+      case TYPE_TIMETICKS:
+      case TYPE_UINTEGER:
+      case TYPE_UNSIGNED32:
+         m_iDataType = DCI_DT_UINT;
+         break;
+      case TYPE_COUNTER64:
+         m_iDataType = DCI_DT_UINT64;
+         break;
+      default:
+         m_iDataType = DCI_DT_STRING;
+         break;
+   }
        
        CDialog::OnOK();
 }
index e75eb87..82673a3 100644 (file)
@@ -21,6 +21,7 @@ class CMIBBrowserDlg : public CDialog
 {
 // Construction
 public:
+       int m_iDataType;
        BOOL m_bUseInstance;
        NXC_OBJECT *m_pNode;
        CMIBBrowserDlg(CWnd* pParent = NULL);   // standard constructor
@@ -66,6 +67,7 @@ protected:
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 private:
+       int m_iSnmpDataType;
        BOOL m_bDisableOIDUpdate;
        void ShowExtControls(BOOL bShow);
        CSize m_sizeCollapsed;
index 5cd7d45..2237efc 100644 (file)
@@ -2,21 +2,21 @@
 
 [General Info]
 Version=1
-LastClass=CUserPropDlg
-LastTemplate=CMDIChildWnd
+LastClass=CInternalItemSelDlg
+LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
 LastPage=0
 
-ClassCount=74
+ClassCount=75
 Class1=CConsoleApp
 Class3=CMainFrame
 Class4=CChildFrame
 Class7=CEventBrowser
 Class9=CMapView
 
-ResourceCount=95
-Resource1=IDD_THRESHOLD (English (U.S.))
+ResourceCount=108
+Resource1=IDD_EDIT_RULE_ALARM (English (U.S.))
 Resource2=IDD_OBJECT_NODE_GENERAL
 Resource3=IDM_VIEW_SPECIFIC (English (U.S.))
 Resource4=IDD_SELECT_OBJECT
@@ -32,9 +32,9 @@ Resource7=IDD_NEW_USER
 Class12=CObjectBrowser
 Resource8=IDD_CREATE_CONTAINER
 Class13=CObjectPropDlg
-Resource9=IDD_CP_GENERAL (English (U.S.))
-Resource10=IDA_OBJECT_BROWSER (English (U.S.))
-Resource11=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource9=IDD_CREATE_TG (English (U.S.))
+Resource10=IDA_TRAP_EDITOR (English (U.S.))
+Resource11=IDD_NEW_USER (English (U.S.))
 Resource12=IDR_CTRLPANEL (English (U.S.))
 Resource13=IDR_EVENTS (English (U.S.))
 Resource14=IDR_MAPFRAME (English (U.S.))
@@ -42,33 +42,33 @@ Resource15=IDR_OBJECTS (English (U.S.))
 Resource16=IDD_DUMMY (English (U.S.))
 Class14=CEventEditor
 Class15=CEditEventDlg
-Resource17=IDD_SET_PASSWORD (English (U.S.))
+Resource17=IDD_SELECT_EVENT (English (U.S.))
 Class16=CDebugFrame
-Resource18=IDD_OBJECT_SECURITY (English (U.S.))
+Resource18=IDD_DCI_THRESHOLDS (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
 Resource20=IDD_SELECT_EVENT
 Class17=CObjectPreview
-Resource21=IDD_DCI_TRANSFORM (English (U.S.))
+Resource21=IDR_MAINFRAME (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_EDIT_RULE_SEVERITY (English (U.S.))
+Resource22=IDD_CREATE_NODE (English (U.S.))
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
-Resource23=IDD_LOGIN (English (U.S.))
+Resource23=IDD_OBJECT_SECURITY (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
 Resource24=IDA_MDI_DEFAULT
 Class26=CRequestProcessingDlg
-Resource25=IDD_EDIT_EVENT (English (U.S.))
+Resource25=IDD_SELECT_USER (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
 Resource27=IDD_EDIT_RULE_ALARM
-Resource28=IDD_USER_PROPERTIES (English (U.S.))
+Resource28=IDD_SELECT_OBJECT (English (U.S.))
 Class27=CObjectPropsGeneral
-Resource29=IDA_ALARM_BROWSER (English (U.S.))
+Resource29=IDA_PACKAGE_MGR (English (U.S.))
 Class28=CObjectPropsSecurity
-Resource30=IDD_CREATE_NODE (English (U.S.))
+Resource30=IDD_GRAPH_PROPERTIES (English (U.S.))
 Resource31=IDD_SELECT_USER
 Resource32=IDD_OBJECT_SECURITY
 Class29=CUserSelectDlg
@@ -85,30 +85,30 @@ Class33=CGroupPropDlg
 Resource39=IDD_CP_GENERAL
 Resource40=IDA_TRAP_EDITOR
 Resource41=IDM_VIEW_SPECIFIC
-Resource42=IDD_SELECT_OBJECT (English (U.S.))
+Resource42=IDD_NEW_ACTION (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
 Class36=CNetSummaryFrame
 Class37=CDataCollectionEditor
-Resource43=IDD_SELECT_ACTION (English (U.S.))
+Resource43=IDD_EDIT_TRAP (English (U.S.))
 Class38=CDCIPropPage
-Resource44=IDD_GROUP_PROPERTIES (English (U.S.))
+Resource44=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Class39=CDCIDataView
-Resource45=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource45=IDD_EDIT_RULE_SEVERITY (English (U.S.))
 Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
-Resource46=IDA_MDI_DEFAULT (English (U.S.))
-Resource47=IDD_OBJECT_CAPS (English (U.S.))
+Resource46=IDA_ACTION_EDITOR (English (U.S.))
+Resource47=IDD_GROUP_PROPERTIES (English (U.S.))
 Resource48=IDM_CONTEXT
 Class43=CThresholdDlg
-Resource49=IDD_SELECT_USER (English (U.S.))
+Resource49=IDD_THRESHOLD (English (U.S.))
 Resource50=IDD_EDIT_TRAP_ARG
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
-Resource51=IDR_MAINFRAME (English (U.S.))
+Resource51=IDA_EVENT_EDITOR (English (U.S.))
 Resource52=IDD_CREATE_NODE
 Class48=CObjectSelDlg
 Resource53=IDD_OBJECT_CAPS
@@ -117,22 +117,22 @@ Class49=CRuleCommentDlg
 Resource55=IDD_DCI_COLLECTION
 Class50=CEventSelDlg
 Resource56=IDD_DATA_QUERY
-Resource57=IDD_REQUEST_PROCESSING (English (U.S.))
+Resource57=IDD_SET_PASSWORD (English (U.S.))
 Resource58=IDD_CREATE_TG
-Resource59=IDD_ABOUTBOX (English (U.S.))
-Resource60=IDD_MIB_BROWSER (English (U.S.))
+Resource59=IDD_OBJECT_GENERAL (English (U.S.))
+Resource60=IDD_CP_GENERAL (English (U.S.))
 Class51=CObjectPropsPresentation
-Resource61=IDD_OBJECT_PRESENTATION (English (U.S.))
+Resource61=IDD_CREATE_CONTAINER (English (U.S.))
 Resource62=IDD_EDIT_RULE_COMMENT
 Class52=CRuleSeverityDlg
 Resource63=IDD_ACTION_PROPERTIES
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
-Resource64=IDD_SELECT_EVENT (English (U.S.))
+Resource64=IDD_REQUEST_PROCESSING (English (U.S.))
 Resource65=IDD_DCI_TRANSFORM
-Resource66=IDD_NEW_ACTION (English (U.S.))
-Resource67=IDD_DCI_COLLECTION (English (U.S.))
-Resource68=IDD_NEW_USER (English (U.S.))
+Resource66=IDD_CREATE_TEMPLATE (English (U.S.))
+Resource67=IDD_OBJECT_PRESENTATION (English (U.S.))
+Resource68=IDD_MIB_BROWSER (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
 Resource69=IDA_ACTION_EDITOR
@@ -143,18 +143,18 @@ Class58=CEditActionDlg
 Resource72=IDA_NETMAP
 Class59=CActionSelDlg
 Resource73=IDD_MIB_BROWSER
-Resource74=IDD_EDIT_RULE_COMMENT (English (U.S.))
-Resource75=IDD_EDIT_RULE_ALARM (English (U.S.))
+Resource74=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource75=IDD_DCI_TRANSFORM (English (U.S.))
 Resource76=IDD_USER_PROPERTIES
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
 Resource77=IDR_MAINFRAME
 Class62=CCreateNodeDlg
-Resource78=IDA_EPP (English (U.S.))
-Resource79=IDD_CREATE_CONTAINER (English (U.S.))
-Resource80=IDD_OBJECT_GENERAL (English (U.S.))
+Resource78=IDA_GRAPH (English (U.S.))
+Resource79=IDD_EDIT_TRAP_ARG (English (U.S.))
+Resource80=IDD_DCI_COLLECTION (English (U.S.))
 Class63=CDCITransformPage
-Resource81=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource81=IDD_DATA_QUERY (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
@@ -180,6 +180,20 @@ Class73=CColorSelector
 Class74=CPackageMgr
 Resource94=IDD_GROUP_PROPERTIES
 Resource95=IDD_GRAPH_PROPERTIES
+Resource96=IDD_ABOUTBOX (English (U.S.))
+Resource97=IDD_LOGIN (English (U.S.))
+Resource98=IDD_EDIT_EVENT (English (U.S.))
+Resource99=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource100=IDD_OBJECT_CAPS (English (U.S.))
+Resource101=IDD_SELECT_ACTION (English (U.S.))
+Resource102=IDA_MDI_DEFAULT (English (U.S.))
+Resource103=IDA_OBJECT_BROWSER (English (U.S.))
+Resource104=IDA_EPP (English (U.S.))
+Resource105=IDA_ALARM_BROWSER (English (U.S.))
+Resource106=IDA_NETMAP (English (U.S.))
+Resource107=IDD_USER_PROPERTIES (English (U.S.))
+Class75=CInternalItemSelDlg
+Resource108=IDD_SELECT_INTERNAL_ITEM
 
 [CLS:CConsoleApp]
 Type=0
@@ -515,7 +529,7 @@ Type=1
 Class=CAboutDlg
 ControlCount=4
 Control1=IDC_STATIC,static,1342177283
-Control2=IDC_STATIC,static,1342308480
+Control2=IDC_VERSION,static,1342308480
 Control3=IDC_STATIC,static,1342308352
 Control4=IDOK,button,1342373889
 
@@ -723,48 +737,88 @@ Command9=ID_OBJECT_VIEW_VIEWASLIST
 Command10=ID_OBJECT_FIND
 Command11=ID_OBJECT_CREATE_NODE
 Command12=ID_OBJECT_CREATE_CONTAINER
-Command13=ID_OBJECT_BIND
-Command14=ID_OBJECT_RENAME
-Command15=ID_OBJECT_DELETE
-Command16=ID_OBJECT_MANAGE
-Command17=ID_OBJECT_UNMANAGE
-Command18=ID_OBJECT_POLL_STATUS
-Command19=ID_OBJECT_POLL_CONFIGURATION
-Command20=ID_OBJECT_DATACOLLECTION
-Command21=ID_OBJECT_PROPERTIES
-Command22=ID_USER_CREATE_USER
-Command23=ID_USER_CREATE_GROUP
-Command24=ID_USER_DELETE
-Command25=ID_USER_SETPASSWORD
-Command26=ID_USER_PROPERTIES
-Command27=ID_ITEM_NEW
-Command28=ID_ITEM_EDIT
-Command29=ID_ITEM_DELETE
-Command30=ID_ITEM_ACTIVATE
-Command31=ID_ITEM_DISABLE
-Command32=ID_ITEM_SHOWDATA
-Command33=ID_ITEM_GRAPH
-Command34=ID_POLICY_ADD
-Command35=ID_POLICY_DELETE
-Command36=ID_POLICY_EDIT
-Command37=ID_POLICY_NEGATECELL
-Command38=ID_POLICY_INSERTRULE_ABOVE
-Command39=ID_POLICY_INSERTRULE_BELOW
-Command40=ID_POLICY_INSERTRULE_TOP
-Command41=ID_POLICY_INSERTRULE_BOTTOM
-Command42=ID_POLICY_DELETERULE
-Command43=ID_POLICY_ENABLERULE
-Command44=ID_POLICY_DISABLERULE
-Command45=ID_ALARM_ACKNOWLEGE
-Command46=ID_ALARM_DELETE
-Command47=ID_ALARM_GOTOSOURCE
-Command48=ID_UPDATE_EVENT_LIST
-Command49=ID_CONTROLPANEL_ACTIONS
-Command50=ID_CONTROLPANEL_EVENTS
-Command51=ID_CONTROLPANEL_EVENTPOLICY
-Command52=ID_CONTROLPANEL_USERS
-Command53=ID_CONTROLPANEL_DCT
-CommandCount=53
+Command13=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command14=ID_OBJECT_CREATE_TEMPLATE
+Command15=ID_OBJECT_BIND
+Command16=ID_OBJECT_RENAME
+Command17=ID_OBJECT_DELETE
+Command18=ID_OBJECT_MANAGE
+Command19=ID_OBJECT_UNMANAGE
+Command20=ID_OBJECT_POLL_STATUS
+Command21=ID_OBJECT_POLL_CONFIGURATION
+Command22=ID_OBJECT_WAKEUP
+Command23=ID_OBJECT_DATACOLLECTION
+Command24=ID_OBJECT_PROPERTIES
+Command25=ID_USER_CREATE_USER
+Command26=ID_USER_CREATE_GROUP
+Command27=ID_USER_DELETE
+Command28=ID_USER_SETPASSWORD
+Command29=ID_USER_PROPERTIES
+Command30=ID_ITEM_NEW
+Command31=ID_ITEM_EDIT
+Command32=ID_ITEM_DELETE
+Command33=ID_ITEM_COPY
+Command34=ID_ITEM_DUPLICATE
+Command35=ID_ITEM_ACTIVATE
+Command36=ID_ITEM_DISABLE
+Command37=ID_ITEM_SHOWDATA
+Command38=ID_ITEM_GRAPH
+Command39=ID_POLICY_ADD
+Command40=ID_POLICY_DELETE
+Command41=ID_POLICY_EDIT
+Command42=ID_POLICY_NEGATECELL
+Command43=ID_POLICY_INSERTRULE_ABOVE
+Command44=ID_POLICY_INSERTRULE_BELOW
+Command45=ID_POLICY_INSERTRULE_TOP
+Command46=ID_POLICY_INSERTRULE_BOTTOM
+Command47=ID_POLICY_DELETERULE
+Command48=ID_POLICY_ENABLERULE
+Command49=ID_POLICY_DISABLERULE
+Command50=ID_POLICY_SAVE
+Command51=ID_ALARM_ACKNOWLEGE
+Command52=ID_ALARM_DELETE
+Command53=ID_ALARM_GOTOSOURCE
+Command54=ID_UPDATE_EVENT_LIST
+Command55=ID_CONTROLPANEL_ACTIONS
+Command56=ID_CONTROLPANEL_AGENTPKG
+Command57=ID_CONTROLPANEL_EVENTS
+Command58=ID_CONTROLPANEL_EVENTPOLICY
+Command59=ID_CONTROLPANEL_SNMPTRAPS
+Command60=ID_CONTROLPANEL_USERS
+Command61=ID_OBJECT_OPEN
+Command62=ID_OBJECT_OPENPARENT
+Command63=ID_OBJECT_FIND
+Command64=ID_OBJECT_CREATE_NODE
+Command65=ID_OBJECT_CREATE_CONTAINER
+Command66=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command67=ID_OBJECT_CREATE_TEMPLATE
+Command68=ID_OBJECT_BIND
+Command69=ID_OBJECT_RENAME
+Command70=ID_OBJECT_DELETE
+Command71=ID_OBJECT_MANAGE
+Command72=ID_OBJECT_UNMANAGE
+Command73=ID_OBJECT_POLL_STATUS
+Command74=ID_OBJECT_POLL_CONFIGURATION
+Command75=ID_OBJECT_WAKEUP
+Command76=ID_OBJECT_DATACOLLECTION
+Command77=ID_OBJECT_PROPERTIES
+Command78=ID_EVENT_NEW
+Command79=ID_EVENT_EDIT
+Command80=ID_EVENT_DELETE
+Command81=ID_ACTION_NEW
+Command82=ID_ACTION_RENAME
+Command83=ID_ACTION_DELETE
+Command84=ID_ACTION_PROPERTIES
+Command85=ID_TRAP_NEW
+Command86=ID_TRAP_EDIT
+Command87=ID_TRAP_DELETE
+Command88=ID_GRAPH_AUTOSCALE
+Command89=ID_GRAPH_FREEZE
+Command90=ID_GRAPH_PROPERTIES
+Command91=ID_PACKAGE_INSTALL
+Command92=ID_PACKAGE_REMOVE
+Command93=ID_PACKAGE_DEPLOY
+CommandCount=93
 
 [ACL:IDA_MDI_DEFAULT (English (U.S.))]
 Type=1
@@ -777,7 +831,7 @@ Type=1
 Class=CEditEventDlg
 ControlCount=13
 Control1=IDC_EDIT_ID,edit,1350633600
-Control2=IDC_COMBO_SEVERITY,combobox,1344340227
+Control2=IDC_COMBO_SEVERITY,combobox,1344339971
 Control3=IDC_EDIT_NAME,edit,1350631552
 Control4=IDC_CHECK_LOG,button,1342242819
 Control5=IDC_EDIT_MESSAGE,edit,1350631552
@@ -943,25 +997,25 @@ LastObject=CRequestProcessingDlg
 Type=1
 Class=CNodePropsGeneral
 ControlCount=22
-Control1=IDC_STATIC,static,1342308352
-Control2=IDC_EDIT_ID,edit,1350633600
-Control3=IDC_STATIC,static,1342308352
-Control4=IDC_STATIC,static,1342308352
-Control5=IDC_EDIT_NAME,edit,1350631552
-Control6=IDC_EDIT_PRIMARY_IP,edit,1350633600
-Control7=IDC_SELECT_IP,button,1342242816
-Control8=IDC_STATIC,static,1342308352
-Control9=IDC_EDIT_OID,edit,1350633600
+Control1=IDC_EDIT_NAME,edit,1350631552
+Control2=IDC_SELECT_IP,button,1342242816
+Control3=IDC_EDIT_OID,edit,1350633600
+Control4=IDC_COMBO_AUTH,combobox,1344340227
+Control5=IDC_EDIT_SECRET,edit,1350631552
+Control6=IDC_EDIT_PORT,edit,1350639744
+Control7=IDC_RADIO_VERSION1,button,1342308361
+Control8=IDC_RADIO_VERSION_2C,button,1342177289
+Control9=IDC_EDIT_COMMUNITY,edit,1350631552
 Control10=IDC_STATIC,static,1342308352
-Control11=IDC_COMBO_AUTH,combobox,1344340227
+Control11=IDC_EDIT_ID,edit,1350633600
 Control12=IDC_STATIC,static,1342308352
-Control13=IDC_EDIT_SECRET,edit,1350631552
-Control14=IDC_STATIC,static,1342308352
-Control15=IDC_EDIT_PORT,edit,1350639744
+Control13=IDC_STATIC,static,1342308352
+Control14=IDC_EDIT_PRIMARY_IP,edit,1350633600
+Control15=IDC_STATIC,static,1342308352
 Control16=IDC_STATIC,static,1342308352
-Control17=IDC_COMBO_SNMP_VERSION,combobox,1344340227
+Control17=IDC_STATIC,static,1342308352
 Control18=IDC_STATIC,static,1342308352
-Control19=IDC_EDIT_COMMUNITY,edit,1350631552
+Control19=IDC_STATIC,static,1342308352
 Control20=IDC_STATIC,button,1342177287
 Control21=IDC_STATIC,button,1342177287
 Control22=IDC_STATIC,button,1342177287
@@ -1125,15 +1179,15 @@ Control5=IDC_STATIC_HEADER,static,1342308352
 [DLG:IDD_USER_PROPERTIES (English (U.S.))]
 Type=1
 Class=CUserPropDlg
-ControlCount=20
+ControlCount=22
 Control1=IDC_EDIT_LOGIN,edit,1350631552
 Control2=IDC_EDIT_NAME,edit,1350631552
 Control3=IDC_EDIT_DESCRIPTION,edit,1350631552
 Control4=IDC_CHECK_DISABLED,button,1342242819
 Control5=IDC_CHECK_PASSWORD,button,1342242819
 Control6=IDC_CHECK_MANAGE_USERS,button,1342242819
-Control7=IDC_CHECK_VIEW_CONFIG,button,1342242819
-Control8=IDC_CHECK_EDIT_CONFIG,button,1342242819
+Control7=IDC_CHECK_SNMP_TRAPS,button,1342242819
+Control8=IDC_CHECK_MANAGE_CONFIG,button,1342242819
 Control9=IDC_CHECK_MANAGE_EPP,button,1342242819
 Control10=IDC_CHECK_DROP_CONN,button,1342242819
 Control11=IDC_CHECK_VIEW_EVENTDB,button,1342242819
@@ -1146,6 +1200,8 @@ Control17=IDC_STATIC,static,1342308352
 Control18=IDC_STATIC,static,1342308352
 Control19=IDC_STATIC,button,1342177287
 Control20=IDC_STATIC,button,1342177287
+Control21=IDC_CHECK_MANAGE_PKG,button,1342242819
+Control22=IDC_CHECK_DELETE_ALARMS,button,1342242819
 
 [CLS:CUserPropDlg]
 Type=0
@@ -1223,13 +1279,13 @@ LastObject=CGroupPropDlg
 [DLG:IDD_GROUP_PROPERTIES (English (U.S.))]
 Type=1
 Class=CGroupPropDlg
-ControlCount=21
+ControlCount=23
 Control1=IDC_EDIT_NAME,edit,1350631552
 Control2=IDC_EDIT_DESCRIPTION,edit,1350631552
 Control3=IDC_CHECK_DISABLED,button,1342242819
 Control4=IDC_CHECK_MANAGE_USERS,button,1342242819
-Control5=IDC_CHECK_VIEW_CONFIG,button,1342242819
-Control6=IDC_CHECK_EDIT_CONFIG,button,1342242819
+Control5=IDC_CHECK_SNMP_TRAPS,button,1342242819
+Control6=IDC_CHECK_MANAGE_CONFIG,button,1342242819
 Control7=IDC_CHECK_MANAGE_EPP,button,1342242819
 Control8=IDC_CHECK_DROP_CONN,button,1342242819
 Control9=IDC_CHECK_VIEW_EVENTDB,button,1342242819
@@ -1245,6 +1301,8 @@ Control18=IDC_STATIC,static,1342308352
 Control19=IDC_STATIC,button,1342177287
 Control20=IDC_STATIC,button,1342177287
 Control21=IDC_STATIC,button,1342177287
+Control22=IDC_CHECK_MANAGE_PKG,button,1342242819
+Control23=IDC_CHECK_DELETE_ALARMS,button,1342242819
 
 [MNU:IDM_CONTEXT]
 Type=1
@@ -1351,55 +1409,88 @@ Command5=ID_USER_DELETE
 Command6=ID_USER_PROPERTIES
 Command7=ID_OBJECT_CREATE_NODE
 Command8=ID_OBJECT_CREATE_CONTAINER
-Command9=ID_OBJECT_BIND
-Command10=ID_OBJECT_RENAME
-Command11=ID_OBJECT_DELETE
-Command12=ID_OBJECT_MANAGE
-Command13=ID_OBJECT_UNMANAGE
-Command14=ID_OBJECT_POLL_STATUS
-Command15=ID_OBJECT_POLL_CONFIGURATION
-Command16=ID_OBJECT_DATACOLLECTION
-Command17=ID_OBJECT_PROPERTIES
-Command18=ID_ITEM_NEW
-Command19=ID_ITEM_EDIT
-Command20=ID_ITEM_DELETE
-Command21=ID_ITEM_ACTIVATE
-Command22=ID_ITEM_DISABLE
-Command23=ID_ITEM_SHOWDATA
-Command24=ID_ITEM_GRAPH
-Command25=ID_POLICY_INSERTRULE_ABOVE
-Command26=ID_POLICY_INSERTRULE_BELOW
-Command27=ID_POLICY_INSERTRULE_TOP
-Command28=ID_POLICY_INSERTRULE_BOTTOM
-Command29=ID_POLICY_DELETERULE
-Command30=ID_POLICY_ENABLERULE
-Command31=ID_POLICY_DISABLERULE
-Command32=ID_POLICY_ADD
-Command33=ID_POLICY_DELETE
-Command34=ID_POLICY_NEGATECELL
-Command35=ID_POLICY_INSERTRULE_ABOVE
-Command36=ID_POLICY_INSERTRULE_BELOW
-Command37=ID_POLICY_INSERTRULE_TOP
-Command38=ID_POLICY_INSERTRULE_BOTTOM
-Command39=ID_POLICY_DELETERULE
-Command40=ID_POLICY_ENABLERULE
-Command41=ID_POLICY_DISABLERULE
-Command42=ID_POLICY_EDIT
-Command43=ID_POLICY_INSERTRULE_ABOVE
-Command44=ID_POLICY_INSERTRULE_BELOW
-Command45=ID_POLICY_INSERTRULE_TOP
-Command46=ID_POLICY_INSERTRULE_BOTTOM
-Command47=ID_POLICY_DELETERULE
-Command48=ID_POLICY_ENABLERULE
-Command49=ID_POLICY_DISABLERULE
-Command50=ID_ALARM_ACKNOWLEGE
-Command51=ID_ALARM_DELETE
-Command52=ID_ALARM_GOTOSOURCE
-Command53=ID_ACTION_NEW
-Command54=ID_ACTION_RENAME
-Command55=ID_ACTION_DELETE
-Command56=ID_ACTION_PROPERTIES
-CommandCount=56
+Command9=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command10=ID_OBJECT_CREATE_TEMPLATE
+Command11=ID_OBJECT_BIND
+Command12=ID_OBJECT_RENAME
+Command13=ID_OBJECT_DELETE
+Command14=ID_OBJECT_MANAGE
+Command15=ID_OBJECT_UNMANAGE
+Command16=ID_OBJECT_POLL_STATUS
+Command17=ID_OBJECT_POLL_CONFIGURATION
+Command18=ID_OBJECT_WAKEUP
+Command19=ID_OBJECT_DATACOLLECTION
+Command20=ID_OBJECT_PROPERTIES
+Command21=ID_ITEM_NEW
+Command22=ID_ITEM_EDIT
+Command23=ID_ITEM_DELETE
+Command24=ID_ITEM_COPY
+Command25=ID_ITEM_DUPLICATE
+Command26=ID_ITEM_ACTIVATE
+Command27=ID_ITEM_DISABLE
+Command28=ID_ITEM_SHOWDATA
+Command29=ID_ITEM_GRAPH
+Command30=ID_POLICY_INSERTRULE_ABOVE
+Command31=ID_POLICY_INSERTRULE_BELOW
+Command32=ID_POLICY_INSERTRULE_TOP
+Command33=ID_POLICY_INSERTRULE_BOTTOM
+Command34=ID_POLICY_DELETERULE
+Command35=ID_POLICY_ENABLERULE
+Command36=ID_POLICY_DISABLERULE
+Command37=ID_POLICY_ADD
+Command38=ID_POLICY_DELETE
+Command39=ID_POLICY_NEGATECELL
+Command40=ID_POLICY_INSERTRULE_ABOVE
+Command41=ID_POLICY_INSERTRULE_BELOW
+Command42=ID_POLICY_INSERTRULE_TOP
+Command43=ID_POLICY_INSERTRULE_BOTTOM
+Command44=ID_POLICY_DELETERULE
+Command45=ID_POLICY_ENABLERULE
+Command46=ID_POLICY_DISABLERULE
+Command47=ID_POLICY_EDIT
+Command48=ID_POLICY_INSERTRULE_ABOVE
+Command49=ID_POLICY_INSERTRULE_BELOW
+Command50=ID_POLICY_INSERTRULE_TOP
+Command51=ID_POLICY_INSERTRULE_BOTTOM
+Command52=ID_POLICY_DELETERULE
+Command53=ID_POLICY_ENABLERULE
+Command54=ID_POLICY_DISABLERULE
+Command55=ID_ALARM_ACKNOWLEGE
+Command56=ID_ALARM_DELETE
+Command57=ID_ALARM_GOTOSOURCE
+Command58=ID_ACTION_NEW
+Command59=ID_ACTION_RENAME
+Command60=ID_ACTION_DELETE
+Command61=ID_ACTION_PROPERTIES
+Command62=ID_POLL_RESTART
+Command63=ID_OBJECT_OPEN
+Command64=ID_OBJECT_OPENPARENT
+Command65=ID_OBJECT_CREATE_NODE
+Command66=ID_OBJECT_CREATE_CONTAINER
+Command67=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command68=ID_OBJECT_CREATE_TEMPLATE
+Command69=ID_OBJECT_BIND
+Command70=ID_OBJECT_RENAME
+Command71=ID_OBJECT_DELETE
+Command72=ID_OBJECT_MANAGE
+Command73=ID_OBJECT_UNMANAGE
+Command74=ID_OBJECT_POLL_STATUS
+Command75=ID_OBJECT_POLL_CONFIGURATION
+Command76=ID_OBJECT_DATACOLLECTION
+Command77=ID_OBJECT_PROPERTIES
+Command78=ID_EVENT_NEW
+Command79=ID_EVENT_EDIT
+Command80=ID_EVENT_DELETE
+Command81=ID_TRAP_NEW
+Command82=ID_TRAP_EDIT
+Command83=ID_TRAP_DELETE
+Command84=ID_GRAPH_AUTOSCALE
+Command85=ID_GRAPH_FREEZE
+Command86=ID_GRAPH_PROPERTIES
+Command87=ID_PACKAGE_INSTALL
+Command88=ID_PACKAGE_REMOVE
+Command89=ID_PACKAGE_DEPLOY
+CommandCount=89
 
 [DLG:IDD_SET_PASSWORD (English (U.S.))]
 Type=1
@@ -1548,13 +1639,16 @@ Control21=IDC_STATIC,button,1342177287
 [DLG:IDD_DCI_THRESHOLDS (English (U.S.))]
 Type=1
 Class=CDCIThresholdsPage
-ControlCount=6
-Control1=IDC_LIST_THRESHOLDS,SysListView32,1342275593
-Control2=IDC_BUTTON_ADD,button,1342242816
-Control3=IDC_BUTTON_MODIFY,button,1342242816
-Control4=IDC_BUTTON_DELETE,button,1342242816
-Control5=IDC_BUTTON_MOVEUP,button,1342242944
-Control6=IDC_BUTTON_MOVEDOWN,button,1342242944
+ControlCount=9
+Control1=IDC_EDIT_INSTANCE,edit,1350631552
+Control2=IDC_LIST_THRESHOLDS,SysListView32,1342275593
+Control3=IDC_BUTTON_MOVEUP,button,1342242944
+Control4=IDC_BUTTON_MOVEDOWN,button,1342242944
+Control5=IDC_BUTTON_ADD,button,1342242816
+Control6=IDC_BUTTON_MODIFY,button,1342242816
+Control7=IDC_BUTTON_DELETE,button,1342242816
+Control8=IDC_STATIC,static,1342308352
+Control9=IDC_STATIC,static,1342308352
 
 [CLS:CDCIThresholdsPage]
 Type=0
@@ -1692,24 +1786,27 @@ LastObject=CRuleHeader
 [DLG:IDD_MIB_BROWSER (English (U.S.))]
 Type=1
 Class=CMIBBrowserDlg
-ControlCount=17
-Control1=IDC_EDIT_OID,edit,1350633600
-Control2=IDC_TREE_MIB,SysTreeView32,1342242871
-Control3=IDC_EDIT_OID_TEXT,edit,1350633600
-Control4=IDC_EDIT_TYPE,edit,1350633600
-Control5=IDC_EDIT_STATUS,edit,1350633600
-Control6=IDC_EDIT_ACCESS,edit,1350633600
-Control7=IDC_EDIT_DESCRIPTION,edit,1352730820
-Control8=IDOK,button,1342242817
-Control9=IDCANCEL,button,1342242816
-Control10=IDC_BUTTON_DETAILS,button,1342242816
-Control11=IDC_STATIC,static,1342308352
-Control12=IDC_STATIC,static,1342308352
-Control13=IDC_STATIC_DESCRIPTION,static,1342308352
-Control14=IDC_STATIC_OID_TEXT,static,1342308352
-Control15=IDC_STATIC_TYPE,static,1342308352
-Control16=IDC_STATIC_STATUS,static,1342308352
-Control17=IDC_STATIC_ACCESS,static,1342308352
+ControlCount=20
+Control1=IDC_EDIT_OID,edit,1350631552
+Control2=IDC_EDIT_INSTANCE,edit,1350639744
+Control3=IDC_TREE_MIB,SysTreeView32,1342242871
+Control4=IDC_EDIT_OID_TEXT,edit,1350633600
+Control5=IDC_EDIT_TYPE,edit,1350633600
+Control6=IDC_EDIT_STATUS,edit,1350633600
+Control7=IDC_EDIT_ACCESS,edit,1350633600
+Control8=IDC_EDIT_DESCRIPTION,edit,1352730820
+Control9=IDOK,button,1342242817
+Control10=IDCANCEL,button,1342242816
+Control11=IDC_BUTTON_GET,button,1342242816
+Control12=IDC_BUTTON_DETAILS,button,1342242816
+Control13=IDC_STATIC,static,1342308352
+Control14=IDC_STATIC,static,1342308352
+Control15=IDC_STATIC_DESCRIPTION,static,1342308352
+Control16=IDC_STATIC_OID_TEXT,static,1342308352
+Control17=IDC_STATIC_TYPE,static,1342308352
+Control18=IDC_STATIC_STATUS,static,1342308352
+Control19=IDC_STATIC_ACCESS,static,1342308352
+Control20=IDC_STATIC_INSTANCE,static,1342308352
 
 [DLG:IDD_SELECT_OBJECT]
 Type=1
@@ -1785,18 +1882,20 @@ Command2=ID_POLICY_INSERTRULE_BELOW
 Command3=ID_POLICY_EDIT
 Command4=ID_POLICY_INSERTRULE_BOTTOM
 Command5=ID_POLICY_NEGATECELL
-Command6=ID_POLICY_INSERTRULE_TOP
-Command7=ID_POLICY_DELETE
-Command8=ID_POLICY_ADD
-CommandCount=8
+Command6=ID_POLICY_SAVE
+Command7=ID_POLICY_INSERTRULE_TOP
+Command8=ID_POLICY_DELETE
+Command9=ID_POLICY_ADD
+CommandCount=9
 
 [DLG:IDD_SELECT_OBJECT (English (U.S.))]
 Type=1
 Class=CObjectSelDlg
-ControlCount=3
-Control1=IDOK,button,1342242817
-Control2=IDCANCEL,button,1342242816
-Control3=IDC_LIST_OBJECTS,SysListView32,1342275609
+ControlCount=4
+Control1=IDC_LIST_OBJECTS,SysListView32,1342275609
+Control2=IDOK,button,1342242817
+Control3=IDCANCEL,button,1342242816
+Control4=IDC_BUTTON_NONE,button,1342242816
 
 [DLG:IDD_EDIT_RULE_COMMENT (English (U.S.))]
 Type=1
@@ -1812,7 +1911,7 @@ Class=CEventSelDlg
 ControlCount=3
 Control1=IDOK,button,1342242817
 Control2=IDCANCEL,button,1342242816
-Control3=IDC_LIST_EVENTS,SysListView32,1342275609
+Control3=IDC_LIST_EVENTS,SysListView32,1342242889
 
 [DLG:IDD_OBJECT_PRESENTATION (English (U.S.))]
 Type=1
@@ -1958,10 +2057,11 @@ Control18=IDC_STATIC_SEVERITY,button,1342177287
 [DLG:IDD_CP_GENERAL (English (U.S.))]
 Type=1
 Class=CConsolePropsGeneral
-ControlCount=3
+ControlCount=4
 Control1=IDC_STATIC,button,1342177287
 Control2=IDC_CHECK_EXPAND,button,1342242819
 Control3=IDC_CHECK_GRID,button,1342242819
+Control4=IDC_CHECK_SAVE,button,1342242819
 
 [CLS:CConsolePropsGeneral]
 Type=0
@@ -2176,10 +2276,10 @@ Control14=IDC_STATIC,static,1342308352
 [DLG:IDD_CREATE_NODE (English (U.S.))]
 Type=1
 Class=CCreateNodeDlg
-ControlCount=14
+ControlCount=13
 Control1=IDC_EDIT_NAME,edit,1350631552
 Control2=IDC_IP_ADDR,SysIPAddress32,1342242816
-Control3=IDC_IP_MASK,SysIPAddress32,1342242816
+Control3=IDC_BUTTON_RESOLVE,button,1342242816
 Control4=IDC_SELECT_PARENT,button,1342242816
 Control5=IDOK,button,1342242817
 Control6=IDCANCEL,button,1342242816
@@ -2190,17 +2290,18 @@ Control10=IDC_ICON_PARENT,static,1342177283
 Control11=IDC_STATIC_ID,static,1342308352
 Control12=IDC_STATIC_NAME,static,1342308352
 Control13=IDC_STATIC,static,1342308352
-Control14=IDC_STATIC,static,1342308352
 
 [DLG:IDD_DCI_TRANSFORM (English (U.S.))]
 Type=1
 Class=CDCITransformPage
-ControlCount=5
+ControlCount=7
 Control1=IDC_STATIC,static,1342308352
 Control2=IDC_COMBO_DELTA,combobox,1344339971
 Control3=IDC_STATIC,static,1342308352
 Control4=IDC_EDIT_FORMULA,edit,1350631552
 Control5=IDC_BUTTON_CREATE,button,1342242816
+Control6=IDC_STATIC_WARNING_ICON,static,1342177283
+Control7=IDC_STATIC_WARNING_TEXT,static,1342308352
 
 [CLS:CDCITransformPage]
 Type=0
@@ -2516,3 +2617,210 @@ Command1=ID_PACKAGE_INSTALL
 Command2=ID_PACKAGE_REMOVE
 CommandCount=2
 
+[ACL:IDA_NETMAP (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_OBJECT_OPENPARENT
+CommandCount=1
+
+[ACL:IDA_EVENT_EDITOR (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_EVENT_NEW
+Command2=ID_EVENT_DELETE
+Command3=ID_EVENT_EDIT
+CommandCount=3
+
+[ACL:IDA_ACTION_EDITOR (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_ACTION_NEW
+Command2=ID_ACTION_DELETE
+Command3=ID_ACTION_PROPERTIES
+CommandCount=3
+
+[ACL:IDA_TRAP_EDITOR (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_TRAP_MOVEDOWN
+Command2=ID_TRAP_NEW
+Command3=ID_TRAP_MOVEUP
+Command4=ID_TRAP_DELETE
+Command5=ID_TRAP_EDIT
+CommandCount=5
+
+[ACL:IDA_GRAPH (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_GRAPH_AUTOSCALE
+Command2=ID_GRAPH_PROPERTIES
+Command3=ID_GRAPH_FREEZE
+CommandCount=3
+
+[ACL:IDA_PACKAGE_MGR (English (U.S.))]
+Type=1
+Class=?
+Command1=ID_PACKAGE_INSTALL
+Command2=ID_PACKAGE_REMOVE
+CommandCount=2
+
+[DLG:IDD_CREATE_TG (English (U.S.))]
+Type=1
+Class=CCreateTGDlg
+ControlCount=12
+Control1=IDC_EDIT_NAME,edit,1350631552
+Control2=IDC_EDIT_DESCRIPTION,edit,1350631552
+Control3=IDC_SELECT_PARENT,button,1342242816
+Control4=IDOK,button,1342242817
+Control5=IDCANCEL,button,1342242816
+Control6=IDC_STATIC,button,1342177287
+Control7=IDC_STATIC,static,1342308352
+Control8=IDC_STATIC,button,1342177287
+Control9=IDC_ICON_PARENT,static,1342177283
+Control10=IDC_STATIC_ID,static,1342308352
+Control11=IDC_STATIC_NAME,static,1342308352
+Control12=IDC_STATIC,static,1342308352
+
+[DLG:IDD_CREATE_TEMPLATE (English (U.S.))]
+Type=1
+Class=CCreateTemplateDlg
+ControlCount=10
+Control1=IDC_EDIT_NAME,edit,1350631552
+Control2=IDC_SELECT_PARENT,button,1342242816
+Control3=IDOK,button,1342242817
+Control4=IDCANCEL,button,1342242816
+Control5=IDC_STATIC,button,1342177287
+Control6=IDC_STATIC,static,1342308352
+Control7=IDC_STATIC,button,1342177287
+Control8=IDC_ICON_PARENT,static,1342177283
+Control9=IDC_STATIC_ID,static,1342308352
+Control10=IDC_STATIC_NAME,static,1342308352
+
+[DLG:IDD_DATA_QUERY (English (U.S.))]
+Type=1
+Class=CDataQueryDlg
+ControlCount=9
+Control1=IDC_EDIT_VALUE,edit,1352730628
+Control2=IDC_BUTTON_RESTART,button,1342242816
+Control3=IDCANCEL,button,1342242816
+Control4=IDC_STATIC,static,1342308352
+Control5=IDC_STATIC,static,1342308352
+Control6=IDC_STATIC,static,1342308352
+Control7=IDC_STATIC,static,1342177296
+Control8=IDC_STATIC_NODE,static,1342308352
+Control9=IDC_STATIC_PARAMETER,static,1342308352
+
+[DLG:IDD_EDIT_TRAP (English (U.S.))]
+Type=1
+Class=CTrapEditDlg
+ControlCount=19
+Control1=IDC_EDIT_DESCRIPTION,edit,1350631552
+Control2=IDC_EDIT_TRAP,edit,1350631552
+Control3=IDC_SELECT_TRAP,button,1342242816
+Control4=IDC_EDIT_EVENT,edit,1350633600
+Control5=IDC_SELECT_EVENT,button,1342242816
+Control6=IDC_EDIT_MESSAGE,edit,1350633600
+Control7=IDC_LIST_ARGS,SysListView32,1342275849
+Control8=IDC_BUTTON_ADD,button,1342242816
+Control9=IDC_BUTTON_EDIT,button,1342242816
+Control10=IDC_BUTTON_DELETE,button,1342242816
+Control11=IDC_BUTTON_UP,button,1342242816
+Control12=IDC_BUTTON_DOWN,button,1342242816
+Control13=IDOK,button,1342242817
+Control14=IDCANCEL,button,1342242816
+Control15=IDC_EVENT_ICON,static,1342177283
+Control16=IDC_STATIC,button,1342177287
+Control17=IDC_STATIC,button,1342177287
+Control18=IDC_STATIC,button,1342177287
+Control19=IDC_STATIC,button,1342177287
+
+[DLG:IDD_EDIT_TRAP_ARG (English (U.S.))]
+Type=1
+Class=CTrapParamDlg
+ControlCount=7
+Control1=IDC_EDIT_DESCRIPTION,edit,1350631552
+Control2=IDC_EDIT_OID,edit,1350631552
+Control3=IDC_SELECT_OID,button,1342242816
+Control4=IDOK,button,1342242817
+Control5=IDCANCEL,button,1342242816
+Control6=IDC_STATIC,static,1342308352
+Control7=IDC_STATIC,static,1342308352
+
+[DLG:IDD_GRAPH_PROPERTIES (English (U.S.))]
+Type=1
+Class=CGraphPropDlg
+ControlCount=55
+Control1=IDOK,button,1342242817
+Control2=IDCANCEL,button,1342242816
+Control3=IDC_STATIC,button,1342177287
+Control4=IDC_CHECK_GRID,button,1342242819
+Control5=IDC_CHECK_AUTOSCALE,button,1342242819
+Control6=IDC_CHECK_REFRESH,button,1342242819
+Control7=IDC_EDIT_REFRESH,edit,1350639744
+Control8=IDC_STATIC_REFRESH,static,1342308352
+Control9=IDC_STATIC_SECONDS,static,1342308352
+Control10=IDC_STATIC,button,1342177287
+Control11=IDC_STATIC,static,1342308352
+Control12=IDC_STATIC,static,1342308352
+Control13=IDC_STATIC,static,1342308352
+Control14=IDC_STATIC,static,1342308352
+Control15=IDC_STATIC,static,1342308352
+Control16=IDC_STATIC,static,1342308352
+Control17=IDC_CB_BACKGROUND,static,1342308608
+Control18=IDC_CB_AXIS,static,1342308608
+Control19=IDC_CB_GRID,static,1342308608
+Control20=IDC_CB_TEXT,static,1342308608
+Control21=IDC_CB_LABELBK,static,1342308608
+Control22=IDC_CB_LABEL,static,1342308608
+Control23=IDC_STATIC,static,1342308352
+Control24=IDC_CB_ITEM1,static,1342308608
+Control25=IDC_CB_ITEM5,static,1342308608
+Control26=IDC_CB_ITEM2,static,1342308608
+Control27=IDC_CB_ITEM6,static,1342308608
+Control28=IDC_CB_ITEM3,static,1342308608
+Control29=IDC_CB_ITEM7,static,1342308608
+Control30=IDC_CB_ITEM4,static,1342308608
+Control31=IDC_CB_ITEM8,static,1342308608
+Control32=IDC_CB_ITEM9,static,1342308608
+Control33=IDC_CB_ITEM13,static,1342308608
+Control34=IDC_CB_ITEM10,static,1342308608
+Control35=IDC_CB_ITEM14,static,1342308608
+Control36=IDC_CB_ITEM11,static,1342308608
+Control37=IDC_CB_ITEM15,static,1342308608
+Control38=IDC_CB_ITEM12,static,1342308608
+Control39=IDC_CB_ITEM16,static,1342308608
+Control40=IDC_STATIC,static,1342308866
+Control41=IDC_STATIC,static,1342308866
+Control42=IDC_STATIC,static,1342308866
+Control43=IDC_STATIC,static,1342308866
+Control44=IDC_STATIC,static,1342308866
+Control45=IDC_STATIC,static,1342308866
+Control46=IDC_STATIC,static,1342308866
+Control47=IDC_STATIC,static,1342308866
+Control48=IDC_STATIC,static,1342308866
+Control49=IDC_STATIC,static,1342308866
+Control50=IDC_STATIC,static,1342308866
+Control51=IDC_STATIC,static,1342308866
+Control52=IDC_STATIC,static,1342308866
+Control53=IDC_STATIC,static,1342308866
+Control54=IDC_STATIC,static,1342308866
+Control55=IDC_STATIC,static,1342308866
+
+[DLG:IDD_SELECT_INTERNAL_ITEM]
+Type=1
+Class=CInternalItemSelDlg
+ControlCount=4
+Control1=IDC_LIST_PARAMETERS,SysListView32,1342243085
+Control2=IDOK,button,1342242817
+Control3=IDCANCEL,button,1342242816
+Control4=IDC_BUTTON_GET,button,1342242816
+
+[CLS:CInternalItemSelDlg]
+Type=0
+HeaderFile=InternalItemSelDlg.h
+ImplementationFile=InternalItemSelDlg.cpp
+BaseClass=CDialog
+Filter=D
+VirtualFilter=dWC
+LastObject=CInternalItemSelDlg
+
index c1f0cc9..bfb39ac 100644 (file)
@@ -229,6 +229,10 @@ SOURCE=.\GroupPropDlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\InternalItemSelDlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\LoginDialog.cpp
 # End Source File
 # Begin Source File
@@ -518,6 +522,10 @@ SOURCE=.\GroupPropDlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\InternalItemSelDlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\LoginDialog.h
 # End Source File
 # Begin Source File
index 3ea07ba..55cc10c 100644 (file)
@@ -1982,6 +1982,56 @@ END
 /////////////////////////////////////////////////////////////////////////////
 
 
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SELECT_INTERNAL_ITEM DIALOGEX 0, 0, 416, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Available internal parameters"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "List1",IDC_LIST_PARAMETERS,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | 
+                    WS_TABSTOP,7,7,345,140,WS_EX_CLIENTEDGE
+    DEFPUSHBUTTON   "OK",IDOK,359,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,359,25,50,14
+    PUSHBUTTON      "&Get...",IDC_BUTTON_GET,359,44,50,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_SELECT_INTERNAL_ITEM, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 409
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 147
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
index 35b4aca..6fb4c1f 100644 (file)
 #define IDD_GRAPH_PROPERTIES            248
 #define IDI_PACKAGE                     249
 #define IDI_DATABASE                    250
+#define IDD_SELECT_INTERNAL_ITEM        252
 #define ID_EDIT_BOX                     525
 #define IDC_EDIT_SERVER                 1000
 #define IDC_EDIT_LOGIN                  1001
 #define IDC_LIST_OBJECTS                1024
 #define IDC_LIST_EVENTS                 1024
 #define IDC_LIST_ARGS                   1024
+#define IDC_LIST_PARAMETERS             1024
 #define IDC_INFO_TEXT                   1025
 #define IDC_EDIT_CLASS                  1026
 #define IDC_CHECK_READ                  1027
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        252
+#define _APS_NEXT_RESOURCE_VALUE        253
 #define _APS_NEXT_COMMAND_VALUE         32912
-#define _APS_NEXT_CONTROL_VALUE         1215
+#define _APS_NEXT_CONTROL_VALUE         1216
 #define _APS_NEXT_SYMED_VALUE           120
 #endif
 #endif