Minor changes
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 29 Jul 2004 12:00:05 +0000 (12:00 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 29 Jul 2004 12:00:05 +0000 (12:00 +0000)
.gitattributes
images/network.png [new file with mode: 0644]
src/console/win32/nxcon.clw
src/console/win32/nxcon.dsp
src/console/win32/nxcon.rc
src/console/win32/resource.h

index a8439a0..d456f78 100644 (file)
@@ -17,6 +17,7 @@ doc/Makefile.am -text
 doc/internals.rtf -text
 images/generic_printer.png -text svneol=unset#application/octet-stream
 images/interface.png -text svneol=unset#application/octet-stream
+images/network.png -text svneol=unset#application/octet-stream
 images/node_group.png -text svneol=unset#application/octet-stream
 include/Makefile.am -text
 include/getopt.h -text
diff --git a/images/network.png b/images/network.png
new file mode 100644 (file)
index 0000000..f1ad755
--- /dev/null
@@ -0,0 +1 @@
+\89PNG
index fcd656b..6c39b56 100644 (file)
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CEventSelDlg
+LastClass=CRequestProcessingDlg
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
@@ -16,9 +16,9 @@ Class7=CEventBrowser
 Class9=CMapView
 
 ResourceCount=60
-Resource1=IDA_MDI_DEFAULT (English (U.S.))
+Resource1=IDD_USER_PROPERTIES (English (U.S.))
 Resource2=IDD_LOGIN
-Resource3=IDD_SET_PASSWORD (English (U.S.))
+Resource3=IDD_OBJECT_SECURITY (English (U.S.))
 Resource4=IDM_CONTEXT
 Resource5=IDD_OBJECT_GENERAL
 Class2=CChildView
@@ -30,10 +30,10 @@ Resource6=IDD_MIB_BROWSER
 Class11=CProgressDialog
 Resource7=IDD_EDIT_RULE_COMMENT
 Class12=CObjectBrowser
-Resource8=IDD_THRESHOLD (English (U.S.))
+Resource8=IDD_REQUEST_PROCESSING (English (U.S.))
 Class13=CObjectPropDlg
-Resource9=IDD_USER_PROPERTIES (English (U.S.))
-Resource10=IDD_OBJECT_GENERAL (English (U.S.))
+Resource9=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource10=IDR_MAINFRAME (English (U.S.))
 Resource11=IDM_VIEW_SPECIFIC (English (U.S.))
 Resource12=IDR_CTRLPANEL (English (U.S.))
 Resource13=IDR_EVENTS (English (U.S.))
@@ -42,21 +42,21 @@ Resource15=IDR_OBJECTS (English (U.S.))
 Resource16=IDD_DUMMY (English (U.S.))
 Class14=CEventEditor
 Class15=CEditEventDlg
-Resource17=IDD_SELECT_OBJECT (English (U.S.))
+Resource17=IDD_MIB_BROWSER (English (U.S.))
 Class16=CDebugFrame
-Resource18=IDD_NEW_USER (English (U.S.))
+Resource18=IDA_EPP (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
 Resource20=IDD_DCI_COLLECTION
 Class17=CObjectPreview
-Resource21=IDA_EPP (English (U.S.))
+Resource21=IDD_SET_PASSWORD (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_OBJECT_CAPS (English (U.S.))
+Resource22=IDD_SELECT_OBJECT (English (U.S.))
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
-Resource23=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource23=IDD_OBJECT_CAPS (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
 Resource24=IDD_ABOUTBOX
@@ -64,11 +64,11 @@ Class26=CRequestProcessingDlg
 Resource25=IDM_CONTEXT (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
 Resource27=IDD_DCI_THRESHOLDS
-Resource28=IDR_MAINFRAME (English (U.S.))
+Resource28=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Class27=CObjectPropsGeneral
-Resource29=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource29=IDD_EDIT_EVENT (English (U.S.))
 Class28=CObjectPropsSecurity
-Resource30=IDD_OBJECT_SECURITY (English (U.S.))
+Resource30=IDA_MDI_DEFAULT (English (U.S.))
 Resource31=IDD_OBJECT_NODE_GENERAL
 Resource32=IDD_THRESHOLD
 Class29=CUserSelectDlg
@@ -79,30 +79,30 @@ Class31=CNewUserDlg
 Resource35=IDR_MAINFRAME
 Resource36=IDD_SELECT_OBJECT
 Class32=CUserPropDlg
-Resource37=IDD_MIB_BROWSER (English (U.S.))
+Resource37=IDD_OBJECT_GENERAL (English (U.S.))
 Resource38=IDD_NEW_USER
 Class33=CGroupPropDlg
 Resource39=IDA_OBJECT_BROWSER
 Resource40=IDD_EDIT_EVENT
 Resource41=IDA_MDI_DEFAULT
-Resource42=IDD_ABOUTBOX (English (U.S.))
+Resource42=IDD_DCI_COLLECTION (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
 Class36=CNetSummaryFrame
 Class37=CDataCollectionEditor
-Resource43=IDD_LOGIN (English (U.S.))
+Resource43=IDD_NEW_USER (English (U.S.))
 Class38=CDCIPropPage
-Resource44=IDA_OBJECT_BROWSER (English (U.S.))
+Resource44=IDD_GROUP_PROPERTIES (English (U.S.))
 Class39=CDCIDataView
-Resource45=IDD_EDIT_RULE_COMMENT (English (U.S.))
+Resource45=IDD_SELECT_USER (English (U.S.))
 Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
-Resource46=IDD_SELECT_USER (English (U.S.))
+Resource46=IDA_OBJECT_BROWSER (English (U.S.))
 Resource47=IDD_SET_PASSWORD
 Resource48=IDD_OBJECT_CAPS
 Class43=CThresholdDlg
-Resource49=IDD_DCI_COLLECTION (English (U.S.))
+Resource49=IDD_OBJECT_NODE_GENERAL (English (U.S.))
 Resource50=IDD_GROUP_PROPERTIES
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
@@ -117,9 +117,9 @@ Class49=CRuleCommentDlg
 Resource55=IDD_SELECT_USER
 Class50=CEventSelDlg
 Resource56=IDD_SELECT_EVENT
-Resource57=IDD_REQUEST_PROCESSING (English (U.S.))
-Resource58=IDD_GROUP_PROPERTIES (English (U.S.))
-Resource59=IDD_EDIT_EVENT (English (U.S.))
+Resource57=IDD_ABOUTBOX (English (U.S.))
+Resource58=IDD_LOGIN (English (U.S.))
+Resource59=IDD_THRESHOLD (English (U.S.))
 Resource60=IDD_SELECT_EVENT (English (U.S.))
 
 [CLS:CConsoleApp]
@@ -838,7 +838,7 @@ Control1=IDC_LIST_CAPS,SysListView32,1342275613
 Type=1
 Class=CRequestProcessingDlg
 ControlCount=2
-Control1=IDC_STATIC,static,1342177283
+Control1=IDC_BITMAP,static,1342177283
 Control2=IDC_INFO_TEXT,static,1342308352
 
 [DLG:IDD_OBJECT_GENERAL (English (U.S.))]
index fa09362..d896214 100644 (file)
@@ -549,6 +549,14 @@ SOURCE=.\icons\NetMap.ICO
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\network.BMP
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\network.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\icons\node.ico
 # End Source File
 # Begin Source File
index dfa7282..4d19fd9 100644 (file)
@@ -83,6 +83,7 @@ IDI_USER                ICON    DISCARDABLE     "icons\\user.ico"
 IDI_EVERYONE            ICON    DISCARDABLE     "icons\\EARTH.ICO"
 IDI_PASSWORD            ICON    DISCARDABLE     "icons\\passwd.ico"
 IDI_GRAPH               ICON    DISCARDABLE     "icons\\graph.ico"
+IDI_NETWORK             ICON    DISCARDABLE     "icons\\network.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -542,7 +543,7 @@ IDD_REQUEST_PROCESSING DIALOG DISCARDABLE  0, 0, 230, 38
 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDI_SETUP,IDC_STATIC,7,7,21,20
+    ICON            IDI_NETWORK,IDC_BITMAP,7,8,20,20
     LTEXT           "Processing request...",IDC_INFO_TEXT,35,15,188,8
 END
 
index dfb862e..29fef21 100644 (file)
@@ -87,6 +87,7 @@
 #define IDA_EPP                         188
 #define IDD_EDIT_RULE_COMMENT           189
 #define IDD_SELECT_EVENT                190
+#define IDI_NETWORK                     192
 #define IDC_EDIT_SERVER                 1000
 #define IDC_EDIT_LOGIN                  1001
 #define IDC_EDIT_PASSWORD               1002
 #define IDC_STATIC_ACCESS               1102
 #define IDC_STATIC_TYPE                 1103
 #define IDC_EDIT_TEXT                   1104
+#define IDC_BITMAP                      1105
 #define ID_VIEW_CONTROLPANEL            32771
 #define ID_VIEW_EVENTS                  32774
 #define ID_VIEW_MAP                     32776
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        191
+#define _APS_NEXT_RESOURCE_VALUE        193
 #define _APS_NEXT_COMMAND_VALUE         32864
-#define _APS_NEXT_CONTROL_VALUE         1105
+#define _APS_NEXT_CONTROL_VALUE         1106
 #define _APS_NEXT_SYMED_VALUE           119
 #endif
 #endif