Various node creation options added to "Create Node" dialog
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 6 Sep 2006 20:07:23 +0000 (20:07 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 6 Sep 2006 20:07:23 +0000 (20:07 +0000)
src/console/win32/CreateNodeDlg.cpp
src/console/win32/CreateNodeDlg.h
src/console/win32/nxcon.clw
src/console/win32/nxcon.rc
src/console/win32/resource.h

index 1182456..cb11607 100644 (file)
@@ -19,6 +19,10 @@ CCreateNodeDlg::CCreateNodeDlg(CWnd* pParent /*=NULL*/)
        : CCreateObjectDlg(CCreateNodeDlg::IDD, pParent)
 {
        //{{AFX_DATA_INIT(CCreateNodeDlg)
+       m_bDisableAgent = FALSE;
+       m_bDisableICMP = FALSE;
+       m_bDisableSNMP = FALSE;
+       m_bCreateUnmanaged = FALSE;
        //}}AFX_DATA_INIT
 }
 
@@ -29,6 +33,10 @@ void CCreateNodeDlg::DoDataExchange(CDataExchange* pDX)
        //{{AFX_DATA_MAP(CCreateNodeDlg)
        DDX_Control(pDX, IDC_EDIT_NAME, m_wndObjectName);
        DDX_Control(pDX, IDC_IP_ADDR, m_wndIPAddr);
+       DDX_Check(pDX, IDC_CHECK_AGENT, m_bDisableAgent);
+       DDX_Check(pDX, IDC_CHECK_ICMP, m_bDisableICMP);
+       DDX_Check(pDX, IDC_CHECK_SNMP, m_bDisableSNMP);
+       DDX_Check(pDX, IDC_CHECK_UNMANAGED, m_bCreateUnmanaged);
        //}}AFX_DATA_MAP
 }
 
index bb43fc7..5455478 100644 (file)
@@ -25,6 +25,10 @@ public:
        enum { IDD = IDD_CREATE_NODE };
        CEdit   m_wndObjectName;
        CIPAddressCtrl  m_wndIPAddr;
+       BOOL    m_bDisableAgent;
+       BOOL    m_bDisableICMP;
+       BOOL    m_bDisableSNMP;
+       BOOL    m_bCreateUnmanaged;
        //}}AFX_DATA
 
 
index e5b54f4..c9d1a94 100644 (file)
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CTrapParamDlg
+LastClass=CCreateNodeDlg
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
@@ -17,20 +17,20 @@ Class9=CMapView
 
 ResourceCount=179
 Resource1=IDD_CP_GENERAL (English (U.S.))
-Resource2=IDD_DATA_QUERY
+Resource2=IDD_SUBMAP_BKGND
 Resource3=IDD_DCI_DATA_EXPORT (English (U.S.))
-Resource4=IDD_DCI_TRANSFORM
-Resource5=IDD_EDIT_TRAP
+Resource4=IDD_REMOVE_TEMPLATE
+Resource5=IDD_CHANGE_PASSWORD
 Class2=CChildView
 Class5=CAboutDlg
 Class6=CControlPanel
 Class8=CMapFrame
 Class10=CLoginDialog
-Resource6=IDD_OBJECT_VPNC_GENERAL
+Resource6=IDD_DATA_QUERY
 Class11=CProgressDialog
-Resource7=IDA_AGENT_CFG_EDITOR
+Resource7=IDD_NEW_ACTION
 Class12=CObjectBrowser
-Resource8=IDD_SELECT_AGENT_PARAM
+Resource8=IDD_SELECT_EVENT
 Class13=CObjectPropDlg
 Resource9=IDD_THRESHOLD (English (U.S.))
 Resource10=IDD_SELECT_OBJECT (English (U.S.))
