* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */
Info
Revision:3408
Author:victor
Date:2008-08-07 12:56:59 +0300 (Thu, 07 Aug 2008)
Comment:minor changes and fixes
Changes
U trunk/src/client/console/libnxmc/objseldlg.cpp
U trunk/src/console/win32/MapManager.cpp
U trunk/src/console/win32/MapManager.h
U trunk/src/console/win32/nxcon.clw
U trunk/src/console/win32/nxcon.rc
U trunk/src/console/win32/resource.h
U trunk/src/server/core/node.cpp
Diff
Modified: trunk/src/client/console/libnxmc/objseldlg.cpp
===================================================================
--- trunk/src/client/console/libnxmc/objseldlg.cpp 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/client/console/libnxmc/objseldlg.cpp 2008-08-07 09:56:59 UTC (rev 3408)
@@ -96,7 +96,7 @@
bool nxObjectSelDlg::TransferDataToWindow(void)
{
wxListCtrl *wndListCtrl;
- int width;
+// int width;
DWORD i, numObjects;
NXC_OBJECT_INDEX *index;
long item;
Modified: trunk/src/console/win32/MapManager.cpp
===================================================================
--- trunk/src/console/win32/MapManager.cpp 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/console/win32/MapManager.cpp 2008-08-07 09:56:59 UTC (rev 3408)
@@ -37,6 +37,8 @@
ON_COMMAND(ID_MAP_DELETE, OnMapDelete)
ON_UPDATE_COMMAND_UI(ID_MAP_DELETE, OnUpdateMapDelete)
ON_WM_CONTEXTMENU()
+ ON_COMMAND(ID_MAP_RENAME, OnMapRename)
+ ON_UPDATE_COMMAND_UI(ID_MAP_RENAME, OnUpdateMapRename)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -65,7 +67,7 @@
return -1;
GetClientRect(&rect);
- m_wndListCtrl.Create(WS_CHILD | WS_VISIBLE | LVS_REPORT, rect, this, ID_LIST_VIEW);
+ m_wndListCtrl.Create(WS_CHILD | WS_VISIBLE | LVS_REPORT | LVS_EDITLABELS, rect, this, ID_LIST_VIEW);
m_wndListCtrl.InsertColumn(0, _T("ID"), LVCFMT_LEFT, 60);
m_wndListCtrl.InsertColumn(1, _T("Name"), LVCFMT_LEFT, 150);
m_wndListCtrl.InsertColumn(2, _T("Root object"), LVCFMT_LEFT, 150);
@@ -228,3 +230,21 @@
pMenu = theApp.GetContextMenu(30);
pMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, this, NULL);
}
+
+
+//
+// Map -> Rename menu handler
+//
+
+void CMapManager::OnMapRename()
+{
+ if (m_wndListCtrl.GetSelectedCount() != 1)
+ return;
+
+// m_wndListCtrl.EditLabel(m_wndListCtrl.GetSelectionMark());
+}
+
+void CMapManager::OnUpdateMapRename(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(m_wndListCtrl.GetSelectedCount() == 1);
+}
Modified: trunk/src/console/win32/MapManager.h
===================================================================
--- trunk/src/console/win32/MapManager.h 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/console/win32/MapManager.h 2008-08-07 09:56:59 UTC (rev 3408)
@@ -45,6 +45,8 @@
afx_msg void OnMapDelete();
afx_msg void OnUpdateMapDelete(CCmdUI* pCmdUI);
afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
+ afx_msg void OnMapRename();
+ afx_msg void OnUpdateMapRename(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
Modified: trunk/src/console/win32/nxcon.clw
===================================================================
--- trunk/src/console/win32/nxcon.clw 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/console/win32/nxcon.clw 2008-08-07 09:56:59 UTC (rev 3408)
@@ -17,20 +17,20 @@
ResourceCount=258
Resource1=IDD_EDIT_TRAP (English (U.S.))
-Resource2=IDR_MAINFRAME
+Resource2=IDM_CONTEXT
Resource3=IDD_EDIT_RULE_SCRIPT (English (U.S.))
-Resource4=IDD_DISCOVERY_COMMUNITIES
-Resource5=IDD_EDIT_RULE_SEVERITY
+Resource4=IDD_OBJECT_PRESENTATION
+Resource5=IDD_DISCOVERY_GENERAL
Class2=CChildView
Class5=CAboutDlg
Class6=CControlPanel
Class8=CMapFrame
Class10=CLoginDialog
-Resource6=IDA_SCRIPT_MANAGER
+Resource6=IDD_GRAPH_PROP_SETTINGS
Class11=CProgressDialog
-Resource7=IDD_LASTVAL_PROP
+Resource7=IDD_EDIT_RULE_SITUATION
Class12=CAddrEntryDlg
-Resource8=IDA_GRAPH
+Resource8=IDD_SELECT_AGENT_PARAM
Class13=CObjectPropDlg
Resource9=IDD_ACTION_PROPERTIES (English (U.S.))
Resource10=IDA_AGENT_CFG_EDITOR (English (U.S.))
@@ -46,45 +46,45 @@
Class16=CDebugFrame
Resource18=IDA_EPP (English (U.S.))
Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDA_NODE_POLLER
+Resource20=IDD_CREATE_VPNC
Class17=CObjectPreview
Resource21=IDA_TRAP_EDITOR (English (U.S.))
Class18=CToolBox
Class19=CObjectInfoBox
Class20=CObjectSearchBox
-Resource22=IDA_NETMAP
+Resource22=IDD_DATA_QUERY
Class21=CEditBox
Class22=COPGeneral
Class23=CNodePropsGeneral
Resource23=IDD_GRAPH_PROPERTIES (English (U.S.))
Class24=CObjectPropCaps
Class25=CObjectPropSheet
-Resource24=IDD_DCI_COLLECTION
+Resource24=IDD_CREATE_CONDITION
Class26=CRequestProcessingDlg
Resource25=IDD_CREATE_IF_DCI (English (U.S.))
Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDA_SERVER_CFG_EDITOR
+Resource27=IDD_OBJECT_NETSRV_GENERAL
Resource28=IDD_THRESHOLD (English (U.S.))
Class27=CObjectPropsGeneral
Resource29=IDD_OBJTOOL_OPTIONS (English (U.S.))
Class28=CObjectPropsSecurity
Resource30=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
-Resource31=IDD_OBJECT_CAPS
-Resource32=IDD_DEFINE_GRAPH
+Resource31=IDD_OBJTOOL_GENERAL
+Resource32=IDD_SET_PASSWORD
Class29=CUserSelectDlg
-Resource33=IDA_AGENT_CFG_EDITOR
+Resource33=IDD_OBJECT_NODE_POLL
Class30=CUserEditor
Resource34=IDD_DCI_PROPERTIES
Class31=CNewUserDlg
-Resource35=IDD_NEW_USER
-Resource36=IDD_CREATE_TG
+Resource35=IDD_OBJTOOL_COLUMNS
+Resource36=IDD_OBJECT_CLUSTER_GENERAL
Class32=CUserPropDlg
Resource37=IDD_SELECT_USER (English (U.S.))
-Resource38=IDD_OBJECT_VPNC_GENERAL
+Resource38=IDR_MAINFRAME
Class33=CGroupPropDlg
-Resource39=IDD_SELECT_INTERNAL_ITEM
-Resource40=IDD_DCI_DATA_EXPORT
-Resource41=IDD_DISCOVERY_TARGETS
+Resource39=IDD_MANAGE_GRAPHS
+Resource40=IDD_OBJECT_TRUSTED_NODES
+Resource41=IDA_MAP_MANAGER
Resource42=IDD_MIB_BROWSER (English (U.S.))
Class34=CPasswordChangeDlg
Class35=CNodeSummary
@@ -99,56 +99,56 @@
Class41=CGraphFrame
Class42=CDCIThresholdsPage
Resource46=IDD_DISCOVERY_RANGES (English (U.S.))
-Resource47=IDD_DESKTOP_SAVE_AS
-Resource48=IDD_EDIT_TRAP_ARG
+Resource47=IDD_DISCOVERY_COMMUNITIES
+Resource48=IDD_DEFINE_GRAPH
Class43=CThresholdDlg
Resource49=IDD_EDIT_EVENT (English (U.S.))
-Resource50=IDD_GRAPH_PROP_STYLES
+Resource50=IDD_DCI_THRESHOLDS
Class44=CMIBBrowserDlg
Class45=CEventPolicyEditor
Class46=CRuleList
Class47=CRuleHeader
Resource51=IDD_OBJECT_IF_GENERAL (English (U.S.))
-Resource52=IDD_MAP_LINK
+Resource52=IDD_EDIT_RULE_COMMENT
Class48=CObjectSelDlg
-Resource53=IDA_ACTION_EDITOR
-Resource54=IDD_CREATE_CLUSTER
+Resource53=IDD_EDIT_TRAP_ARG
+Resource54=IDD_OBJECT_SECURITY
Class49=CRuleCommentDlg
-Resource55=IDD_OBJECT_SECURITY
+Resource55=IDD_CHANGE_IP
Class50=CEventSelDlg
-Resource56=IDD_DISCOVERY_RANGES
+Resource56=IDD_ABOUTBOX
Resource57=IDD_COND_DCI_PROP (English (U.S.))
-Resource58=IDD_REQUEST_PROCESSING
+Resource58=IDD_NEW_OBJECT_TOOL
Resource59=IDD_GROUP_PROPERTIES (English (U.S.))
Resource60=IDD_DISCOVERY_GENERAL (English (U.S.))
Class51=CObjectPropsPresentation
Resource61=IDD_SET_PASSWORD (English (U.S.))
-Resource62=IDD_SELECT_USER
+Resource62=IDD_REMOVE_TEMPLATE
Class52=CRuleSeverityDlg
-Resource63=IDD_SELECT_MAP
+Resource63=IDD_ACTION_PROPERTIES
Class53=CRuleAlarmDlg
Class54=CAlarmBrowser
Resource64=IDD_CHANGE_IP (English (U.S.))
-Resource65=IDD_MIB_BROWSER
+Resource65=IDD_OBJECT_COND_DATA
Resource66=IDD_DCI_THRESHOLDS (English (U.S.))
Resource67=IDD_GRAPH_PROP_SETTINGS (English (U.S.))
Resource68=IDD_CREATE_VPNC (English (U.S.))
Class55=CConsolePropsGeneral
Class56=CActionEditor
-Resource69=IDA_EPP
-Resource70=IDD_NEW_OBJECT_TOOL
+Resource69=IDD_CREATE_TG
+Resource70=IDA_EVENT_EDITOR
Class57=CNewActionDlg
-Resource71=IDA_ALARM_BROWSER
+Resource71=IDD_CREATE_TEMPLATE
Class58=CEditActionDlg
-Resource72=IDD_SELECT_MP
+Resource72=IDD_OBJECT_CAPS
Class59=CActionSelDlg
-Resource73=IDD_SELECT_OBJECT
+Resource73=IDD_ADD_DCI
Resource74=IDD_OBJECT_COND_SCRIPT (English (U.S.))
Resource75=IDD_EDIT_TRAP_ARG (English (U.S.))
-Resource76=IDD_ABOUTBOX
+Resource76=IDD_SAVE_AGENT_CFG
Class60=CCreateObjectDlg
Class61=CCreateContainerDlg
-Resource77=IDD_OBJECT_TRUSTED_NODES
+Resource77=IDD_NEW_ACTION
Class62=CCreateNodeDlg
Resource78=IDA_CERT_MANAGER (English (U.S.))
Resource79=IDT_MAP (English (U.S.))
@@ -158,31 +158,31 @@
Class64=CPollNodeDlg
Resource82=IDD_POLL_NODE (English (U.S.))
Class65=CNodePoller
-Resource83=IDD_CLUSTER_RESOURCE
-Resource84=IDD_SUBMAP_BKGND
+Resource83=IDD_USER_PROPERTIES
+Resource84=IDA_SERVER_CFG_EDITOR
Class66=CCreateTemplateDlg
Class67=CCreateTGDlg
-Resource85=IDD_MANAGE_GRAPHS
-Resource86=IDD_CREATE_IF_DCI
+Resource85=IDD_DCI_COLLECTION
+Resource86=IDD_SELECT_OBJECT
Class68=CTrapEditor
-Resource87=IDD_GROUP_PROPERTIES
-Resource88=IDA_MAP_MANAGER
-Resource89=IDA_LAST_VALUES
+Resource87=IDD_SUBMAP_BKGND
+Resource88=IDD_EDIT_IP_SUBNET
+Resource89=IDD_CREATE_NETSRV
Class69=CDataQueryDlg
-Resource90=IDD_OBJECT_COND_GENERAL
+Resource90=IDA_OBJECT_TOOLS_EDITOR
Class70=CTrapEditDlg
Resource91=IDD_SET_CHILD_MGMT_STATUS (English (U.S.))
Class71=CTrapParamDlg
-Resource92=IDD_OBJECT_PRESENTATION
-Resource93=IDD_OBJTOOL_OPTIONS
+Resource92=IDD_EDIT_RULE_SCRIPT
+Resource93=IDA_ACTION_EDITOR
Class72=CGraphPropDlg
Class73=CColorSelector
Class74=CPackageMgr
-Resource94=IDD_REMOVE_TEMPLATE
+Resource94=IDA_GRAPH
Resource95=IDD_IMPORT_CA_CERT (English (U.S.))
Resource96=IDD_SUBMAP_BKGND (English (U.S.))
Resource97=IDD_DISCOVERY_TARGETS (English (U.S.))
-Resource98=IDD_INPUT_BOX
+Resource98=IDD_IMPORT_CA_CERT
Resource99=IDA_NODE_POLLER (English (U.S.))
Resource100=IDD_CREATE_MP (English (U.S.))
Resource101=IDM_VIEW_SPECIFIC (English (U.S.))
@@ -244,7 +244,7 @@
Class103=CWebBrowser
Class104=CSyslogBrowser
Class105=CLPPList
-Resource129=IDD_SET_PASSWORD
+Resource129=IDD_CHANGE_PASSWORD
Class106=CDCISchedulePage
Resource130=IDD_FATAL_ERROR (English (U.S.))
Class107=CObjectPropsStatus
@@ -270,113 +270,113 @@
Resource138=IDD_MANAGE_GRAPHS (English (U.S.))
Class120=CSubmapBkgndDlg
Resource139=IDD_USER_PROPERTIES (English (U.S.))
-Resource140=IDD_DCI_SCHEDULE
-Resource141=IDD_THRESHOLD
-Resource142=IDD_CP_GENERAL
-Resource143=IDD_SNMP_WALK
-Resource144=IDA_CERT_MANAGER
-Resource145=IDD_CHANGE_IP
-Resource146=IDD_EDIT_IP_SUBNET
-Resource147=IDD_SELECT_TRAP
-Resource148=IDD_SET_CHILD_MGMT_STATUS
-Resource149=IDD_CREATE_NETMAP
-Resource150=IDD_EDIT_RULE_ALARM
-Resource151=IDD_IMPORT_CA_CERT
-Resource152=IDA_AGENT_CONFIG_MANAGER
-Resource153=IDD_SAVE_AGENT_CFG
-Resource154=IDD_SELECT_EVENT
-Resource155=IDD_EDIT_RULE_SITUATION
-Resource156=IDA_OBJECT_BROWSER
-Resource157=IDD_EDIT_RULE_SCRIPT
-Resource158=IDD_FATAL_ERROR
-Resource159=IDA_OBJECT_TOOLS_EDITOR
-Resource160=IDD_EDIT_EVENT
-Resource161=IDA_PACKAGE_MGR
-Resource162=IDD_SELECT_SITUATION
+Resource140=IDA_EPP
+Resource141=IDD_OBJECT_COND_SCRIPT
+Resource142=IDD_DISCOVERY_RANGES
+Resource143=IDA_LAST_VALUES
+Resource144=IDD_EDIT_VARIABLE
+Resource145=IDA_TRAP_EDITOR
+Resource146=IDA_MDI_DEFAULT
+Resource147=IDD_REQUEST_PROCESSING
+Resource148=IDD_MIB_BROWSER
+Resource149=IDD_SELECT_ACTION
+Resource150=IDD_DISCOVERY_TARGETS
+Resource151=IDD_THRESHOLD
+Resource152=IDD_LASTVAL_PROP
+Resource153=IDA_OBJECT_BROWSER
+Resource154=IDD_AGENT_CONFIG
+Resource155=IDD_CP_GENERAL
+Resource156=IDD_DCI_TRANSFORM
+Resource157=IDA_NODE_POLLER
+Resource158=IDD_GROUP_PROPERTIES
+Resource159=IDD_DESKTOP_SAVE_AS
+Resource160=IDD_DCI_SCHEDULE
+Resource161=IDD_INPUT_BOX
+Resource162=IDD_EDIT_RULE_ALARM
Resource163=IDM_VIEW_SPECIFIC
-Resource164=IDD_CREATE_CONTAINER
-Resource165=IDD_OBJECT_CLUSTER_RESOURCES
-Resource166=IDD_DCI_THRESHOLDS
-Resource167=IDD_OBJECT_RELATIONS
-Resource168=IDA_TRAP_EDITOR
-Resource169=IDD_CREATE_CONDITION
-Resource170=IDD_ADD_DCI
-Resource171=IDD_OBJTOOL_GENERAL
+Resource164=IDD_SELECT_TRAP
+Resource165=IDD_NEW_USER
+Resource166=IDD_OBJECT_COND_GENERAL
+Resource167=IDD_OBJECT_IF_GENERAL
+Resource168=IDD_SELECT_INTERNAL_ITEM
+Resource169=IDA_DC_EDITOR
+Resource170=IDA_AGENT_CONFIG_MANAGER
+Resource171=IDA_NETMAP
Class121=CModuleManager
Class122=CDesktopManager
-Resource172=IDD_OBJECT_STATUS
-Resource173=IDA_DC_EDITOR
+Resource172=IDA_ALARM_BROWSER
+Resource173=IDD_OBJECT_RELATIONS
Class123=CCreateCondDlg
Class124=CCondPropsGeneral
Class125=CCondPropsScript
Class126=CCondPropsData
-Resource174=IDD_NEW_ACTION
+Resource174=IDD_ADDR_ENTRY
Class127=CAddDCIDlg
-Resource175=IDD_OBJTOOL_COLUMNS
+Resource175=IDA_PACKAGE_MGR
Class128=CCondDCIPropDlg
-Resource176=IDD_SELECT_AGENT_PARAM
+Resource176=IDD_GRAPH_PROP_STYLES
Class129=CAgentConfigMgr
-Resource177=IDD_OBJECT_CLUSTER_GENERAL
-Resource178=IDD_ADDR_ENTRY
+Resource177=IDD_SELECT_USER
+Resource178=IDD_EDIT_EVENT
Class130=CAgentCfgDlg
Class131=CObjectCommentsEditor
-Resource179=IDA_DATA_VIEW
+Resource179=IDD_GRAPH_PROP_DATA
Class132=CRuleScriptDlg
Class133=CDetailsView
-Resource180=IDD_OBJECT_NODE_GENERAL
+Resource180=IDD_OBJECT_STATUS
Class134=CDiscoveryPropGeneral
-Resource181=IDD_EDIT_TRAP
+Resource181=IDD_FATAL_ERROR
Class135=CDiscoveryPropTargets
-Resource182=IDD_CREATE_TEMPLATE
+Resource182=IDD_OBJECT_CLUSTER_RESOURCES
Class136=CDiscoveryPropAddrList
-Resource183=IDD_CREATE_NETSRV
+Resource183=IDD_SET_CHILD_MGMT_STATUS
Class138=CObjectView
Class139=CObjectOverview
Class140=CAlarmView
Class141=CObjectDepView
-Resource184=IDA_OBJECT_COMMENTS
+Resource184=IDD_DCI_DATA_EXPORT
Class137=CObjectBrowser
Class142=CCreateMPDlg
-Resource185=IDD_OBJECT_NODE_POLL
+Resource185=IDD_MAP_LINK
Class143=CSelectMPDlg
-Resource186=IDD_ACTION_PROPERTIES
+Resource186=IDD_CREATE_MP
Class144=CTrapSelDlg
-Resource187=IDA_MDI_DEFAULT
+Resource187=IDD_CREATE_NODE
Class145=CConsoleUpgradeDlg
-Resource188=IDD_DATA_QUERY
+Resource188=IDD_CLUSTER_RESOURCE
Class146=CCreateClusterDlg
-Resource189=IDD_OBJECT_COND_DATA
+Resource189=IDA_DATA_VIEW
Class147=CClusterPropsGeneral
-Resource190=IDD_AGENT_CONFIG
+Resource190=IDA_CERT_MANAGER
Class148=CClusterPropsResources
-Resource191=IDD_CHANGE_PASSWORD
+Resource191=IDA_AGENT_CFG_EDITOR
Class149=CClusterResDlg
-Resource192=IDD_OBJECT_GENERAL
+Resource192=IDD_OBJTOOL_OPTIONS
Class150=CClusterView
Class151=CExtEditCtrl
-Resource193=IDD_SELECT_ACTION
+Resource193=IDD_SELECT_MP
Class152=CFatalErrorDlg
-Resource194=IDM_CONTEXT
+Resource194=IDD_CREATE_CONTAINER
Class153=CDefineGraphDlg
-Resource195=IDD_CREATE_NODE
+Resource195=IDD_UPGRADE
Class154=CGraphManagerDlg
-Resource196=IDD_COND_DCI_PROP
+Resource196=IDA_OBJECT_COMMENTS
Class155=CGraphStylePage
Class156=CNodePerfView
Class157=CCertManager
-Resource197=IDD_USER_PROPERTIES
+Resource197=IDD_SNMP_WALK
Class158=CImportCertDlg
-Resource198=IDD_OBJECT_NETSRV_GENERAL
+Resource198=IDD_CREATE_IF_DCI
Class159=CNodeTopologyView
Class160=CObjectStatusBar
Class161=CObjectTree
-Resource199=IDA_EVENT_EDITOR
+Resource199=IDD_EDIT_TRAP
Class162=CChildMgmtStatusDlg
-Resource200=IDD_DCI_TRANSFORM
+Resource200=IDD_CREATE_CLUSTER
Class163=CCreateIfDCIDlg
Class164=CNodeLastValuesView
Class165=CObjectSubordinateView
-Resource201=IDD_CREATE_MP
+Resource201=IDD_OBJECT_NODE_GENERAL
Class166=CMapLinkPropDlg
Resource202=IDD_INPUT_BOX (English (U.S.))
Resource203=IDD_EDIT_RULE_SEVERITY (English (U.S.))
@@ -430,21 +430,21 @@
Resource245=IDD_UPGRADE (English (U.S.))
Class173=CObjectPropsTrustedNodes
Resource246=IDD_OBJECT_TRUSTED_NODES (English (U.S.))
-Resource247=IDD_CREATE_VPNC
-Resource248=IDD_OBJECT_IF_GENERAL
-Resource249=IDD_DISCOVERY_GENERAL
-Resource250=IDD_GRAPH_PROP_SETTINGS
-Resource251=IDD_GRAPH_PROP_DATA
-Resource252=IDA_SITUATION_MANAGER
-Resource253=IDD_EDIT_RULE_OPTIONS
-Resource254=IDD_EDIT_VARIABLE
+Resource247=IDD_CREATE_NETMAP
+Resource248=IDD_SELECT_EVENT
+Resource249=IDA_SITUATION_MANAGER
+Resource250=IDD_EDIT_RULE_OPTIONS
+Resource251=IDD_SELECT_SITUATION
+Resource252=IDD_OBJECT_VPNC_GENERAL
+Resource253=IDD_EDIT_RULE_SEVERITY
+Resource254=IDD_SELECT_MAP
Class174=CMapSelDlg
Class175=CMapManager
-Resource255=IDD_OBJECT_COND_SCRIPT
-Resource256=IDD_EDIT_RULE_COMMENT
+Resource255=IDA_SCRIPT_MANAGER
+Resource256=IDD_COND_DCI_PROP
Class176=CCreateNetMapDlg
Class177=CObjectTreeCtrl
-Resource257=IDD_UPGRADE
+Resource257=IDD_OBJECT_GENERAL
Class178=CObjectPropsCustomAttrs
Resource258=IDD_OBJECT_CUSTOM_ATTRS
@@ -1060,8 +1060,9 @@
Command214=ID_SITUATION_DELETE
Command215=ID_SITUATION_CREATEINSTANCE
Command216=ID_MAP_CREATE
-Command217=ID_MAP_DELETE
-CommandCount=217
+Command217=ID_MAP_RENAME
+Command218=ID_MAP_DELETE
+CommandCount=218
[ACL:IDA_MDI_DEFAULT]
Type=1
@@ -2054,8 +2055,9 @@
Command206=ID_SITUATION_DELETE
Command207=ID_SITUATION_CREATEINSTANCE
Command208=ID_MAP_CREATE
-Command209=ID_MAP_DELETE
-CommandCount=209
+Command209=ID_MAP_RENAME
+Command210=ID_MAP_DELETE
+CommandCount=210
[MNU:IDM_CONTEXT (English (U.S.))]
Type=1
Modified: trunk/src/console/win32/nxcon.rc
===================================================================
--- trunk/src/console/win32/nxcon.rc 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/console/win32/nxcon.rc 2008-08-07 09:56:59 UTC (rev 3408)
@@ -652,6 +652,7 @@
POPUP "Map"
BEGIN
MENUITEM "&Create...\tIns", ID_MAP_CREATE
+ MENUITEM "&Rename", ID_MAP_RENAME
MENUITEM "&Delete\tDel", ID_MAP_DELETE
END
END
@@ -1076,6 +1077,7 @@
POPUP "Map"
BEGIN
MENUITEM "&Create...", ID_MAP_CREATE
+ MENUITEM "&Rename", ID_MAP_RENAME
MENUITEM "&Delete", ID_MAP_DELETE
END
END
Modified: trunk/src/console/win32/resource.h
===================================================================
--- trunk/src/console/win32/resource.h 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/console/win32/resource.h 2008-08-07 09:56:59 UTC (rev 3408)
@@ -976,6 +976,7 @@
#define ID_MAP_CREATE 33096
#define ID_MAP_DELETE 33097
#define ID_MAP_ENSUREVISIBLE 33100
+#define ID_MAP_RENAME 33101
#define ID_ALWAYS_DISABLED 43210
#define IDS_GETFOLDERPATH_FAILED 61216
#define IDS_WORKDIR_CREATION_FAILED 61217
@@ -987,7 +988,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 390
-#define _APS_NEXT_COMMAND_VALUE 33101
+#define _APS_NEXT_COMMAND_VALUE 33102
#define _APS_NEXT_CONTROL_VALUE 1532
#define _APS_NEXT_SYMED_VALUE 135
#endif
Modified: trunk/src/server/core/node.cpp
===================================================================
--- trunk/src/server/core/node.cpp 2008-08-07 09:24:40 UTC (rev 3407)
+++ trunk/src/server/core/node.cpp 2008-08-07 09:56:59 UTC (rev 3408)
@@ -3070,7 +3070,7 @@
}
// Check if subnet mask is correct on interface
- if (pSubnet->IpNetMask() != pIfList->pInterfaces[i].dwIpNetMask)
+ if ((pSubnet != NULL) && (pSubnet->IpNetMask() != pIfList->pInterfaces[i].dwIpNetMask))
{
PostEvent(EVENT_INCORRECT_NETMASK, m_dwId, "idsaa", pInterface->Id(),
pInterface->IfIndex(), pInterface->Name(),
Received on Thu Aug 07 2008 - 12:56:59 EEST
This archive was generated by hypermail 2.2.0 : Thu Aug 07 2008 - 12:54:09 EEST