- Improved agent parameters selection
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Jan 2005 20:40:13 +0000 (20:40 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Jan 2005 20:40:13 +0000 (20:40 +0000)
- Implemented creation of NetworkService objects

21 files changed:
.gitattributes
src/console/win32/AgentParamSelDlg.cpp
src/console/win32/AgentParamSelDlg.h
src/console/win32/CreateNetSrvDlg.cpp [new file with mode: 0644]
src/console/win32/CreateNetSrvDlg.h [new file with mode: 0644]
src/console/win32/DCIPropPage.cpp
src/console/win32/InputBox.cpp [new file with mode: 0644]
src/console/win32/InputBox.h [new file with mode: 0644]
src/console/win32/InternalItemSelDlg.cpp
src/console/win32/InternalItemSelDlg.h
src/console/win32/ObjectBrowser.cpp
src/console/win32/ObjectBrowser.h
src/console/win32/globals.cpp
src/console/win32/globals.h
src/console/win32/nxcon.clw
src/console/win32/nxcon.cpp
src/console/win32/nxcon.dsp
src/console/win32/nxcon.h
src/console/win32/nxcon.rc
src/console/win32/resource.h
src/console/win32/tools.cpp

index 2f7cb15..b25eac5 100644 (file)
@@ -278,6 +278,8 @@ src/console/win32/ControlPanel.cpp -text
 src/console/win32/ControlPanel.h -text
 src/console/win32/CreateContainerDlg.cpp -text
 src/console/win32/CreateContainerDlg.h -text
+src/console/win32/CreateNetSrvDlg.cpp -text
+src/console/win32/CreateNetSrvDlg.h -text
 src/console/win32/CreateNodeDlg.cpp -text
 src/console/win32/CreateNodeDlg.h -text
 src/console/win32/CreateObjectDlg.cpp -text
@@ -322,6 +324,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/InputBox.cpp -text
+src/console/win32/InputBox.h -text
 src/console/win32/InternalItemSelDlg.cpp -text
 src/console/win32/InternalItemSelDlg.h -text
 src/console/win32/LoginDialog.cpp -text
index 72d2135..de17515 100644 (file)
@@ -5,6 +5,7 @@
 #include "nxcon.h"
 #include "AgentParamSelDlg.h"
 #include "DataQueryDlg.h"
+#include "InputBox.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -39,12 +40,19 @@ void CAgentParamSelDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CAgentParamSelDlg, CDialog)
        //{{AFX_MSG_MAP(CAgentParamSelDlg)
        ON_BN_CLICKED(IDC_BUTTON_GET, OnButtonGet)
+       ON_NOTIFY(NM_DBLCLK, IDC_LIST_PARAMS, OnDblclkListParams)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
 // CAgentParamSelDlg message handlers
 
+static int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
+{
+   return _tcsicmp(((CAgentParamSelDlg *)lParamSort)->m_pParamList[lParam1].szName,
+                   ((CAgentParamSelDlg *)lParamSort)->m_pParamList[lParam2].szName);
+}
+
 
 //
 // WM_INITDIALOG message handler
@@ -77,6 +85,8 @@ BOOL CAgentParamSelDlg::OnInitDialog()
       }
    }
 
+   m_wndListCtrl.SortItems(CompareItems, (LPARAM)this);
+
        return TRUE;
 }
 
@@ -110,13 +120,63 @@ void CAgentParamSelDlg::OnButtonGet()
    {
       CDataQueryDlg dlg;
       DWORD dwIndex;
+      int iLen;
+      BOOL bStart = TRUE;
 
+      // Detect (*) at the end of parameter's name
       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_pParamList[dwIndex].szName;
       dlg.m_iOrigin = DS_NATIVE_AGENT;
-      dlg.DoModal();
+
+      iLen = _tcslen(m_pParamList[dwIndex].szName);
+      if (iLen > 3)
+      {
+         if (!_tcscmp(&m_pParamList[dwIndex].szName[iLen - 3], _T("(*)")))
+         {
+            CInputBox boxDlg;
+
+            boxDlg.m_strTitle = _T("Arguments");
+            boxDlg.m_strHeader = _T("Enter parameter's argument(s):");
+            if (boxDlg.DoModal() == IDOK)
+            {
+               TCHAR szBuffer[MAX_DB_STRING];
+
+               memcpy(szBuffer, m_pParamList[dwIndex].szName, (iLen - 2) * sizeof(TCHAR));
+               _tcscpy(&szBuffer[iLen - 2], boxDlg.m_strText);
+               _tcscat(szBuffer, _T(")"));
+               dlg.m_strParameter = (LPCTSTR)szBuffer;
+            }
+            else
+            {
+               bStart = FALSE;
+            }
+         }
+         else
+         {
+            dlg.m_strParameter = (LPCTSTR)m_pParamList[dwIndex].szName;
+         }
+      }
+      else
+      {
+         dlg.m_strParameter = (LPCTSTR)m_pParamList[dwIndex].szName;
+      }
+
+      if (bStart)
+         dlg.DoModal();
    }
    m_wndListCtrl.SetFocus();
 }
+
+
+//
+// Process double click on list
+//
+
+void CAgentParamSelDlg::OnDblclkListParams(NMHDR* pNMHDR, LRESULT* pResult) 
+{
+   if (m_wndListCtrl.GetSelectedCount() > 0)
+      PostMessage(WM_COMMAND, IDOK, 0);
+       
+       *pResult = 0;
+}
index ff2479b..62c4871 100644 (file)
@@ -43,6 +43,7 @@ protected:
        virtual BOOL OnInitDialog();
        virtual void OnOK();
        afx_msg void OnButtonGet();