@@ -46,45 +46,45 @@ Resource17=IDD_NEW_USER (English (U.S.))
 Class16=CDebugFrame
 Resource18=IDD_NEW_ACTION (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDD_CREATE_CONTAINER
+Resource20=IDD_OBJTOOL_OPTIONS
 Class17=CObjectPreview
 Resource21=IDA_OBJECT_BROWSER (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_EDIT_IP_SUBNET
+Resource22=IDA_PACKAGE_MGR
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
 Resource23=IDD_GRAPH_PROPERTIES (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
-Resource24=IDD_SELECT_ACTION
+Resource24=IDD_NEW_OBJECT_TOOL
 Class26=CRequestProcessingDlg
 Resource25=IDD_SELECT_USER (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDD_SUBMAP_BKGND
+Resource27=IDD_GRAPH_PROP_DATA
 Resource28=IDD_DCI_COLLECTION (English (U.S.))
 Class27=CObjectPropsGeneral
 Resource29=IDR_MAINFRAME (English (U.S.))
 Class28=CObjectPropsSecurity
 Resource30=IDD_SAVE_AGENT_CFG (English (U.S.))
-Resource31=IDD_OBJECT_CAPS
-Resource32=IDA_AGENT_CONFIG_MANAGER
+Resource31=IDA_NETMAP
+Resource32=IDD_DCI_TRANSFORM
 Class29=CUserSelectDlg
-Resource33=IDD_GRAPH_PROP_SETTINGS
+Resource33=IDA_EPP
 Class30=CUserEditor
 Resource34=IDD_DCI_PROPERTIES
 Class31=CNewUserDlg
-Resource35=IDD_GROUP_PROPERTIES
-Resource36=IDD_NEW_ACTION
+Resource35=IDD_OBJECT_NODE_POLL
+Resource36=IDD_OBJECT_STATUS
 Class32=CUserPropDlg
 Resource37=IDD_EDIT_VARIABLE (English (U.S.))
-Resource38=IDD_DESKTOP_SAVE_AS
+Resource38=IDA_OBJECT_BROWSER
 Class33=CGroupPropDlg
-Resource39=IDD_LASTVAL_PROP
-Resource40=IDD_SET_PASSWORD
-Resource41=IDD_EDIT_EVENT
+Resource39=IDD_CREATE_NODE
+Resource40=IDD_OBJECT_RELATIONS
+Resource41=IDA_TRAP_EDITOR
 Resource42=IDA_ACTION_EDITOR (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
@@ -100,55 +100,55 @@ Class41=CGraphFrame
 Class42=CDCIThresholdsPage
 Resource46=IDA_OBJECT_TOOLS_EDITOR (English (U.S.))
 Resource47=IDM_CONTEXT (English (U.S.))
-Resource48=IDD_SAVE_AGENT_CFG
+Resource48=IDD_EDIT_TRAP_ARG
 Class43=CThresholdDlg
 Resource49=IDD_DESKTOP_SAVE_AS (English (U.S.))
-Resource50=IDD_OBJTOOL_COLUMNS
+Resource50=IDD_ABOUTBOX
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
 Resource51=IDD_SELECT_AGENT_PARAM (English (U.S.))
-Resource52=IDD_OBJECT_NETSRV_GENERAL
+Resource52=IDD_EDIT_RULE_ALARM
 Class48=CObjectSelDlg
-Resource53=IDA_OBJECT_TOOLS_EDITOR
-Resource54=IDD_COND_DCI_PROP
+Resource53=IDD_SELECT_ACTION
+Resource54=IDD_USER_PROPERTIES
 Class49=CRuleCommentDlg
-Resource55=IDD_REQUEST_PROCESSING
+Resource55=IDA_LAST_VALUES
 Class50=CEventSelDlg
-Resource56=IDD_OBJECT_PRESENTATION
+Resource56=IDD_OBJECT_VPNC_GENERAL
 Resource57=IDA_EPP (English (U.S.))
-Resource58=IDD_THRESHOLD
+Resource58=IDD_OBJECT_NODE_GENERAL
 Resource59=IDA_PACKAGE_MGR (English (U.S.))
 Resource60=IDD_OBJTOOL_GENERAL (English (U.S.))
 Class51=CObjectPropsPresentation
 Resource61=IDD_CREATE_TEMPLATE (English (U.S.))
-Resource62=IDD_OBJECT_COND_DATA
+Resource62=IDD_SELECT_USER
 Class52=CRuleSeverityDlg
-Resource63=IDA_ACTION_EDITOR
+Resource63=IDD_EDIT_RULE_COMMENT
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
 Resource64=IDA_MDI_DEFAULT (English (U.S.))
-Resource65=IDD_CREATE_VPNC
+Resource65=IDD_CREATE_TEMPLATE
 Resource66=IDD_EDIT_IP_SUBNET (English (U.S.))
 Resource67=IDD_EDIT_RULE_SEVERITY (English (U.S.))
 Resource68=IDD_ACTION_PROPERTIES (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
-Resource69=IDD_NEW_USER
-Resource70=IDD_OBJECT_GENERAL
+Resource69=IDA_OBJECT_TOOLS_EDITOR
+Resource70=IDA_ACTION_EDITOR
 Class57=CNewActionDlg
-Resource71=IDD_OBJECT_SECURITY
+Resource71=IDD_SELECT_AGENT_PARAM
 Class58=CEditActionDlg
-Resource72=IDD_CREATE_TG
+Resource72=IDD_DCI_COLLECTION
 Class59=CActionSelDlg
-Resource73=IDD_NEW_OBJECT_TOOL
+Resource73=IDD_CREATE_NETSRV
 Resource74=IDD_EDIT_TRAP (English (U.S.))
 Resource75=IDD_USER_PROPERTIES (English (U.S.))
-Resource76=IDD_OBJECT_RELATIONS
+Resource76=IDA_MDI_DEFAULT
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
-Resource77=IDD_OBJECT_NODE_GENERAL
+Resource77=IDA_GRAPH
 Class62=CCreateNodeDlg
 Resource78=IDD_OBJECT_NODE_GENERAL (English (U.S.))
 Resource79=IDT_MAP (English (U.S.))
@@ -158,31 +158,31 @@ Resource81=IDD_LASTVAL_PROP (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
-Resource83=IDD_EDIT_RULE_COMMENT
-Resource84=IDA_LAST_VALUES
+Resource83=IDD_EDIT_VARIABLE
+Resource84=IDD_COND_DCI_PROP
 Class66=CCreateTemplateDlg
 Class67=CCreateTGDlg
-Resource85=IDD_CHANGE_PASSWORD
-Resource86=IDD_CP_GENERAL
+Resource85=IDD_OBJECT_CAPS
+Resource86=IDD_DCI_SCHEDULE
 Class68=CTrapEditor
-Resource87=IDD_OBJECT_NODE_POLL
-Resource88=IDD_EDIT_TRAP_ARG
-Resource89=IDD_CREATE_NODE
+Resource87=IDR_MAINFRAME
+Resource88=IDD_SELECT_OBJECT
+Resource89=IDD_GROUP_PROPERTIES
 Class69=CDataQueryDlg
-Resource90=IDD_EDIT_RULE_ALARM
+Resource90=IDD_SAVE_AGENT_CFG
 Class70=CTrapEditDlg
 Resource91=IDM_VIEW_SPECIFIC (English (U.S.))
 Class71=CTrapParamDlg
-Resource92=IDR_MAINFRAME
+Resource92=IDD_CHANGE_IP
 Resource93=IDM_VIEW_SPECIFIC
 Class72=CGraphPropDlg
 Class73=CColorSelector
 Class74=CPackageMgr
-Resource94=IDD_SNMP_WALK
+Resource94=IDD_CREATE_VPNC
 Resource95=IDA_SCRIPT_MANAGER (English (U.S.))
 Resource96=IDD_SET_PASSWORD (English (U.S.))
 Resource97=IDD_DCI_TRANSFORM (English (U.S.))
-Resource98=IDD_OBJECT_STATUS
+Resource98=IDA_AGENT_CFG_EDITOR
 Resource99=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
 Resource100=IDD_OBJTOOL_OPTIONS (English (U.S.))
 Resource101=IDA_LAST_VALUES (English (U.S.))
@@ -244,7 +244,7 @@ Class102=CWaitView
 Class103=CWebBrowser
 Class104=CSyslogBrowser
 Class105=CLPPList
-Resource129=IDD_OBJTOOL_GENERAL
+Resource129=IDA_DC_EDITOR
 Class106=CDCISchedulePage
 Resource130=IDD_OBJECT_CAPS (English (U.S.))
 Class107=CObjectPropsStatus
@@ -270,54 +270,54 @@ Class119=CMapControlBox
 Resource138=IDD_OBJECT_GENERAL (English (U.S.))
 Class120=CSubmapBkgndDlg
 Resource139=IDD_SUBMAP_BKGND (English (U.S.))
-Resource140=IDD_GRAPH_PROP_DATA
-Resource141=IDD_ACTION_PROPERTIES
-Resource142=IDA_EVENT_EDITOR
-Resource143=IDD_DCI_THRESHOLDS
-Resource144=IDD_SELECT_OBJECT
-Resource145=IDA_PACKAGE_MGR
-Resource146=IDD_EDIT_RULE_SEVERITY
-Resource147=IDD_CREATE_TEMPLATE
-Resource148=IDD_CREATE_NETSRV
-Resource149=IDA_MDI_DEFAULT
-Resource150=IDD_SELECT_USER
-Resource151=IDD_CREATE_CONDITION
-Resource152=IDD_ABOUTBOX
-Resource153=IDD_MIB_BROWSER
+Resource140=IDA_ALARM_BROWSER
+Resource141=IDD_OBJTOOL_GENERAL
+Resource142=IDD_CREATE_CONDITION
+Resource143=IDD_GRAPH_PROP_SETTINGS
+Resource144=IDD_DCI_DATA_EXPORT
+Resource145=IDD_ADD_DCI
+Resource146=IDD_EDIT_IP_SUBNET
+Resource147=IDD_SNMP_WALK
+Resource148=IDD_EDIT_RULE_SEVERITY
+Resource149=IDD_SET_PASSWORD
+Resource150=IDD_INPUT_BOX
+Resource151=IDD_REQUEST_PROCESSING
+Resource152=IDD_CREATE_TG
+Resource153=IDD_LASTVAL_PROP
 Resource154=IDM_CONTEXT
-Resource155=IDD_DCI_DATA_EXPORT
-Resource156=IDA_GRAPH
-Resource157=IDA_ALARM_BROWSER
-Resource158=IDA_EPP
-Resource159=IDD_SELECT_EVENT
-Resource160=IDD_OBJTOOL_OPTIONS
-Resource161=IDD_OBJECT_COND_GENERAL
-Resource162=IDD_SELECT_INTERNAL_ITEM
-Resource163=IDD_DCI_SCHEDULE
-Resource164=IDD_CHANGE_IP
-Resource165=IDA_SERVER_CFG_EDITOR
-Resource166=IDA_TRAP_EDITOR
-Resource167=IDA_NETMAP
-Resource168=IDA_OBJECT_BROWSER
-Resource169=IDD_REMOVE_TEMPLATE
-Resource170=IDD_USER_PROPERTIES
-Resource171=IDD_INPUT_BOX
+Resource155=IDA_EVENT_EDITOR
+Resource156=IDD_OBJECT_PRESENTATION
+Resource157=IDD_THRESHOLD
+Resource158=IDD_DCI_THRESHOLDS
+Resource159=IDD_EDIT_EVENT
+Resource160=IDA_SCRIPT_MANAGER
+Resource161=IDD_OBJECT_GENERAL
+Resource162=IDD_OBJECT_COND_GENERAL
+Resource163=IDA_SERVER_CFG_EDITOR
+Resource164=IDA_DATA_VIEW
+Resource165=IDD_CP_GENERAL
+Resource166=IDD_OBJECT_COND_SCRIPT
+Resource167=IDD_MIB_BROWSER
+Resource168=IDD_OBJTOOL_COLUMNS
+Resource169=IDA_AGENT_CONFIG_MANAGER
+Resource170=IDD_OBJECT_NETSRV_GENERAL
+Resource171=IDD_OBJECT_COND_DATA
 Class121=CModuleManager
 Class122=CDesktopManager
-Resource172=IDD_OBJECT_COND_SCRIPT
-Resource173=IDD_EDIT_VARIABLE
+Resource172=IDD_OBJECT_SECURITY
+Resource173=IDD_SELECT_INTERNAL_ITEM
 Class123=CCreateCondDlg
 Class124=CCondPropsGeneral
 Class125=CCondPropsScript
 Class126=CCondPropsData
-Resource174=IDD_ADD_DCI
+Resource174=IDD_NEW_USER
 Class127=CAddDCIDlg
-Resource175=IDA_SCRIPT_MANAGER
+Resource175=IDD_CREATE_CONTAINER
 Class128=CCondDCIPropDlg
-Resource176=IDD_DCI_COLLECTION
+Resource176=IDD_DESKTOP_SAVE_AS
 Class129=CAgentConfigMgr
-Resource177=IDA_DC_EDITOR
-Resource178=IDA_DATA_VIEW
+Resource177=IDD_ACTION_PROPERTIES
+Resource178=IDD_EDIT_TRAP
 Class130=CAgentCfgDlg
 Resource179=IDD_AGENT_CONFIG
 
@@ -2672,20 +2672,27 @@ VirtualFilter=dWC
 [DLG:IDD_CREATE_NODE]
 Type=1
 Class=CCreateNodeDlg
-ControlCount=13
+ControlCount=20
 Control1=IDC_EDIT_NAME,edit,1350631552
 Control2=IDC_IP_ADDR,SysIPAddress32,1342242816
 Control3=IDC_BUTTON_RESOLVE,button,1342242816
-Control4=IDC_SELECT_PARENT,button,1342242816
-Control5=IDOK,button,1342242817
-Control6=IDCANCEL,button,1342242816
-Control7=IDC_STATIC,button,1342177287
-Control8=IDC_STATIC,static,1342308352
-Control9=IDC_STATIC,button,1342177287
-Control10=IDC_ICON_PARENT,static,1342177283
-Control11=IDC_STATIC_ID,static,1342308352
-Control12=IDC_STATIC_NAME,static,1342308352
-Control13=IDC_STATIC,static,1342308352
+Control4=IDC_CHECK_UNMANAGED,button,1342242819
+Control5=IDC_CHECK_AGENT,button,1342242819
+Control6=IDC_CHECK_SNMP,button,1342242819
+Control7=IDC_CHECK_ICMP,button,1342242819
+Control8=IDC_EDIT_PROXY,edit,1350633600
+Control9=IDC_SELECT_PROXY,button,1342242816
+Control10=IDC_SELECT_PARENT,button,1342242816
+Control11=IDOK,button,1342242817
+Control12=IDCANCEL,button,1342242816
+Control13=IDC_STATIC,button,1342177287
+Control14=IDC_STATIC,static,1342308352
+Control15=IDC_STATIC,button,1342177287
+Control16=IDC_ICON_PARENT,static,1342177283
+Control17=IDC_STATIC_ID,static,1342308352
+Control18=IDC_STATIC_NAME,static,1342308352
+Control19=IDC_STATIC,static,1342308352
+Control20=IDC_STATIC,static,1342308352
 
 [CLS:CCreateNodeDlg]
 Type=0
index f467007..18fdbb2 100644 (file)
@@ -1731,7 +1731,7 @@ BEGIN
     LTEXT           "Description",IDC_STATIC,13,71,36,8
 END
 
-IDD_CREATE_NODE DIALOG DISCARDABLE  0, 0, 240, 129
+IDD_CREATE_NODE DIALOG DISCARDABLE  0, 0, 240, 220
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Create Node"
 FONT 8, "MS Sans Serif"
@@ -1740,16 +1740,28 @@ BEGIN
     CONTROL         "IPAddress1",IDC_IP_ADDR,"SysIPAddress32",WS_TABSTOP,13,
                     55,102,15
     PUSHBUTTON      "&Resolve",IDC_BUTTON_RESOLVE,121,55,50,14
-    PUSHBUTTON      "&Select...",IDC_SELECT_PARENT,121,91,50,12
+    CONTROL         "Create as &unmanaged object",IDC_CHECK_UNMANAGED,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,77,107,10
+    CONTROL         "Disable NetXMS &agent for polls",IDC_CHECK_AGENT,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,91,114,10
+    CONTROL         "Disable &SNMP for polls",IDC_CHECK_SNMP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,105,88,10
+    CONTROL         "Disable &ICMP for polls",IDC_CHECK_ICMP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,119,85,10
+    EDITTEXT        IDC_EDIT_PROXY,13,145,139,14,ES_AUTOHSCROLL | 
+                    ES_READONLY
+    PUSHBUTTON      "...",IDC_SELECT_PROXY,157,145,14,14
+    PUSHBUTTON      "&Select...",IDC_SELECT_PARENT,121,181,50,12
     DEFPUSHBUTTON   "OK",IDOK,183,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,183,24,50,14
-    GROUPBOX        "New object",IDC_STATIC,7,7,170,70
+    GROUPBOX        "New object",IDC_STATIC,7,7,170,160
     LTEXT           "Name",IDC_STATIC,13,18,20,8
-    GROUPBOX        "Parent object",IDC_STATIC,7,80,170,42
-    ICON            "",IDC_ICON_PARENT,14,93,20,20
-    LTEXT           "ID:",IDC_STATIC_ID,43,93,69,8
-    LTEXT           "Name",IDC_STATIC_NAME,44,107,127,9
+    GROUPBOX        "Parent object",IDC_STATIC,7,171,170,42
+    ICON            "",IDC_ICON_PARENT,14,183,21,20
+    LTEXT           "ID:",IDC_STATIC_ID,43,183,69,8
+    LTEXT           "Name",IDC_STATIC_NAME,44,197,127,9
     LTEXT           "IP address",IDC_STATIC,13,46,34,8
+    LTEXT           "Proxy agent",IDC_STATIC,13,134,38,8
 END
 
 IDD_DCI_TRANSFORM DIALOG DISCARDABLE  0, 0, 228, 193
@@ -2933,7 +2945,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 233
         TOPMARGIN, 7
-        BOTTOMMARGIN, 122
+        BOTTOMMARGIN, 213
     END
 
     IDD_DCI_TRANSFORM, DIALOG
index d741fb8..ede997a 100644 (file)
 #define IDC_RADIO_POS                   1379
 #define IDC_EDIT_POS                    1380
 #define IDC_SPIN_POS                    1382
+#define IDC_CHECK_UNMANAGED             1383
+#define IDC_CHECK_ICMP                  1386
 #define IDR_WEB_BROWSER                 8100
 #define IDR_SYSLOG_BROWSER              8101
 #define IDR_LPP_EDITOR                  8102
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        334
 #define _APS_NEXT_COMMAND_VALUE         33039
-#define _APS_NEXT_CONTROL_VALUE         1383
+#define _APS_NEXT_CONTROL_VALUE         1388
 #define _APS_NEXT_SYMED_VALUE           128
 #endif
 #endif