Cosmetic changes
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 23 Sep 2004 07:29:59 +0000 (07:29 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 23 Sep 2004 07:29:59 +0000 (07:29 +0000)
.gitattributes
src/console/win32/DataCollectionEditor.cpp
src/console/win32/DataCollectionEditor.h
src/console/win32/icons/active.ico [new file with mode: 0644]
src/console/win32/icons/disabled.ico [new file with mode: 0644]
src/console/win32/icons/unsupported.ico [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 e4342d2..6b37fd7 100644 (file)
@@ -228,8 +228,10 @@ src/console/win32/icons/SeverityMinor.ico -text
 src/console/win32/icons/SeverityNormal.ico -text
 src/console/win32/icons/SeverityWarning.ico -text
 src/console/win32/icons/ack.ico -text
+src/console/win32/icons/active.ico -text
 src/console/win32/icons/alarm.ico -text
 src/console/win32/icons/connect.ico -text
+src/console/win32/icons/disabled.ico -text
 src/console/win32/icons/e-mail.ico -text
 src/console/win32/icons/exec.ico -text
 src/console/win32/icons/graph.ico -text
@@ -242,6 +244,7 @@ src/console/win32/icons/sms.ico -text
 src/console/win32/icons/sort_up.ico -text
 src/console/win32/icons/sortdown.ico -text
 src/console/win32/icons/tree.ico -text
+src/console/win32/icons/unsupported.ico -text
 src/console/win32/icons/user.ico -text
 src/console/win32/icons/users.ico -text
 src/console/win32/nxcon.clw -text
index e8d685e..fcf1771 100644 (file)
@@ -76,12 +76,19 @@ int CDataCollectionEditor::OnCreate(LPCREATESTRUCT lpCreateStruct)
    if (m_pItemList == NULL)
       return -1;
 
+   // Create image list
+   m_imageList.Create(16, 16, ILC_COLOR24 | ILC_MASK, 4, 1);
+   m_imageList.Add(theApp.LoadIcon(IDI_ACTIVE));
+   m_imageList.Add(theApp.LoadIcon(IDI_DISABLED));
+   m_imageList.Add(theApp.LoadIcon(IDI_UNSUPPORTED));
+
    // Create list view control
    GetClientRect(&rect);
    m_wndListCtrl.Create(WS_CHILD | WS_VISIBLE | LVS_REPORT, rect, this, IDC_LIST_VIEW);
    m_wndListCtrl.SetExtendedStyle(LVS_EX_TRACKSELECT | LVS_EX_UNDERLINEHOT | 
                                   LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES);
    m_wndListCtrl.SetHoverTime(0x7FFFFFFF);
+   m_wndListCtrl.SetImageList(&m_imageList, LVSIL_SMALL);
 
    // Setup columns
    m_wndListCtrl.InsertColumn(0, "ID", LVCFMT_LEFT, 40);
@@ -178,6 +185,7 @@ void CDataCollectionEditor::UpdateListItem(int iItem, NXC_DCI *pItem)
    sprintf(szBuffer, "%d days", pItem->iRetentionTime);
    m_wndListCtrl.SetItemText(iItem, 6, szBuffer);
    m_wndListCtrl.SetItemText(iItem, 7, g_pszItemStatus[pItem->iStatus]);
+   m_wndListCtrl.SetItem(iItem, 0, LVIF_IMAGE, NULL, pItem->iStatus, 0, 0, 0);
 }
 
 
index dc8e0de..b081085 100644 (file)
@@ -58,6 +58,8 @@ protected:
        //}}AFX_MSG
    afx_msg void OnListViewDblClk(LPNMITEMACTIVATE pNMHDR, LRESULT *pResult);
        DECLARE_MESSAGE_MAP()
+private:
+       CImageList m_imageList;
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/console/win32/icons/active.ico b/src/console/win32/icons/active.ico
new file mode 100644 (file)
index 0000000..780f37e
Binary files /dev/null and b/src/console/win32/icons/active.ico differ
diff --git a/src/console/win32/icons/disabled.ico b/src/console/win32/icons/disabled.ico
new file mode 100644 (file)
index 0000000..09ae228
Binary files /dev/null and b/src/console/win32/icons/disabled.ico differ
diff --git a/src/console/win32/icons/unsupported.ico b/src/console/win32/icons/unsupported.ico
new file mode 100644 (file)
index 0000000..faa17d4
Binary files /dev/null and b/src/console/win32/icons/unsupported.ico differ
index 4c67a72..7388a7c 100644 (file)
@@ -16,9 +16,9 @@ Class7=CEventBrowser
 Class9=CMapView
 
 ResourceCount=81
-Resource1=IDD_USER_PROPERTIES (English (U.S.))
+Resource1=IDD_OBJECT_GENERAL (English (U.S.))
 Resource2=IDD_REQUEST_PROCESSING
-Resource3=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource3=IDA_ALARM_BROWSER (English (U.S.))
 Resource4=IDD_OBJECT_CAPS
 Resource5=IDD_NEW_ACTION
 Class2=CChildView
@@ -32,9 +32,9 @@ Resource7=IDR_MAINFRAME
 Class12=CObjectBrowser
 Resource8=IDD_CP_GENERAL
 Class13=CObjectPropDlg
-Resource9=IDD_EDIT_RULE_COMMENT (English (U.S.))
-Resource10=IDD_SELECT_ACTION (English (U.S.))
-Resource11=IDA_EPP (English (U.S.))
+Resource9=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource10=IDD_EDIT_RULE_ALARM (English (U.S.))
+Resource11=IDD_CREATE_NODE (English (U.S.))
 Resource12=IDR_CTRLPANEL (English (U.S.))
 Resource13=IDR_EVENTS (English (U.S.))
 Resource14=IDR_MAPFRAME (English (U.S.))
@@ -42,33 +42,33 @@ Resource15=IDR_OBJECTS (English (U.S.))
 Resource16=IDD_DUMMY (English (U.S.))
 Class14=CEventEditor
 Class15=CEditEventDlg
-Resource17=IDD_OBJECT_SECURITY (English (U.S.))
+Resource17=IDD_OBJECT_NODE_GENERAL (English (U.S.))
 Class16=CDebugFrame
-Resource18=IDD_EDIT_EVENT (English (U.S.))
+Resource18=IDA_EPP (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
 Resource20=IDD_USER_PROPERTIES
 Class17=CObjectPreview
-Resource21=IDD_CP_GENERAL (English (U.S.))
+Resource21=IDD_SELECT_EVENT (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDD_MIB_BROWSER (English (U.S.))
+Resource22=IDD_SET_PASSWORD (English (U.S.))
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
-Resource23=IDA_MDI_DEFAULT (English (U.S.))
+Resource23=IDD_SELECT_ACTION (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
 Resource24=IDD_SELECT_USER
 Class26=CRequestProcessingDlg
-Resource25=IDA_OBJECT_BROWSER (English (U.S.))
+Resource25=IDD_CREATE_CONTAINER (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
 Resource27=IDA_OBJECT_BROWSER
-Resource28=IDD_LOGIN (English (U.S.))
+Resource28=IDA_OBJECT_BROWSER (English (U.S.))
 Class27=CObjectPropsGeneral
-Resource29=IDD_CREATE_NODE (English (U.S.))
+Resource29=IDD_NEW_ACTION (English (U.S.))
 Class28=CObjectPropsSecurity
-Resource30=IDD_EDIT_RULE_ALARM (English (U.S.))
+Resource30=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Resource31=IDD_EDIT_RULE_SEVERITY
 Resource32=IDA_MDI_DEFAULT
 Class29=CUserSelectDlg
@@ -79,36 +79,36 @@ Class31=CNewUserDlg
 Resource35=IDD_MIB_BROWSER
 Resource36=IDD_NEW_USER
 Class32=CUserPropDlg
-Resource37=IDD_ABOUTBOX (English (U.S.))
+Resource37=IDA_MDI_DEFAULT (English (U.S.))
 Resource38=IDM_CONTEXT
 Class33=CGroupPropDlg
 Resource39=IDD_CREATE_CONTAINER
 Resource40=IDD_OBJECT_GENERAL
 Resource41=IDD_LOGIN
-Resource42=IDD_SET_PASSWORD (English (U.S.))
+Resource42=IDD_SELECT_USER (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
 Class36=CNetSummaryFrame
 Class37=CDataCollectionEditor
-Resource43=IDD_OBJECT_PRESENTATION (English (U.S.))
+Resource43=IDD_MIB_BROWSER (English (U.S.))
 Class38=CDCIPropPage
-Resource44=IDD_OBJECT_GENERAL (English (U.S.))
+Resource44=IDD_EDIT_EVENT (English (U.S.))
 Class39=CDCIDataView
-Resource45=IDD_NEW_USER (English (U.S.))
+Resource45=IDD_REQUEST_PROCESSING (English (U.S.))
 Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
-Resource46=IDD_ACTION_PROPERTIES (English (U.S.))
-Resource47=IDA_ALARM_BROWSER (English (U.S.))
+Resource46=IDD_EDIT_RULE_SEVERITY (English (U.S.))
+Resource47=IDR_MAINFRAME (English (U.S.))
 Resource48=IDD_DCI_THRESHOLDS
 Class43=CThresholdDlg
-Resource49=IDR_MAINFRAME (English (U.S.))
+Resource49=IDM_VIEW_SPECIFIC (English (U.S.))
 Resource50=IDD_SELECT_EVENT
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
-Resource51=IDD_NEW_ACTION (English (U.S.))
+Resource51=IDD_OBJECT_PRESENTATION (English (U.S.))
 Resource52=IDM_VIEW_SPECIFIC
 Class48=CObjectSelDlg
 Resource53=IDD_EDIT_EVENT
@@ -119,20 +119,20 @@ Class50=CEventSelDlg
 Resource56=IDD_OBJECT_PRESENTATION
 Resource57=IDM_CONTEXT (English (U.S.))
 Resource58=IDD_CREATE_NODE
-Resource59=IDD_DCI_TRANSFORM (English (U.S.))
-Resource60=IDD_GROUP_PROPERTIES (English (U.S.))
+Resource59=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource60=IDD_OBJECT_SECURITY (English (U.S.))
 Class51=CObjectPropsPresentation
-Resource61=IDD_THRESHOLD (English (U.S.))
+Resource61=IDD_GROUP_PROPERTIES (English (U.S.))
 Resource62=IDD_DCI_COLLECTION
 Class52=CRuleSeverityDlg
 Resource63=IDD_SELECT_ACTION
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
-Resource64=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource64=IDD_USER_PROPERTIES (English (U.S.))
 Resource65=IDD_OBJECT_NODE_GENERAL
-Resource66=IDD_SELECT_EVENT (English (U.S.))
-Resource67=IDD_SELECT_USER (English (U.S.))
-Resource68=IDD_OBJECT_CAPS (English (U.S.))
+Resource66=IDD_THRESHOLD (English (U.S.))
+Resource67=IDD_OBJECT_CAPS (English (U.S.))
+Resource68=IDD_ABOUTBOX (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
 Resource69=IDD_GROUP_PROPERTIES
@@ -143,18 +143,18 @@ Class58=CEditActionDlg
 Resource72=IDD_OBJECT_SECURITY
 Class59=CActionSelDlg
 Resource73=IDD_EDIT_RULE_ALARM
-Resource74=IDD_DCI_COLLECTION (English (U.S.))
-Resource75=IDD_SELECT_OBJECT (English (U.S.))
+Resource74=IDD_NEW_USER (English (U.S.))
+Resource75=IDD_DCI_COLLECTION (English (U.S.))
 Resource76=IDA_EPP
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
 Resource77=IDD_SET_PASSWORD
 Class62=CCreateNodeDlg
-Resource78=IDD_CREATE_CONTAINER (English (U.S.))
-Resource79=IDD_EDIT_RULE_SEVERITY (English (U.S.))
-Resource80=IDD_REQUEST_PROCESSING (English (U.S.))
+Resource78=IDD_CP_GENERAL (English (U.S.))
+Resource79=IDD_SELECT_OBJECT (English (U.S.))
+Resource80=IDD_LOGIN (English (U.S.))
 Class63=CDCITransformPage
-Resource81=IDM_VIEW_SPECIFIC (English (U.S.))
+Resource81=IDD_DCI_TRANSFORM (English (U.S.))
 
 [CLS:CConsoleApp]
 Type=0
index b6852c4..56892e3 100644 (file)
@@ -618,6 +618,10 @@ SOURCE=.\icons\ack.ico
 # End Source File
 # Begin Source File
 
+SOURCE=.\icons\active.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\icons\alarm.ico
 # End Source File
 # Begin Source File
@@ -638,6 +642,10 @@ SOURCE=.\icons\connect.ico
 # End Source File
 # Begin Source File
 
+SOURCE=.\icons\disabled.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\down_arrow.bmp
 # End Source File
 # Begin Source File
@@ -650,6 +658,10 @@ SOURCE=.\icons\EARTH.ICO
 # End Source File
 # Begin Source File
 
+SOURCE=.\icons\enabled.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\icons\event.ico
 # End Source File
 # Begin Source File
@@ -766,6 +778,14 @@ SOURCE=.\icons\tree.ico
 # End Source File
 # Begin Source File
 
+SOURCE=.\icons\unsuppor.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\icons\unsupported.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\up_arrow.bmp
 # End Source File
 # Begin Source File
index 2f58c43..632e30d 100644 (file)
@@ -87,6 +87,9 @@ IDI_EMAIL               ICON    DISCARDABLE     "icons\\e-mail.ico"
 IDI_SMS                 ICON    DISCARDABLE     "icons\\sms.ico"
 IDI_EXEC                ICON    DISCARDABLE     "icons\\exec.ico"
 IDI_REXEC               ICON    DISCARDABLE     "icons\\rexec.ico"
+IDI_ACTIVE              ICON    DISCARDABLE     "icons\\active.ico"
+IDI_DISABLED            ICON    DISCARDABLE     "icons\\disabled.ico"
+IDI_UNSUPPORTED         ICON    DISCARDABLE     "icons\\unsupported.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
index 987f7b3..7126345 100644 (file)
 #define IDD_CREATE_CONTAINER            220
 #define IDD_CREATE_NODE                 221
 #define IDD_DCI_TRANSFORM               222
+#define IDI_ACTIVE                      223
+#define IDI_DISABLED                    224
+#define IDI_UNSUPPORTED                 225
 #define IDC_EDIT_SERVER                 1000
 #define IDC_EDIT_LOGIN                  1001
 #define IDC_EDIT_PASSWORD               1002
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        223
+#define _APS_NEXT_RESOURCE_VALUE        226
 #define _APS_NEXT_COMMAND_VALUE         32880
 #define _APS_NEXT_CONTROL_VALUE         1169
 #define _APS_NEXT_SYMED_VALUE           119