+       afx_msg void OnDblclkListParams(NMHDR* pNMHDR, LRESULT* pResult);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };
diff --git a/src/console/win32/CreateNetSrvDlg.cpp b/src/console/win32/CreateNetSrvDlg.cpp
new file mode 100644 (file)
index 0000000..b249bfb
--- /dev/null
@@ -0,0 +1,125 @@
+// CreateNetSrvDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "nxcon.h"
+#include "CreateNetSrvDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CCreateNetSrvDlg dialog
+
+
+CCreateNetSrvDlg::CCreateNetSrvDlg(CWnd* pParent /*=NULL*/)
+       : CCreateObjectDlg(CCreateNetSrvDlg::IDD, pParent)
+{
+       //{{AFX_DATA_INIT(CCreateNetSrvDlg)
+       m_iPort = 0;
+       m_iProtocolType = -1;
+       m_iProtocolNumber = 0;
+       m_strRequest = _T("");
+       m_strResponce = _T("");
+       //}}AFX_DATA_INIT
+}
+
+
+void CCreateNetSrvDlg::DoDataExchange(CDataExchange* pDX)
+{
+       CCreateObjectDlg::DoDataExchange(pDX);
+       //{{AFX_DATA_MAP(CCreateNetSrvDlg)
+       DDX_Control(pDX, IDC_COMBO_TYPES, m_wndTypeList);
+       DDX_Text(pDX, IDC_EDIT_PORT, m_iPort);
+       DDV_MinMaxLong(pDX, m_iPort, 0, 65535);
+       DDX_Radio(pDX, IDC_RADIO_TCP, m_iProtocolType);
+       DDX_Text(pDX, IDC_EDIT_PROTO, m_iProtocolNumber);
+       DDV_MinMaxLong(pDX, m_iProtocolNumber, 0, 255);
+       DDX_Text(pDX, IDC_EDIT_REQUEST, m_strRequest);
+       DDX_Text(pDX, IDC_EDIT_RESPONCE, m_strResponce);
+       //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CCreateNetSrvDlg, CCreateObjectDlg)
+       //{{AFX_MSG_MAP(CCreateNetSrvDlg)
+       ON_CBN_SELCHANGE(IDC_COMBO_TYPES, OnSelchangeComboTypes)
+       //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CCreateNetSrvDlg message handlers
+
+BOOL CCreateNetSrvDlg::OnInitDialog() 
+{
+   int i;
+
+       CCreateObjectDlg::OnInitDialog();
+
+   // Add service types to combo box
+   for(i = 0; g_szServiceType[i] != NULL; i++)
+      m_wndTypeList.AddString(g_szServiceType[i]);
+   m_wndTypeList.SelectString(-1, g_szServiceType[m_iServiceType]);
+
+   SetProtocolCtrls();
+       
+       return TRUE;
+}
+
+
+//
+// Handler for OK button
+//
+
+void CCreateNetSrvDlg::OnOK() 
+{
+   GetServiceType();   
+       CCreateObjectDlg::OnOK();
+}
+
+
+//
+// Handler for selection change in service type list
+//
+
+void CCreateNetSrvDlg::OnSelchangeComboTypes() 
+{
+   GetServiceType();
+   SetProtocolCtrls();
+}
+
+
+//
+// Set states of IP protocol selection controls
+//
+
+void CCreateNetSrvDlg::SetProtocolCtrls()
+{
+   BOOL bEnable;
+
+   bEnable = (m_iServiceType == NETSRV_CUSTOM) ? TRUE : FALSE;
+   EnableDlgItem(this, IDC_RADIO_TCP, bEnable);
+   EnableDlgItem(this, IDC_RADIO_UDP, bEnable);
+   EnableDlgItem(this, IDC_RADIO_ICMP, bEnable);
+   EnableDlgItem(this, IDC_RADIO_OTHER, bEnable);
+   EnableDlgItem(this, IDC_EDIT_PROTO, bEnable);
+}
+
+
+//
+// Get selected service type from combo box
+//
+
+void CCreateNetSrvDlg::GetServiceType()
+{
+   TCHAR szBuffer[256];
+
+   // Determine service type
+   m_wndTypeList.GetWindowText(szBuffer, 256);
+   for(m_iServiceType = 0; g_szServiceType[m_iServiceType] != NULL; m_iServiceType++)
+      if (!_tcscmp(szBuffer, g_szServiceType[m_iServiceType]))
+         break;
+}
diff --git a/src/console/win32/CreateNetSrvDlg.h b/src/console/win32/CreateNetSrvDlg.h
new file mode 100644 (file)
index 0000000..10a9524
--- /dev/null
@@ -0,0 +1,59 @@
+#if !defined(AFX_CREATENETSRVDLG_H__DC95E746_5880_45FB_A142_DE5C6FEAC721__INCLUDED_)
+#define AFX_CREATENETSRVDLG_H__DC95E746_5880_45FB_A142_DE5C6FEAC721__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// CreateNetSrvDlg.h : header file
+//
+
+#include "CreateObjectDlg.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CCreateNetSrvDlg dialog
+
+class CCreateNetSrvDlg : public CCreateObjectDlg
+{
+// Construction
+public:
+       int m_iServiceType;
+       CCreateNetSrvDlg(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+       //{{AFX_DATA(CCreateNetSrvDlg)
+       enum { IDD = IDD_CREATE_NETSRV };
+       CComboBox       m_wndTypeList;
+       long    m_iPort;
+       int             m_iProtocolType;
+       long    m_iProtocolNumber;
+       CString m_strRequest;
+       CString m_strResponce;
+       //}}AFX_DATA
+
+
+// Overrides
+       // ClassWizard generated virtual function overrides
+       //{{AFX_VIRTUAL(CCreateNetSrvDlg)
+       protected:
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+       //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+       void GetServiceType(void);
+       void SetProtocolCtrls(void);
+
+       // Generated message map functions
+       //{{AFX_MSG(CCreateNetSrvDlg)
+       virtual BOOL OnInitDialog();
+       virtual void OnOK();
+       afx_msg void OnSelchangeComboTypes();
+       //}}AFX_MSG
+       DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CREATENETSRVDLG_H__DC95E746_5880_45FB_A142_DE5C6FEAC721__INCLUDED_)
index 177034e..a4c4b87 100644 (file)
@@ -217,6 +217,7 @@ void CDCIPropPage::SelectAgentItem(void)
    if (dwResult == RCC_SUCCESS)
    {
       CAgentParamSelDlg dlg;
+      TCHAR *p;
 
       dlg.m_pNode = m_pNode;
       dlg.m_dwNumParams = m_dwNumParams;
@@ -228,6 +229,22 @@ void CDCIPropPage::SelectAgentItem(void)
                         m_pParamList[dlg.m_dwSelectionIndex].szDescription);
          m_wndTypeList.SelectString(-1, g_pszItemDataType[m_pParamList[dlg.m_dwSelectionIndex].iDataType]);
          m_wndEditName.SetFocus();
+
+         // Replace (*) in parameter's name
+         p = _tcschr(m_pParamList[dlg.m_dwSelectionIndex].szName, _T('('));
+         if (p != NULL)
+         {
+            int iPos;
+
+            p++;
+            if (*p == _T('*'))
+            {
+               iPos = (int)((char *)p - (char *)m_pParamList[dlg.m_dwSelectionIndex].szName) / sizeof(TCHAR);
+               m_wndEditName.SetSel(iPos, iPos + 1, FALSE);
+               m_wndEditName.ReplaceSel(_T("<insert arguments here>"));
+               m_wndEditName.SetSel(iPos, iPos + 23, FALSE);
+            }
+         }
       }
    }
 }
diff --git a/src/console/win32/InputBox.cpp b/src/console/win32/InputBox.cpp
new file mode 100644 (file)
index 0000000..388a7b3
--- /dev/null
@@ -0,0 +1,54 @@
+// InputBox.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "nxcon.h"
+#include "InputBox.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CInputBox dialog
+
+
+CInputBox::CInputBox(CWnd* pParent /*=NULL*/)
+       : CDialog(CInputBox::IDD, pParent)
+{
+       //{{AFX_DATA_INIT(CInputBox)
+       m_strText = _T("");
+       m_strHeader = _T("");
+       //}}AFX_DATA_INIT
+
+   m_strTitle = _T("Input data");
+   m_strHeader = _T("Enter data:");
+}
+
+
+void CInputBox::DoDataExchange(CDataExchange* pDX)
+{
+       CDialog::DoDataExchange(pDX);
+       //{{AFX_DATA_MAP(CInputBox)
+       DDX_Text(pDX, IDC_EDIT_TEXT, m_strText);
+       DDX_Text(pDX, IDC_STATIC_HEADER, m_strHeader);
+       //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CInputBox, CDialog)
+       //{{AFX_MSG_MAP(CInputBox)
+       //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CInputBox message handlers
+
+BOOL CInputBox::OnInitDialog() 
+{
+       CDialog::OnInitDialog();
+   SetWindowText(m_strTitle);
+       return TRUE;
+}
diff --git a/src/console/win32/InputBox.h b/src/console/win32/InputBox.h
new file mode 100644 (file)
index 0000000..69a5fd8
--- /dev/null
@@ -0,0 +1,48 @@
+#if !defined(AFX_INPUTBOX_H__D9193821_D8B5_4E37_9BFE_283F5B7DF649__INCLUDED_)
+#define AFX_INPUTBOX_H__D9193821_D8B5_4E37_9BFE_283F5B7DF649__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// InputBox.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CInputBox dialog
+
+class CInputBox : public CDialog
+{
+// Construction
+public:
+       CString m_strTitle;
+       CInputBox(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+       //{{AFX_DATA(CInputBox)
+       enum { IDD = IDD_INPUT_BOX };
+       CString m_strText;
+       CString m_strHeader;
+       //}}AFX_DATA
+
+
+// Overrides
+       // ClassWizard generated virtual function overrides
+       //{{AFX_VIRTUAL(CInputBox)
+       protected:
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+       //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+       // Generated message map functions
+       //{{AFX_MSG(CInputBox)
+       virtual BOOL OnInitDialog();
+       //}}AFX_MSG
+       DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_INPUTBOX_H__D9193821_D8B5_4E37_9BFE_283F5B7DF649__INCLUDED_)
index a5ac6fb..b1cc45f 100644 (file)
@@ -60,6 +60,7 @@ void CInternalItemSelDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CInternalItemSelDlg, CDialog)
        //{{AFX_MSG_MAP(CInternalItemSelDlg)
        ON_BN_CLICKED(IDC_BUTTON_GET, OnButtonGet)
+       ON_NOTIFY(NM_DBLCLK, IDC_LIST_PARAMETERS, OnDblclkListParameters)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -143,3 +144,16 @@ void CInternalItemSelDlg::OnButtonGet()
    }
    m_wndListCtrl.SetFocus();
 }
+
+
+//
+// Handle double click in list view
+//
+
+void CInternalItemSelDlg::OnDblclkListParameters(NMHDR* pNMHDR, LRESULT* pResult) 
+{
+   if (m_wndListCtrl.GetSelectedCount() > 0)
+      PostMessage(WM_COMMAND, IDOK, 0);
+       
+       *pResult = 0;
+}
index 4f7c719..753a368 100644 (file)
@@ -42,6 +42,7 @@ protected:
        virtual BOOL OnInitDialog();
        virtual void OnOK();
        afx_msg void OnButtonGet();
+       afx_msg void OnDblclkListParameters(NMHDR* pNMHDR, LRESULT* pResult);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };
index b17d963..a811404 100644 (file)
@@ -176,6 +176,7 @@ BEGIN_MESSAGE_MAP(CObjectBrowser, CMDIChildWnd)
        ON_COMMAND(ID_OBJECT_CREATE_TEMPLATEGROUP, OnObjectCreateTemplategroup)
        ON_COMMAND(ID_OBJECT_WAKEUP, OnObjectWakeup)
        ON_UPDATE_COMMAND_UI(ID_OBJECT_WAKEUP, OnUpdateObjectWakeup)
+       ON_COMMAND(ID_OBJECT_CREATE_SERVICE, OnObjectCreateService)
        //}}AFX_MSG_MAP
    ON_NOTIFY(TVN_SELCHANGED, IDC_TREE_VIEW, OnTreeViewSelChange)
        ON_NOTIFY(LVN_COLUMNCLICK, IDC_LIST_VIEW, OnListViewColumnClick)
@@ -1392,6 +1393,16 @@ void CObjectBrowser::OnObjectCreateTemplategroup()
 }
 
 
+//
+// WM_COMMAND::ID_OBJECT_CREATE_SERVICE message handler
+//
+
+void CObjectBrowser::OnObjectCreateService() 
+{
+   theApp.CreateNetworkService((m_pCurrentObject != NULL) ? m_pCurrentObject->dwId : 0);
+}
+
+
 //
 // WM_COMMAND::ID_OBJECT_DELETE message handler
 //
index 9e6a79e..22be019 100644 (file)
@@ -152,6 +152,7 @@ protected:
        afx_msg void OnObjectCreateTemplategroup();
        afx_msg void OnObjectWakeup();
        afx_msg void OnUpdateObjectWakeup(CCmdUI* pCmdUI);
+       afx_msg void OnObjectCreateService();
        //}}AFX_MSG
    afx_msg void OnFindObject(WPARAM wParam, LPARAM lParam);
    afx_msg void OnTreeViewSelChange(LPNMTREEVIEW lpnmt, LRESULT *pResult);
index 259a676..d6dac0a 100644 (file)
@@ -77,13 +77,15 @@ CImageList *g_pObjectNormalImageList = NULL;
 // Global string constants
 //
 
-char *g_szStatusText[] = { "NORMAL", "WARNING", "MINOR", "MAJOR", "CRITICAL", "UNKNOWN", "UNMANAGED", "DISABLED", "TESTING" };
-char *g_szStatusTextSmall[] = { "Normal", "Warning", "Minor", "Major", "Critical", "Unknown", "Unmanaged", "Disabled", "Testing" };
-char *g_szObjectClass[] = { "Generic", "Subnet", "Node", "Interface", "Network", 
-                            "Container", "Zone", "ServiceRoot", "Template", 
-                            "TemplateGroup", "TemplateRoot" };
-char *g_szActionType[] = { "Execute", "Remote", "E-Mail", "SMS" };
-char *g_szInterfaceTypes[] = {
+TCHAR *g_szStatusText[] = { "NORMAL", "WARNING", "MINOR", "MAJOR", "CRITICAL", "UNKNOWN", "UNMANAGED", "DISABLED", "TESTING" };
+TCHAR *g_szStatusTextSmall[] = { "Normal", "Warning", "Minor", "Major", "Critical", "Unknown", "Unmanaged", "Disabled", "Testing" };
+TCHAR *g_szObjectClass[] = { "Generic", "Subnet", "Node", "Interface", "Network", 
+                             "Container", "Zone", "ServiceRoot", "Template", 
+                             "TemplateGroup", "TemplateRoot" };
+TCHAR *g_szActionType[] = { "Execute", "Remote", "E-Mail", "SMS" };
+TCHAR *g_szServiceType[] = { _T("User-defined"), _T("SSH"), _T("POP3"), _T("SMTP"),
+                             _T("FTP"), _T("HTTP"), NULL };
+TCHAR *g_szInterfaceTypes[] = {
    "Unknown",
    "Other",
    "Regular 1822",
index c3fb8d3..3377fba 100644 (file)
@@ -180,6 +180,7 @@ void SelectListViewItem(CListCtrl *pListCtrl, int iItem);
 const char *CodeToText(int iCode, CODE_TO_TEXT *pTranslator, const char *pszDefaultText = "Unknown");
 char *TranslateUNIXText(const char *pszText);
 void RestoreMDIChildPlacement(CMDIChildWnd *pWnd, WINDOWPLACEMENT *pwp);
+void EnableDlgItem(CDialog *pWnd, int nCtrl, BOOL bEnable);
 
 
 //
@@ -209,9 +210,10 @@ extern char g_szLogin[];
 extern char g_szPassword[];
 extern DWORD g_dwEncryptionMethod;
 extern char g_szWorkDir[];
-extern char *g_szStatusText[];
-extern char *g_szStatusTextSmall[];
-extern char *g_szActionType[];
+extern TCHAR *g_szStatusText[];
+extern TCHAR *g_szStatusTextSmall[];
+extern TCHAR *g_szActionType[];
+extern TCHAR *g_szServiceType[];
 extern COLORREF g_statusColorTable[];
 extern char *g_szObjectClass[];
 extern char *g_szInterfaceTypes[];
index 896e9ed..a8a298d 100644 (file)
@@ -2,23 +2,23 @@
 
 [General Info]
 Version=1
-LastClass=CAgentParamSelDlg
+LastClass=CCreateNetSrvDlg
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
 LastPage=0
 
-ClassCount=76
+ClassCount=78
 Class1=CConsoleApp
 Class3=CMainFrame
 Class4=CChildFrame
 Class7=CEventBrowser
 Class9=CMapView
 
-ResourceCount=109
-Resource1=IDA_NETMAP (English (U.S.))
+ResourceCount=111
+Resource1=IDD_EDIT_RULE_SEVERITY (English (U.S.))
 Resource2=IDD_OBJECT_NODE_GENERAL
-Resource3=IDM_VIEW_SPECIFIC (English (U.S.))
+Resource3=IDA_OBJECT_BROWSER (English (U.S.))
 Resource4=IDD_SELECT_OBJECT
 Resource5=IDD_SELECT_ACTION
 Class2=CChildView
@@ -32,9 +32,9 @@ Resource7=IDD_NEW_USER
 Class12=CObjectBrowser
 Resource8=IDD_CREATE_CONTAINER
 Class13=CObjectPropDlg
-Resource9=IDD_EDIT_EVENT (English (U.S.))
-Resource10=IDD_SELECT_OBJECT (English (U.S.))
-Resource11=IDD_DCI_TRANSFORM (English (U.S.))
+Resource9=IDD_DCI_TRANSFORM (English (U.S.))
+Resource10=IDA_EVENT_EDITOR (English (U.S.))
+Resource11=IDD_OBJECT_SECURITY (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=IDA_OBJECT_BROWSER (English (U.S.))
+Resource17=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Class16=CDebugFrame
-Resource18=IDD_EDIT_TRAP_ARG (English (U.S.))
+Resource18=IDD_DCI_COLLECTION (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
 Resource20=IDD_SELECT_EVENT
 Class17=CObjectPreview
-Resource21=IDD_SELECT_USER (English (U.S.))
+Resource21=IDD_SELECT_INTERNAL_ITEM (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_ABOUTBOX (English (U.S.))
+Resource22=IDD_CREATE_CONTAINER (English (U.S.))
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
-Resource23=IDD_CREATE_CONTAINER (English (U.S.))
+Resource23=IDD_REQUEST_PROCESSING (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
 Resource24=IDA_MDI_DEFAULT
 Class26=CRequestProcessingDlg
-Resource25=IDD_CREATE_NODE (English (U.S.))
+Resource25=IDD_OBJECT_GENERAL (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
 Resource27=IDD_EDIT_RULE_ALARM
-Resource28=IDR_MAINFRAME (English (U.S.))
+Resource28=IDD_MIB_BROWSER (English (U.S.))
 Class27=CObjectPropsGeneral
-Resource29=IDD_SELECT_EVENT (English (U.S.))
+Resource29=IDA_TRAP_EDITOR (English (U.S.))
 Class28=CObjectPropsSecurity
-Resource30=IDD_OBJECT_SECURITY (English (U.S.))
+Resource30=IDD_EDIT_TRAP_ARG (English (U.S.))
 Resource31=IDD_SELECT_USER
 Resource32=IDD_OBJECT_SECURITY
 Class29=CUserSelectDlg
@@ -79,36 +79,36 @@ Class31=CNewUserDlg
 Resource35=IDD_THRESHOLD
 Resource36=IDA_EPP
 Class32=CUserPropDlg
-Resource37=IDM_CONTEXT (English (U.S.))
+Resource37=IDA_EPP (English (U.S.))
 Resource38=IDD_ABOUTBOX
 Class33=CGroupPropDlg
 Resource39=IDD_CP_GENERAL
 Resource40=IDA_TRAP_EDITOR
 Resource41=IDM_VIEW_SPECIFIC
-Resource42=IDA_ACTION_EDITOR (English (U.S.))
+Resource42=IDD_CP_GENERAL (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
 Class36=CNetSummaryFrame
 Class37=CDataCollectionEditor
-Resource43=IDD_REQUEST_PROCESSING (English (U.S.))
+Resource43=IDD_DATA_QUERY (English (U.S.))
 Class38=CDCIPropPage
-Resource44=IDA_MDI_DEFAULT (English (U.S.))
+Resource44=IDD_SELECT_OBJECT (English (U.S.))
 Class39=CDCIDataView
-Resource45=IDA_ALARM_BROWSER (English (U.S.))
+Resource45=IDD_OBJECT_PRESENTATION (English (U.S.))
 Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
-Resource46=IDD_MIB_BROWSER (English (U.S.))
-Resource47=IDD_CREATE_TEMPLATE (English (U.S.))
+Resource46=IDA_NETMAP (English (U.S.))
+Resource47=IDD_USER_PROPERTIES (English (U.S.))
 Resource48=IDM_CONTEXT
 Class43=CThresholdDlg
-Resource49=IDD_GRAPH_PROPERTIES (English (U.S.))
+Resource49=IDD_DCI_THRESHOLDS (English (U.S.))
 Resource50=IDD_EDIT_TRAP_ARG
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
-Resource51=IDD_THRESHOLD (English (U.S.))
+Resource51=IDA_ALARM_BROWSER (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_DATA_QUERY (English (U.S.))
+Resource57=IDD_GROUP_PROPERTIES (English (U.S.))
 Resource58=IDD_CREATE_TG
-Resource59=IDD_SELECT_ACTION (English (U.S.))
-Resource60=IDA_EVENT_EDITOR (English (U.S.))
+Resource59=IDD_OBJECT_CAPS (English (U.S.))
+Resource60=IDD_EDIT_RULE_ALARM (English (U.S.))
 Class51=CObjectPropsPresentation
-Resource61=IDA_PACKAGE_MGR (English (U.S.))
+Resource61=IDD_SELECT_ACTION (English (U.S.))
 Resource62=IDD_EDIT_RULE_COMMENT
 Class52=CRuleSeverityDlg
 Resource63=IDD_ACTION_PROPERTIES
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
-Resource64=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource64=IDD_OBJECT_NODE_GENERAL (English (U.S.))
 Resource65=IDD_DCI_TRANSFORM
-Resource66=IDD_OBJECT_NODE_GENERAL (English (U.S.))
-Resource67=IDA_EPP (English (U.S.))
-Resource68=IDD_SELECT_INTERNAL_ITEM (English (U.S.))
+Resource66=IDD_CREATE_TG (English (U.S.))
+Resource67=IDD_SELECT_EVENT (English (U.S.))
+Resource68=IDD_THRESHOLD (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=IDA_TRAP_EDITOR (English (U.S.))
-Resource75=IDD_LOGIN (English (U.S.))
+Resource74=IDD_NEW_ACTION (English (U.S.))
+Resource75=IDD_CREATE_NODE (English (U.S.))
 Resource76=IDD_USER_PROPERTIES
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
 Resource77=IDR_MAINFRAME
 Class62=CCreateNodeDlg
-Resource78=IDD_EDIT_RULE_COMMENT (English (U.S.))
-Resource79=IDD_OBJECT_GENERAL (English (U.S.))
-Resource80=IDD_EDIT_TRAP (English (U.S.))
+Resource78=IDA_ACTION_EDITOR (English (U.S.))
+Resource79=IDD_EDIT_TRAP (English (U.S.))
+Resource80=IDD_SET_PASSWORD (English (U.S.))
 Class63=CDCITransformPage
-Resource81=IDD_OBJECT_CAPS (English (U.S.))
+Resource81=IDD_CREATE_TEMPLATE (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
@@ -180,22 +180,26 @@ Class73=CColorSelector
 Class74=CPackageMgr
 Resource94=IDD_GROUP_PROPERTIES
 Resource95=IDD_GRAPH_PROPERTIES
-Resource96=IDD_OBJECT_PRESENTATION (English (U.S.))
-Resource97=IDD_EDIT_RULE_SEVERITY (English (U.S.))
-Resource98=IDD_EDIT_RULE_ALARM (English (U.S.))
-Resource99=IDD_CP_GENERAL (English (U.S.))
-Resource100=IDD_NEW_ACTION (English (U.S.))
-Resource101=IDA_GRAPH (English (U.S.))
-Resource102=IDD_NEW_USER (English (U.S.))
-Resource103=IDD_USER_PROPERTIES (English (U.S.))
-Resource104=IDD_SET_PASSWORD (English (U.S.))
-Resource105=IDD_DCI_COLLECTION (English (U.S.))
-Resource106=IDD_DCI_THRESHOLDS (English (U.S.))
-Resource107=IDD_CREATE_TG (English (U.S.))
+Resource96=IDA_GRAPH (English (U.S.))
+Resource97=IDA_PACKAGE_MGR (English (U.S.))
+Resource98=IDD_ABOUTBOX (English (U.S.))
+Resource99=IDD_LOGIN (English (U.S.))
+Resource100=IDD_EDIT_EVENT (English (U.S.))
+Resource101=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource102=IDD_SELECT_AGENT_PARAM (English (U.S.))
+Resource103=IDD_INPUT_BOX (English (U.S.))
+Resource104=IDA_MDI_DEFAULT (English (U.S.))
+Resource105=IDM_VIEW_SPECIFIC (English (U.S.))
+Resource106=IDM_CONTEXT (English (U.S.))
+Resource107=IDD_NEW_USER (English (U.S.))
 Class75=CInternalItemSelDlg
-Resource108=IDD_GROUP_PROPERTIES (English (U.S.))
+Resource108=IDR_MAINFRAME (English (U.S.))
 Class76=CAgentParamSelDlg
-Resource109=IDD_SELECT_AGENT_PARAM
+Resource109=IDD_SELECT_USER (English (U.S.))
+Class77=CInputBox
+Resource110=IDD_GRAPH_PROPERTIES (English (U.S.))
+Class78=CCreateNetSrvDlg
+Resource111=IDD_CREATE_NETSRV (English (U.S.))
 
 [CLS:CConsoleApp]
 Type=0
@@ -741,86 +745,88 @@ Command11=ID_OBJECT_CREATE_NODE
 Command12=ID_OBJECT_CREATE_CONTAINER
 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
+Command15=ID_OBJECT_CREATE_SERVICE
+Command16=ID_OBJECT_BIND
+Command17=ID_OBJECT_RENAME
+Command18=ID_OBJECT_DELETE
+Command19=ID_OBJECT_MANAGE
+Command20=ID_OBJECT_UNMANAGE
+Command21=ID_OBJECT_POLL_STATUS
+Command22=ID_OBJECT_POLL_CONFIGURATION
+Command23=ID_OBJECT_WAKEUP
+Command24=ID_OBJECT_DATACOLLECTION
+Command25=ID_OBJECT_PROPERTIES
+Command26=ID_USER_CREATE_USER
+Command27=ID_USER_CREATE_GROUP
+Command28=ID_USER_DELETE
+Command29=ID_USER_SETPASSWORD
+Command30=ID_USER_PROPERTIES
+Command31=ID_ITEM_NEW
+Command32=ID_ITEM_EDIT
+Command33=ID_ITEM_DELETE
+Command34=ID_ITEM_COPY
+Command35=ID_ITEM_DUPLICATE
+Command36=ID_ITEM_ACTIVATE
+Command37=ID_ITEM_DISABLE
+Command38=ID_ITEM_SHOWDATA
+Command39=ID_ITEM_GRAPH
+Command40=ID_POLICY_ADD
+Command41=ID_POLICY_DELETE
+Command42=ID_POLICY_EDIT
+Command43=ID_POLICY_NEGATECELL
+Command44=ID_POLICY_INSERTRULE_ABOVE
+Command45=ID_POLICY_INSERTRULE_BELOW
+Command46=ID_POLICY_INSERTRULE_TOP
+Command47=ID_POLICY_INSERTRULE_BOTTOM
+Command48=ID_POLICY_DELETERULE
+Command49=ID_POLICY_ENABLERULE
+Command50=ID_POLICY_DISABLERULE
+Command51=ID_POLICY_SAVE
+Command52=ID_ALARM_ACKNOWLEGE
+Command53=ID_ALARM_DELETE
+Command54=ID_ALARM_GOTOSOURCE
+Command55=ID_UPDATE_EVENT_LIST
+Command56=ID_CONTROLPANEL_ACTIONS
+Command57=ID_CONTROLPANEL_AGENTPKG
+Command58=ID_CONTROLPANEL_EVENTS
+Command59=ID_CONTROLPANEL_EVENTPOLICY
+Command60=ID_CONTROLPANEL_SNMPTRAPS
+Command61=ID_CONTROLPANEL_USERS
+Command62=ID_OBJECT_OPEN
+Command63=ID_OBJECT_OPENPARENT
+Command64=ID_OBJECT_FIND
+Command65=ID_OBJECT_CREATE_NODE
+Command66=ID_OBJECT_CREATE_CONTAINER
+Command67=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command68=ID_OBJECT_CREATE_TEMPLATE
+Command69=ID_OBJECT_CREATE_SERVICE
+Command70=ID_OBJECT_BIND
+Command71=ID_OBJECT_RENAME
+Command72=ID_OBJECT_DELETE
+Command73=ID_OBJECT_MANAGE
+Command74=ID_OBJECT_UNMANAGE
+Command75=ID_OBJECT_POLL_STATUS
+Command76=ID_OBJECT_POLL_CONFIGURATION
+Command77=ID_OBJECT_WAKEUP
+Command78=ID_OBJECT_DATACOLLECTION
+Command79=ID_OBJECT_PROPERTIES
+Command80=ID_EVENT_NEW
+Command81=ID_EVENT_EDIT
+Command82=ID_EVENT_DELETE
+Command83=ID_ACTION_NEW
+Command84=ID_ACTION_RENAME
+Command85=ID_ACTION_DELETE
+Command86=ID_ACTION_PROPERTIES
+Command87=ID_TRAP_NEW
+Command88=ID_TRAP_EDIT
+Command89=ID_TRAP_DELETE
+Command90=ID_GRAPH_AUTOSCALE
+Command91=ID_GRAPH_FREEZE
+Command92=ID_GRAPH_PROPERTIES
+Command93=ID_PACKAGE_INSTALL
+Command94=ID_PACKAGE_REMOVE
+Command95=ID_PACKAGE_DEPLOY
+CommandCount=95
 
 [ACL:IDA_MDI_DEFAULT (English (U.S.))]
 Type=1
@@ -1413,86 +1419,87 @@ Command7=ID_OBJECT_CREATE_NODE
 Command8=ID_OBJECT_CREATE_CONTAINER
 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
+Command11=ID_OBJECT_CREATE_SERVICE
+Command12=ID_OBJECT_BIND
+Command13=ID_OBJECT_RENAME
+Command14=ID_OBJECT_DELETE
+Command15=ID_OBJECT_MANAGE
+Command16=ID_OBJECT_UNMANAGE
+Command17=ID_OBJECT_POLL_STATUS
+Command18=ID_OBJECT_POLL_CONFIGURATION
+Command19=ID_OBJECT_WAKEUP
+Command20=ID_OBJECT_DATACOLLECTION
+Command21=ID_OBJECT_PROPERTIES
+Command22=ID_ITEM_NEW
+Command23=ID_ITEM_EDIT
+Command24=ID_ITEM_DELETE
+Command25=ID_ITEM_COPY
+Command26=ID_ITEM_DUPLICATE
+Command27=ID_ITEM_ACTIVATE
+Command28=ID_ITEM_DISABLE
+Command29=ID_ITEM_SHOWDATA
+Command30=ID_ITEM_GRAPH
+Command31=ID_POLICY_INSERTRULE_ABOVE
+Command32=ID_POLICY_INSERTRULE_BELOW
+Command33=ID_POLICY_INSERTRULE_TOP
+Command34=ID_POLICY_INSERTRULE_BOTTOM
+Command35=ID_POLICY_DELETERULE
+Command36=ID_POLICY_ENABLERULE
+Command37=ID_POLICY_DISABLERULE
+Command38=ID_POLICY_ADD
+Command39=ID_POLICY_DELETE
+Command40=ID_POLICY_NEGATECELL
+Command41=ID_POLICY_INSERTRULE_ABOVE
+Command42=ID_POLICY_INSERTRULE_BELOW
+Command43=ID_POLICY_INSERTRULE_TOP
+Command44=ID_POLICY_INSERTRULE_BOTTOM
+Command45=ID_POLICY_DELETERULE
+Command46=ID_POLICY_ENABLERULE
+Command47=ID_POLICY_DISABLERULE
+Command48=ID_POLICY_EDIT
+Command49=ID_POLICY_INSERTRULE_ABOVE
+Command50=ID_POLICY_INSERTRULE_BELOW
+Command51=ID_POLICY_INSERTRULE_TOP
+Command52=ID_POLICY_INSERTRULE_BOTTOM
+Command53=ID_POLICY_DELETERULE
+Command54=ID_POLICY_ENABLERULE
+Command55=ID_POLICY_DISABLERULE
+Command56=ID_ALARM_ACKNOWLEGE
+Command57=ID_ALARM_DELETE
+Command58=ID_ALARM_GOTOSOURCE
+Command59=ID_ACTION_NEW
+Command60=ID_ACTION_RENAME
+Command61=ID_ACTION_DELETE
+Command62=ID_ACTION_PROPERTIES
+Command63=ID_POLL_RESTART
+Command64=ID_OBJECT_OPEN
+Command65=ID_OBJECT_OPENPARENT
+Command66=ID_OBJECT_CREATE_NODE
+Command67=ID_OBJECT_CREATE_CONTAINER
+Command68=ID_OBJECT_CREATE_TEMPLATEGROUP
+Command69=ID_OBJECT_CREATE_TEMPLATE
+Command70=ID_OBJECT_BIND
+Command71=ID_OBJECT_RENAME
+Command72=ID_OBJECT_DELETE
+Command73=ID_OBJECT_MANAGE
+Command74=ID_OBJECT_UNMANAGE
+Command75=ID_OBJECT_POLL_STATUS
+Command76=ID_OBJECT_POLL_CONFIGURATION
+Command77=ID_OBJECT_DATACOLLECTION
+Command78=ID_OBJECT_PROPERTIES
+Command79=ID_EVENT_NEW
+Command80=ID_EVENT_EDIT
+Command81=ID_EVENT_DELETE
+Command82=ID_TRAP_NEW
+Command83=ID_TRAP_EDIT
+Command84=ID_TRAP_DELETE
+Command85=ID_GRAPH_AUTOSCALE
+Command86=ID_GRAPH_FREEZE
+Command87=ID_GRAPH_PROPERTIES
+Command88=ID_PACKAGE_INSTALL
+Command89=ID_PACKAGE_REMOVE
+Command90=ID_PACKAGE_DEPLOY
+CommandCount=90
 
 [DLG:IDD_SET_PASSWORD (English (U.S.))]
 Type=1
@@ -2826,7 +2833,25 @@ Control2=IDOK,button,1342242817
 Control3=IDCANCEL,button,1342242816
 Control4=IDC_BUTTON_GET,button,1342242816
 
-[DLG:IDD_SELECT_AGENT_PARAM]
+[CLS:CAgentParamSelDlg]
+Type=0
+HeaderFile=AgentParamSelDlg.h
+ImplementationFile=AgentParamSelDlg.cpp
+BaseClass=CDialog
+Filter=D
+VirtualFilter=dWC
+LastObject=CAgentParamSelDlg
+
+[DLG:IDD_INPUT_BOX (English (U.S.))]
+Type=1
+Class=CInputBox
+ControlCount=4
+Control1=IDC_EDIT_TEXT,edit,1350631552
+Control2=IDOK,button,1342242817
+Control3=IDCANCEL,button,1342242816
+Control4=IDC_STATIC_HEADER,static,1342308352
+
+[DLG:IDD_SELECT_AGENT_PARAM (English (U.S.))]
 Type=1
 Class=CAgentParamSelDlg
 ControlCount=4
@@ -2835,12 +2860,52 @@ Control2=IDOK,button,1342242817
 Control3=IDCANCEL,button,1342242816
 Control4=IDC_BUTTON_GET,button,1342242816
 
-[CLS:CAgentParamSelDlg]
+[CLS:CInputBox]
 Type=0
-HeaderFile=AgentParamSelDlg.h
-ImplementationFile=AgentParamSelDlg.cpp
+HeaderFile=InputBox.h
+ImplementationFile=InputBox.cpp
 BaseClass=CDialog
 Filter=D
 VirtualFilter=dWC
-LastObject=CAgentParamSelDlg
+LastObject=CInputBox
+
+[DLG:IDD_CREATE_NETSRV (English (U.S.))]
+Type=1
+Class=CCreateNetSrvDlg
+ControlCount=26
+Control1=IDC_EDIT_NAME,edit,1350631552
+Control2=IDC_COMBO_TYPES,combobox,1344340227
+Control3=IDC_EDIT_PORT,edit,1350639744
+Control4=IDC_RADIO_TCP,button,1342308361
+Control5=IDC_RADIO_UDP,button,1342177289
+Control6=IDC_RADIO_ICMP,button,1342177289
+Control7=IDC_RADIO_OTHER,button,1342177289
+Control8=IDC_EDIT_PROTO,edit,1350639744
+Control9=IDC_EDIT_REQUEST,edit,1350631552
+Control10=IDC_EDIT_RESPONCE,edit,1350631552
+Control11=IDC_SELECT_PARENT,button,1342242816
+Control12=IDOK,button,1342242817
+Control13=IDCANCEL,button,1342242816
+Control14=IDC_STATIC,button,1342177287
+Control15=IDC_STATIC,static,1342308352
+Control16=IDC_STATIC,button,1342177287
+Control17=IDC_ICON_PARENT,static,1342177283
+Control18=IDC_STATIC_ID,static,1342308352
+Control19=IDC_STATIC_NAME,static,1342308352
+Control20=IDC_STATIC,static,1342308352
+Control21=IDC_STATIC,static,1342308352
+Control22=IDC_STATIC,button,1342177287
+Control23=IDC_STATIC,static,1342308352
+Control24=IDC_STATIC,button,1342177287
+Control25=IDC_STATIC,static,1342308352
+Control26=IDC_STATIC,static,1342308352
+
+[CLS:CCreateNetSrvDlg]
+Type=0
+HeaderFile=CreateNetSrvDlg.h
+ImplementationFile=CreateNetSrvDlg.cpp
+BaseClass=CCreateObjectDlg
+Filter=D
+LastObject=CCreateNetSrvDlg
+VirtualFilter=dWC
 
index 4a8d079..9c18d7e 100644 (file)
@@ -10,6 +10,7 @@
 #include "CreateNodeDlg.h"
 #include "CreateTemplateDlg.h"
 #include "CreateTGDlg.h"
+#include "CreateNetSrvDlg.h"
 #include "NodePoller.h"
 #include "MIBBrowserDlg.h"
 
@@ -1323,9 +1324,9 @@ void CConsoleApp::CreateContainer(DWORD dwParent)
    {
       ci.dwParentId = (dlg.m_pParentObject != NULL) ? dlg.m_pParentObject->dwId : 0;
       ci.iClass = OBJECT_CONTAINER;
-      ci.pszName = (char *)((LPCTSTR)dlg.m_strObjectName);
+      ci.pszName = (TCHAR *)((LPCTSTR)dlg.m_strObjectName);
       ci.cs.container.dwCategory = 1;
-      ci.cs.container.pszDescription = (char *)((LPCTSTR)dlg.m_strDescription);
+      ci.cs.container.pszDescription = (TCHAR *)((LPCTSTR)dlg.m_strDescription);
       CreateObject(&ci);
    }
 }
@@ -1349,7 +1350,7 @@ void CConsoleApp::CreateNode(DWORD dwParent)
    {
       ci.dwParentId = (dlg.m_pParentObject != NULL) ? dlg.m_pParentObject->dwId : 0;
       ci.iClass = OBJECT_NODE;
-      ci.pszName = (char *)((LPCTSTR)dlg.m_strObjectName);
+      ci.pszName = (TCHAR *)((LPCTSTR)dlg.m_strObjectName);
       ci.cs.node.dwIpAddr = dlg.m_dwIpAddr;
       ci.cs.node.dwNetMask = 0;
       CreateObject(&ci);
@@ -1357,6 +1358,38 @@ void CConsoleApp::CreateNode(DWORD dwParent)
 }
 
 
+//
+// Create network service object
+//
+
+void CConsoleApp::CreateNetworkService(DWORD dwParent)
+{
+   NXC_OBJECT_CREATE_INFO ci;
+   CCreateNetSrvDlg dlg;
+
+   dlg.m_pParentObject = NXCFindObjectById(g_hSession, dwParent);
+   if (dlg.m_pParentObject != NULL)
+      if (dlg.m_pParentObject->iClass != OBJECT_NODE)
+         dlg.m_pParentObject = NULL;
+   dlg.m_iServiceType = NETSRV_HTTP;
+   dlg.m_iPort = 80;
+   dlg.m_iProtocolNumber = 6;
+   dlg.m_iProtocolType = 0;
+   if (dlg.DoModal() == IDOK)
+   {
+      ci.dwParentId = (dlg.m_pParentObject != NULL) ? dlg.m_pParentObject->dwId : 0;
+      ci.iClass = OBJECT_NETWORKSERVICE;
+      ci.pszName = (TCHAR *)((LPCTSTR)dlg.m_strObjectName);
+      ci.cs.netsrv.iServiceType = dlg.m_iServiceType;
+      ci.cs.netsrv.wPort = (WORD)dlg.m_iPort;
+      ci.cs.netsrv.wProto = (WORD)dlg.m_iProtocolNumber;
+      ci.cs.netsrv.pszRequest = (TCHAR *)((LPCTSTR)dlg.m_strRequest);
+      ci.cs.netsrv.pszResponce = (TCHAR *)((LPCTSTR)dlg.m_strResponce);
+      CreateObject(&ci);
+   }
+}
+
+
 //
 // Create template object
 //
index 1aaef92..fe7c895 100644 (file)
@@ -137,6 +137,10 @@ SOURCE=.\CreateContainerDlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\CreateNetSrvDlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\CreateNodeDlg.cpp
 # End Source File
 # Begin Source File
@@ -233,6 +237,10 @@ SOURCE=.\GroupPropDlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\InputBox.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\InternalItemSelDlg.cpp
 # End Source File
 # Begin Source File
@@ -438,6 +446,10 @@ SOURCE=.\CreateContainerDlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CreateNetSrvDlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CreateNodeDlg.h
 # End Source File
 # Begin Source File
@@ -530,6 +542,10 @@ SOURCE=.\GroupPropDlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\InputBox.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\InternalItemSelDlg.h
 # End Source File
 # Begin Source File
index c7bca48..91ef42f 100644 (file)
@@ -186,6 +186,7 @@ private:
    DC_EDITOR m_openDCEditors[MAX_DC_EDITORS];
 
 public:
+       void CreateNetworkService(DWORD dwParent);
        void WakeUpNode(DWORD dwObjectId);
        void CreateTemplateGroup(DWORD dwParent);
        void CreateTemplate(DWORD dwParent);
index 2410f67..107f14b 100644 (file)
@@ -223,6 +223,7 @@ BEGIN
 
             MENUITEM "&Template...",                ID_OBJECT_CREATE_TEMPLATE
 
+            MENUITEM "&Service...",                 ID_OBJECT_CREATE_SERVICE
         END
         MENUITEM "&Bind...\tCtrl+B",            ID_OBJECT_BIND
         MENUITEM "&Rename",                     ID_OBJECT_RENAME
@@ -327,6 +328,7 @@ BEGIN
 
             MENUITEM "&Template...",                ID_OBJECT_CREATE_TEMPLATE
 
+            MENUITEM "&Service...",                 ID_OBJECT_CREATE_SERVICE
         END
         MENUITEM "&Bind...\tCtrl+B",            ID_OBJECT_BIND
         MENUITEM "&Rename",                     ID_OBJECT_RENAME
@@ -408,6 +410,7 @@ BEGIN
 
             MENUITEM "&Template...",                ID_OBJECT_CREATE_TEMPLATE
 
+            MENUITEM "&Service...",                 ID_OBJECT_CREATE_SERVICE
         END
         MENUITEM "&Bind...",                    ID_OBJECT_BIND
         MENUITEM "&Rename",                     ID_OBJECT_RENAME
@@ -932,7 +935,7 @@ END
 IDD_GROUP_PROPERTIES DIALOGEX 0, 0, 223, 266
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Group Properties"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_EDIT_NAME,50,7,165,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_DESCRIPTION,50,27,165,14,ES_AUTOHSCROLL
@@ -1074,7 +1077,7 @@ IDD_MIB_BROWSER DIALOGEX 0, 0, 329, 322
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "MIB Browser"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_EDIT_OID,7,17,224,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_INSTANCE,235,17,31,14,ES_AUTOHSCROLL | 
@@ -1391,7 +1394,7 @@ END
 IDD_EDIT_TRAP DIALOGEX 0, 0, 271, 258
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Trap Configuration"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_EDIT_DESCRIPTION,13,17,245,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_TRAP,13,50,189,14,ES_AUTOHSCROLL
@@ -1434,7 +1437,7 @@ END
 IDD_GRAPH_PROPERTIES DIALOGEX 0, 0, 227, 199
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Graph Properties"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,170,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,170,24,50,14
@@ -1503,7 +1506,7 @@ END
 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"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "List1",IDC_LIST_PARAMETERS,"SysListView32",LVS_REPORT | 
                     LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | 
@@ -1513,6 +1516,68 @@ BEGIN
     PUSHBUTTON      "&Get...",IDC_BUTTON_GET,359,44,50,14
 END
 
+IDD_SELECT_AGENT_PARAM DIALOGEX 0, 0, 386, 229
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Supported agent parameters"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "List1",IDC_LIST_PARAMS,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_TABSTOP,7,7,315,
+                    215,WS_EX_CLIENTEDGE
+    DEFPUSHBUTTON   "OK",IDOK,329,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,329,24,50,14
+    PUSHBUTTON      "&Get...",IDC_BUTTON_GET,329,41,50,14
+END
+
+IDD_INPUT_BOX DIALOG DISCARDABLE  0, 0, 271, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Query"
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_EDIT_TEXT,7,17,199,14,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,214,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,214,24,50,14
+    LTEXT           "Static",IDC_STATIC_HEADER,7,7,199,8
+END
+
+IDD_CREATE_NETSRV DIALOG DISCARDABLE  0, 0, 240, 239
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create Network Service"
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_EDIT_NAME,13,27,158,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_COMBO_TYPES,13,55,92,57,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_EDIT_PORT,114,55,40,14,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "&TCP",IDC_RADIO_TCP,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,13,89,30,10
+    CONTROL         "&UDP",IDC_RADIO_UDP,"Button",BS_AUTORADIOBUTTON,13,101,
+                    31,10
+    CONTROL         "&ICMP",IDC_RADIO_ICMP,"Button",BS_AUTORADIOBUTTON,56,89,
+                    33,10
+    CONTROL         "&Other:",IDC_RADIO_OTHER,"Button",BS_AUTORADIOBUTTON,56,
+                    101,35,10
+    EDITTEXT        IDC_EDIT_PROTO,103,97,40,14,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_EDIT_REQUEST,13,138,158,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_RESPONCE,13,166,158,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Select...",IDC_SELECT_PARENT,121,202,50,12
+    DEFPUSHBUTTON   "OK",IDOK,183,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,183,24,50,14
+    GROUPBOX        "General",IDC_STATIC,7,7,170,68
+    LTEXT           "Name",IDC_STATIC,13,18,20,8
+    GROUPBOX        "Parent object",IDC_STATIC,7,191,170,42
+    ICON            "",IDC_ICON_PARENT,14,204,21,20
+    LTEXT           "ID:",IDC_STATIC_ID,43,204,69,8
+    LTEXT           "Name",IDC_STATIC_NAME,44,218,127,9
+    LTEXT           "Service type",IDC_STATIC,13,45,40,8
+    LTEXT           "TCP/UDP Port",IDC_STATIC,113,45,48,8
+    GROUPBOX        "IP Protocol",IDC_STATIC,7,79,169,37
+    LTEXT           "Protocol number",IDC_STATIC,103,87,52,8
+    GROUPBOX        "Static",IDC_STATIC,7,119,169,68
+    LTEXT           "Request",IDC_STATIC,13,128,28,8
+    LTEXT           "Expected responce",IDC_STATIC,13,156,62,8
+END
+
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -1860,6 +1925,30 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 147
     END
+
+    IDD_SELECT_AGENT_PARAM, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 379
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 222
+    END
+
+    IDD_INPUT_BOX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 264
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 39
+    END
+
+    IDD_CREATE_NETSRV, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 233
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 232
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -2003,56 +2092,6 @@ 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_AGENT_PARAM DIALOGEX 0, 0, 386, 229
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Supported agent parameters"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "List1",IDC_LIST_PARAMS,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_TABSTOP,7,7,315,
-                    215,WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON   "OK",IDOK,329,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,329,24,50,14
-    PUSHBUTTON      "&Get...",IDC_BUTTON_GET,329,41,50,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_SELECT_AGENT_PARAM, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 379
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 222
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
index 6752c54..8c26f61 100644 (file)
 #define IDI_DATABASE                    250
 #define IDD_SELECT_INTERNAL_ITEM        252
 #define IDD_SELECT_AGENT_PARAM          253
+#define IDD_INPUT_BOX                   254
+#define IDD_CREATE_NETSRV               255
 #define ID_EDIT_BOX                     525
 #define IDC_EDIT_SERVER                 1000
 #define IDC_EDIT_LOGIN                  1001
 #define IDC_CB_ITEM1                    1217
 #define IDC_CB_ITEM5                    1218
 #define IDC_CB_ITEM2                    1219
+#define IDC_COMBO_TYPES                 1219
 #define IDC_CB_ITEM6                    1220
 #define IDC_CB_ITEM3                    1221
+#define IDC_RADIO_TCP                   1221
 #define IDC_CB_ITEM7                    1222
+#define IDC_RADIO_UDP                   1222
 #define IDC_CB_ITEM4                    1223
+#define IDC_RADIO_ICMP                  1223
 #define IDC_CB_ITEM8                    1224
+#define IDC_RADIO_OTHER                 1224
 #define IDC_CB_ITEM9                    1225
+#define IDC_EDIT_PROTO                  1225
 #define IDC_CB_ITEM13                   1226
+#define IDC_EDIT_REQUEST                1226
 #define IDC_CB_ITEM10                   1227
+#define IDC_EDIT_RESPONCE               1227
 #define IDC_CB_ITEM14                   1228
 #define IDC_CB_ITEM11                   1229
 #define IDC_CB_ITEM15                   1230
 #define ID_PACKAGE_INSTALL              32908
 #define ID_PACKAGE_REMOVE               32909
 #define ID_PACKAGE_DEPLOY               32910
+#define ID_OBJECT_CREATE_SERVICE        32913
 #define IDS_GETFOLDERPATH_FAILED        61216
 #define IDS_WORKDIR_CREATION_FAILED     61217
 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        254
-#define _APS_NEXT_COMMAND_VALUE         32912
-#define _APS_NEXT_CONTROL_VALUE         1217
+#define _APS_NEXT_RESOURCE_VALUE        256
+#define _APS_NEXT_COMMAND_VALUE         32915
+#define _APS_NEXT_CONTROL_VALUE         1228
 #define _APS_NEXT_SYMED_VALUE           120
 #endif
 #endif
index 75cee92..053952e 100644 (file)
@@ -63,6 +63,20 @@ CSize GetWindowSize(CWnd *pWnd)
 }
 
 
+//
+// Enable or disable dialog item
+//
+
+void EnableDlgItem(CDialog *pWnd, int nCtrl, BOOL bEnable)
+{
+   CWnd *pCtrl;
+
+   pCtrl = pWnd->GetDlgItem(nCtrl);
+   if (pCtrl != NULL)
+      pCtrl->EnableWindow(bEnable);
+}
+
+
 //
 // Select given item in list view
 // Will remove selection from all currently selected items and set