Added possibility to change graph's time frame
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 8 Apr 2005 15:42:28 +0000 (15:42 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 8 Apr 2005 15:42:28 +0000 (15:42 +0000)
ChangeLog
src/console/win32/GraphFrame.cpp
src/console/win32/GraphFrame.h
src/console/win32/GraphSettingsPage.cpp
src/console/win32/GraphSettingsPage.h
src/console/win32/nxcon.clw
src/console/win32/nxcon.rc
src/console/win32/resource.h

index 209921e..40c80d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 * 0.1.18
 *
 
+- Added support for object database caching on client side
 - Polling performance increased
 - Fix: SYS_SERVICE_DOWN event was generated in place of SYS_SERVICE_UNKNOWN
 - Windows console: implemented desktop configuration save and restore
index 1b14b9c..f4fda4d 100644 (file)
 static char THIS_FILE[] = __FILE__;
 #endif
 
+
+//
+// Static data
+//
+
+static DWORD m_dwTimeUnitSize[MAX_TIME_UNITS] = { 60, 3600, 86400 };
+
+
 /////////////////////////////////////////////////////////////////////////////
 // CGraphStatusBar
 
@@ -46,6 +54,10 @@ CGraphFrame::CGraphFrame()
    m_dwFlags = 0;
    m_hTimer = 0;
    m_dwSeconds = 0;
+   m_iTimeFrameType = 1;   // Back from now
+   m_iTimeUnit = 1;  // Hours
+   m_dwNumTimeUnits = 1;
+   m_dwTimeFrame = 3600;   // By default, graph covers 3600 seconds
 }
 
 CGraphFrame::~CGraphFrame()
@@ -166,9 +178,11 @@ void CGraphFrame::OnViewRefresh()
    NXC_DCI_DATA *pData;
 
    // Set new time frame
-   i = m_dwTimeTo - m_dwTimeFrom;
-   m_dwTimeTo = (time(NULL) / 60) * 60;   // Round minute boundary
-   m_dwTimeFrom = m_dwTimeTo - i;
+   if (m_iTimeFrameType == 1)
+   {
+      m_dwTimeTo = (time(NULL) / 60) * 60;   // Round minute boundary
+      m_dwTimeFrom = m_dwTimeTo - m_dwTimeFrame;
+   }
    m_wndGraph.SetTimeFrame(m_dwTimeFrom, m_dwTimeTo);
 
    for(i = 0; i < m_dwNumItems; i++)
@@ -225,6 +239,9 @@ void CGraphFrame::OnGraphProperties()
    pgSettings.m_rgbText = m_wndGraph.m_rgbTextColor;
    for(i = 0; i < MAX_GRAPH_ITEMS; i++)
       pgSettings.m_rgbItems[i] = m_wndGraph.m_rgbLineColors[i];
+   pgSettings.m_iTimeFrame = m_iTimeFrameType;
+   pgSettings.m_iTimeUnit = m_iTimeUnit;
+   pgSettings.m_dwNumUnits = m_dwNumTimeUnits;
    dlg.AddPage(&pgSettings);
 
    if (dlg.DoModal() == IDOK)
@@ -256,11 +273,25 @@ void CGraphFrame::OnGraphProperties()
       for(i = 0; i < MAX_GRAPH_ITEMS; i++)
          m_wndGraph.m_rgbLineColors[i] = pgSettings.m_rgbItems[i];
 
-      m_wndGraph.InvalidateRect(NULL, FALSE);
-
       m_wndStatusBar.SetText(m_wndGraph.m_bAutoScale ? _T("Autoscale") : _T(""), 0, 0);
       m_wndStatusBar.SetText((m_dwFlags & GF_AUTOUPDATE) ? (LPCTSTR)m_dwSeconds : _T(""), 1,
                              (m_dwFlags & GF_AUTOUPDATE) ? SBT_OWNERDRAW : 0);
+
+      m_iTimeFrameType = pgSettings.m_iTimeFrame;
+      m_iTimeUnit = pgSettings.m_iTimeUnit;
+      m_dwNumTimeUnits = pgSettings.m_dwNumUnits;
+      if (m_iTimeFrameType == 0)
+      {
+         // Fixed time frame
+      }
+      else
+      {
+         // Back from now
+         m_dwTimeFrame = m_dwNumTimeUnits * m_dwTimeUnitSize[m_iTimeUnit];
+      }
+
+      /* TODO: send refresh only if time frame was changed */
+      PostMessage(WM_COMMAND, ID_VIEW_REFRESH, 0);
    }
 }
 
index 9c974d7..2d7cf1f 100644 (file)
@@ -54,6 +54,10 @@ public:
 
 // Implementation
 protected:
+       DWORD m_dwTimeFrame;
+       DWORD m_dwNumTimeUnits;
+       int m_iTimeUnit;
+       int m_iTimeFrameType;
        TCHAR m_szSubTitle[256];
        DWORD m_dwSeconds;
        CGraphStatusBar m_wndStatusBar;
index 7e71ed9..3df7521 100644 (file)
 static char THIS_FILE[] = __FILE__;
 #endif
 
+//
+// Static data
+//
+
+static TCHAR *m_pszTimeUnits[] = { _T("Minutes"), _T("Hours"), _T("Days"), NULL };
+
+
 /////////////////////////////////////////////////////////////////////////////
 // CGraphSettingsPage property page
 
@@ -23,7 +30,15 @@ CGraphSettingsPage::CGraphSettingsPage() : CPropertyPage(CGraphSettingsPage::IDD
        m_bShowGrid = FALSE;
        m_bAutoUpdate = FALSE;
        m_dwRefreshInterval = 0;
+       m_dwNumUnits = 0;
+       m_iTimeFrame = -1;
+       m_dateFrom = 0;
+       m_dateTo = 0;
+       m_timeFrom = 0;
+       m_timeTo = 0;
        //}}AFX_DATA_INIT
+
+   m_iTimeUnit = 0;
 }
 
 CGraphSettingsPage::~CGraphSettingsPage()
@@ -34,17 +49,27 @@ void CGraphSettingsPage::DoDataExchange(CDataExchange* pDX)
 {
        CPropertyPage::DoDataExchange(pDX);
        //{{AFX_DATA_MAP(CGraphSettingsPage)
+       DDX_Control(pDX, IDC_COMBO_UNITS, m_wndTimeUnits);
        DDX_Check(pDX, IDC_CHECK_AUTOSCALE, m_bAutoscale);
        DDX_Check(pDX, IDC_CHECK_GRID, m_bShowGrid);
        DDX_Check(pDX, IDC_CHECK_REFRESH, m_bAutoUpdate);
        DDX_Text(pDX, IDC_EDIT_REFRESH, m_dwRefreshInterval);
        DDV_MinMaxDWord(pDX, m_dwRefreshInterval, 5, 600);
+       DDX_Text(pDX, IDC_EDIT_COUNT, m_dwNumUnits);
+       DDV_MinMaxDWord(pDX, m_dwNumUnits, 1, 100000);
+       DDX_Radio(pDX, IDC_RADIO_FIXED, m_iTimeFrame);
+       DDX_DateTimeCtrl(pDX, IDC_DATE_FROM, m_dateFrom);
+       DDX_DateTimeCtrl(pDX, IDC_DATE_TO, m_dateTo);
+       DDX_DateTimeCtrl(pDX, IDC_TIME_FROM, m_timeFrom);
+       DDX_DateTimeCtrl(pDX, IDC_TIME_TO, m_timeTo);
        //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CGraphSettingsPage, CPropertyPage)
        //{{AFX_MSG_MAP(CGraphSettingsPage)
+       ON_BN_CLICKED(IDC_RADIO_FROM_NOW, OnRadioFromNow)
+       ON_BN_CLICKED(IDC_RADIO_FIXED, OnRadioFixed)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -87,6 +112,28 @@ BOOL CGraphSettingsPage::OnInitDialog()
       m_pwndCSItem[i].m_rgbColor = m_rgbItems[i];
       m_pwndCSItem[i].SubclassDlgItem(piItemList[i], this);
    }
+
+   // Setup time units list
+   for(i = 0; i < MAX_TIME_UNITS; i++)
+      m_wndTimeUnits.AddString(m_pszTimeUnits[i]);
+   m_wndTimeUnits.SelectString(-1, m_pszTimeUnits[m_iTimeUnit]);
+
+   if (m_iTimeFrame == 0)
+   {
+      // Fixed time frame
+      EnableDlgItem(this, IDC_EDIT_COUNT, FALSE);
+      EnableDlgItem(this, IDC_COMBO_UNITS, FALSE);
+   }
+   else
+   {
+      // Back from current time
+      EnableDlgItem(this, IDC_DATE_FROM, FALSE);
+      EnableDlgItem(this, IDC_DATE_TO, FALSE);
+      EnableDlgItem(this, IDC_TIME_FROM, FALSE);
+      EnableDlgItem(this, IDC_TIME_TO, FALSE);
+      EnableDlgItem(this, IDC_STATIC_FROM, FALSE);
+      EnableDlgItem(this, IDC_STATIC_TO, FALSE);
+   }
        
        return TRUE;
 }
@@ -99,6 +146,7 @@ BOOL CGraphSettingsPage::OnInitDialog()
 void CGraphSettingsPage::OnOK() 
 {
    int i;
+   TCHAR szBuffer[64];
 
    m_rgbBackground = m_wndCSBackground.m_rgbColor;
    m_rgbText = m_wndCSText.m_rgbColor;
@@ -108,6 +156,45 @@ void CGraphSettingsPage::OnOK()
    m_rgbLabelBkgnd = m_wndCSLabelBkgnd.m_rgbColor;
    for(i = 0; i < MAX_GRAPH_ITEMS; i++)
       m_rgbItems[i] = m_pwndCSItem[i].m_rgbColor;
+
+   m_wndTimeUnits.GetWindowText(szBuffer, 64);
+   for(i = 0; i < MAX_TIME_UNITS; i++)
+      if (!_tcscmp(szBuffer, m_pszTimeUnits[i]))
+      {
+         m_iTimeUnit = i;
+         break;
+      }
        
        CPropertyPage::OnOK();
 }
+
+
+//
+// Handlers for radio buttons
+//
+
+void CGraphSettingsPage::OnRadioFromNow() 
+{
+   EnableDlgItem(this, IDC_DATE_FROM, FALSE);
+   EnableDlgItem(this, IDC_DATE_TO, FALSE);
+   EnableDlgItem(this, IDC_TIME_FROM, FALSE);
+   EnableDlgItem(this, IDC_TIME_TO, FALSE);
+   EnableDlgItem(this, IDC_STATIC_FROM, FALSE);
+   EnableDlgItem(this, IDC_STATIC_TO, FALSE);
+
+   EnableDlgItem(this, IDC_EDIT_COUNT, TRUE);
+   EnableDlgItem(this, IDC_COMBO_UNITS, TRUE);
+}
+
+void CGraphSettingsPage::OnRadioFixed() 
+{
+   EnableDlgItem(this, IDC_EDIT_COUNT, FALSE);
+   EnableDlgItem(this, IDC_COMBO_UNITS, FALSE);
+
+   EnableDlgItem(this, IDC_DATE_FROM, TRUE);
+   EnableDlgItem(this, IDC_DATE_TO, TRUE);
+   EnableDlgItem(this, IDC_TIME_FROM, TRUE);
+   EnableDlgItem(this, IDC_TIME_TO, TRUE);
+   EnableDlgItem(this, IDC_STATIC_FROM, TRUE);
+   EnableDlgItem(this, IDC_STATIC_TO, TRUE);
+}
index 4cf296e..7ddc418 100644 (file)
@@ -9,6 +9,9 @@
 #include "ColorSelector.h"
 
 
+#define MAX_TIME_UNITS     3
+
+
 /////////////////////////////////////////////////////////////////////////////
 // CGraphSettingsPage dialog
 
@@ -18,6 +21,7 @@ class CGraphSettingsPage : public CPropertyPage
 
 // Construction
 public:
+       int m_iTimeUnit;
        COLORREF m_rgbItems[MAX_GRAPH_ITEMS];
        COLORREF m_rgbLabelBkgnd;
        COLORREF m_rgbLabelText;
@@ -32,10 +36,17 @@ public:
 // Dialog Data
        //{{AFX_DATA(CGraphSettingsPage)
        enum { IDD = IDD_GRAPH_PROP_SETTINGS };
+       CComboBox       m_wndTimeUnits;
        BOOL    m_bAutoscale;
        BOOL    m_bShowGrid;
        BOOL    m_bAutoUpdate;
        DWORD   m_dwRefreshInterval;
+       DWORD   m_dwNumUnits;
+       int             m_iTimeFrame;
+       CTime   m_dateFrom;
+       CTime   m_dateTo;
+       CTime   m_timeFrom;
+       CTime   m_timeTo;
        //}}AFX_DATA
 
 
@@ -61,6 +72,8 @@ protected:
        // Generated message map functions
        //{{AFX_MSG(CGraphSettingsPage)
        virtual BOOL OnInitDialog();
+       afx_msg void OnRadioFromNow();
+       afx_msg void OnRadioFixed();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 
index 9deca5f..4b2d16e 100644 (file)
@@ -16,9 +16,9 @@ Class7=CEventBrowser
 Class9=CMapView
 
 ResourceCount=116
-Resource1=IDA_GRAPH (English (U.S.))
+Resource1=IDD_ACTION_PROPERTIES (English (U.S.))
 Resource2=IDD_OBJECT_NODE_GENERAL
-Resource3=IDD_CREATE_CONTAINER (English (U.S.))
+Resource3=IDD_ABOUTBOX (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_SELECT_EVENT (English (U.S.))
-Resource10=IDD_NEW_USER (English (U.S.))
-Resource11=IDD_EDIT_RULE_SEVERITY (English (U.S.))
+Resource9=IDA_ALARM_BROWSER (English (U.S.))
+Resource10=IDD_INPUT_BOX (English (U.S.))
+Resource11=IDA_EVENT_EDITOR (English (U.S.))
 Resource12=IDR_CTRLPANEL (English (U.S.))
 Resource13=IDR_EVENTS (English (U.S.))
 Resource14=IDR_MAPFRAME (English (U.S.))
@@ -42,17 +42,17 @@ Resource15=IDR_OBJECTS (English (U.S.))
 Resource16=IDD_DUMMY (English (U.S.))
 Class14=CEventEditor
 Class15=CEditEventDlg
-Resource17=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource17=IDD_CREATE_TEMPLATE (English (U.S.))
 Class16=CDebugFrame
-Resource18=IDR_MAINFRAME (English (U.S.))
+Resource18=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
 Resource20=IDD_SELECT_EVENT
 Class17=CObjectPreview
-Resource21=IDD_EDIT_TRAP_ARG (English (U.S.))
+Resource21=IDD_OBJECT_SECURITY (English (U.S.))
 Class18=CToolBox
 Class19=CObjectInfoBox
 Class20=CObjectSearchBox
-Resource22=IDA_EPP (English (U.S.))
+Resource22=IDD_SELECT_EVENT (English (U.S.))
 Class21=CEditBox
 Class22=COPGeneral
 Class23=CNodePropsGeneral
@@ -61,14 +61,14 @@ Class24=CObjectPropCaps
 Class25=CObjectPropSheet
 Resource24=IDA_MDI_DEFAULT
 Class26=CRequestProcessingDlg
-Resource25=IDD_DATA_QUERY (English (U.S.))
+Resource25=IDD_REQUEST_PROCESSING (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
 Resource27=IDD_EDIT_RULE_ALARM
-Resource28=IDD_SELECT_ACTION (English (U.S.))
+Resource28=IDA_LAST_VALUES (English (U.S.))
 Class27=CObjectPropsGeneral
-Resource29=IDA_NETMAP (English (U.S.))
+Resource29=IDD_EDIT_RULE_SEVERITY (English (U.S.))
 Class28=CObjectPropsSecurity
-Resource30=IDD_EDIT_EVENT (English (U.S.))
+Resource30=IDD_CREATE_TG (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=IDD_OBJECT_NODE_POLL (English (U.S.))
+Resource37=IDD_DCI_COLLECTION (English (U.S.))
 Resource38=IDD_ABOUTBOX
 Class33=CGroupPropDlg
 Resource39=IDD_CP_GENERAL
 Resource40=IDA_TRAP_EDITOR
 Resource41=IDM_VIEW_SPECIFIC
-Resource42=IDD_EDIT_TRAP (English (U.S.))
+Resource42=IDD_OBJECT_GENERAL (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
 Class36=CNetSummaryFrame
 Class37=CDataCollectionEditor
-Resource43=IDA_TRAP_EDITOR (English (U.S.))
+Resource43=IDD_NEW_ACTION (English (U.S.))
 Class38=CDCIPropPage
-Resource44=IDD_DCI_COLLECTION (English (U.S.))
+Resource44=IDD_OBJECT_RELATIONS (English (U.S.))
 Class39=CDCIDataView
-Resource45=IDD_ACTION_PROPERTIES (English (U.S.))
+Resource45=IDA_PACKAGE_MGR (English (U.S.))
 Class40=CGraph
 Class41=CGraphFrame
 Class42=CDCIThresholdsPage
-Resource46=IDM_VIEW_SPECIFIC (English (U.S.))
-Resource47=IDD_EDIT_RULE_COMMENT (English (U.S.))
+Resource46=IDM_CONTEXT (English (U.S.))
+Resource47=IDA_EPP (English (U.S.))
 Resource48=IDM_CONTEXT
 Class43=CThresholdDlg
-Resource49=IDD_SELECT_OBJECT (English (U.S.))
+Resource49=IDA_OBJECT_BROWSER (English (U.S.))
 Resource50=IDD_EDIT_TRAP_ARG
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
-Resource51=IDD_SET_PASSWORD (English (U.S.))
+Resource51=IDD_OBJECT_NODE_POLL (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_OBJECT_NETSRV_GENERAL (English (U.S.))
+Resource57=IDD_SET_PASSWORD (English (U.S.))
 Resource58=IDD_CREATE_TG
-Resource59=IDD_EDIT_RULE_ALARM (English (U.S.))
-Resource60=IDA_ACTION_EDITOR (English (U.S.))
+Resource59=IDA_ACTION_EDITOR (English (U.S.))
+Resource60=IDD_CP_GENERAL (English (U.S.))
 Class51=CObjectPropsPresentation
-Resource61=IDD_SELECT_AGENT_PARAM (English (U.S.))
+Resource61=IDD_NEW_USER (English (U.S.))
 Resource62=IDD_EDIT_RULE_COMMENT
 Class52=CRuleSeverityDlg
 Resource63=IDD_ACTION_PROPERTIES
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
-Resource64=IDD_OBJECT_CAPS (English (U.S.))
+Resource64=IDD_DATA_QUERY (English (U.S.))
 Resource65=IDD_DCI_TRANSFORM
-Resource66=IDD_CREATE_TG (English (U.S.))
-Resource67=IDD_CREATE_NETSRV (English (U.S.))
-Resource68=IDD_OBJECT_SECURITY (English (U.S.))
+Resource66=IDD_OBJECT_NODE_GENERAL (English (U.S.))
+Resource67=IDD_GROUP_PROPERTIES (English (U.S.))
+Resource68=IDD_SELECT_INTERNAL_ITEM (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=IDD_OBJECT_RELATIONS (English (U.S.))
-Resource75=IDD_LOGIN (English (U.S.))
+Resource74=IDD_DCI_THRESHOLDS (English (U.S.))
+Resource75=IDD_DCI_TRANSFORM (English (U.S.))
 Resource76=IDD_USER_PROPERTIES
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
 Resource77=IDR_MAINFRAME
 Class62=CCreateNodeDlg
-Resource78=IDD_SELECT_INTERNAL_ITEM (English (U.S.))
-Resource79=IDD_CP_GENERAL (English (U.S.))
-Resource80=IDA_OBJECT_BROWSER (English (U.S.))
+Resource78=IDD_SELECT_USER (English (U.S.))
+Resource79=IDA_TRAP_EDITOR (English (U.S.))
+Resource80=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Class63=CDCITransformPage
-Resource81=IDD_NEW_ACTION (English (U.S.))
+Resource81=IDA_GRAPH (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
 Class65=CNodePoller
@@ -179,40 +179,40 @@ Class72=CGraphPropDlg
 Class73=CColorSelector
 Class74=CPackageMgr
 Resource94=IDD_GROUP_PROPERTIES
-Resource95=IDD_GRAPH_PROP_SETTINGS (English (U.S.))
-Resource96=IDA_LAST_VALUES (English (U.S.))
-Resource97=IDD_CREATE_NODE (English (U.S.))
-Resource98=IDM_CONTEXT (English (U.S.))
-Resource99=IDD_MIB_BROWSER (English (U.S.))
-Resource100=IDD_CREATE_TEMPLATE (English (U.S.))
-Resource101=IDD_DESKTOP_SAVE_AS (English (U.S.))
-Resource102=IDD_REQUEST_PROCESSING (English (U.S.))
-Resource103=IDD_THRESHOLD (English (U.S.))
-Resource104=IDD_DCI_THRESHOLDS (English (U.S.))
-Resource105=IDA_MDI_DEFAULT (English (U.S.))
-Resource106=IDD_USER_PROPERTIES (English (U.S.))
-Resource107=IDA_PACKAGE_MGR (English (U.S.))
+Resource95=IDD_MIB_BROWSER (English (U.S.))
+Resource96=IDD_CREATE_CONTAINER (English (U.S.))
+Resource97=IDD_LOGIN (English (U.S.))
+Resource98=IDM_VIEW_SPECIFIC (English (U.S.))
+Resource99=IDA_MDI_DEFAULT (English (U.S.))
+Resource100=IDD_OBJECT_CAPS (English (U.S.))
+Resource101=IDD_THRESHOLD (English (U.S.))
+Resource102=IDD_EDIT_TRAP (English (U.S.))
+Resource103=IDR_MAINFRAME (English (U.S.))
+Resource104=IDD_DESKTOP_SAVE_AS (English (U.S.))
+Resource105=IDD_SELECT_OBJECT (English (U.S.))
+Resource106=IDD_CREATE_NETSRV (English (U.S.))
+Resource107=IDD_SELECT_ACTION (English (U.S.))
 Class75=CInternalItemSelDlg
-Resource108=IDD_OBJECT_GENERAL (English (U.S.))
+Resource108=IDD_EDIT_TRAP_ARG (English (U.S.))
 Class76=CAgentParamSelDlg
-Resource109=IDD_SELECT_USER (English (U.S.))
+Resource109=IDD_SELECT_AGENT_PARAM (English (U.S.))
 Class77=CInputBox
-Resource110=IDD_INPUT_BOX (English (U.S.))
+Resource110=IDD_USER_PROPERTIES (English (U.S.))
 Class78=CCreateNetSrvDlg
-Resource111=IDD_DCI_TRANSFORM (English (U.S.))
+Resource111=IDD_EDIT_EVENT (English (U.S.))
 Class79=CNetSrvPropsGeneral
-Resource112=IDD_OBJECT_PRESENTATION (English (U.S.))
+Resource112=IDA_NETMAP (English (U.S.))
 Class80=CNodePropsPolling
 Class81=CDeploymentView
 Class82=CLastValuesView
 Class83=CValueList
-Resource113=IDA_EVENT_EDITOR (English (U.S.))
+Resource113=IDD_EDIT_RULE_ALARM (English (U.S.))
 Class84=CObjectPropsRelations
-Resource114=IDA_ALARM_BROWSER (English (U.S.))
+Resource114=IDD_OBJECT_PRESENTATION (English (U.S.))
 Class85=CSaveDesktopDlg
-Resource115=IDD_ABOUTBOX (English (U.S.))
-Resource116=IDD_GROUP_PROPERTIES (English (U.S.))
+Resource115=IDD_CREATE_NODE (English (U.S.))
 Class86=CGraphSettingsPage
+Resource116=IDD_GRAPH_PROP_SETTINGS (English (U.S.))
 
 [CLS:CConsoleApp]
 Type=0
@@ -3036,8 +3036,8 @@ Control4=IDC_EDIT_REFRESH,edit,1350639744
 Control5=IDC_RADIO_FIXED,button,1342373897
 Control6=IDC_DATE_FROM,SysDateTimePick32,1342242864
 Control7=IDC_TIME_FROM,SysDateTimePick32,1342242873
-Control8=IDC_DATE_FROM2,SysDateTimePick32,1342242864
-Control9=IDC_TIME_FROM2,SysDateTimePick32,1342242873
+Control8=IDC_DATE_TO,SysDateTimePick32,1342242864
+Control9=IDC_TIME_TO,SysDateTimePick32,1342242873
 Control10=IDC_RADIO_FROM_NOW,button,1342242825
 Control11=IDC_EDIT_COUNT,edit,1350639744
 Control12=IDC_COMBO_UNITS,combobox,1344339971
@@ -3091,8 +3091,8 @@ Control59=IDC_STATIC,static,1342308866
 Control60=IDC_STATIC,static,1342308866
 Control61=IDC_STATIC,static,1342308866
 Control62=IDC_STATIC,button,1342177287
-Control63=IDC_STATIC,static,1342308352
-Control64=IDC_STATIC,static,1342308352
+Control63=IDC_STATIC_FROM,static,1342308352
+Control64=IDC_STATIC_TO,static,1342308352
 
 [CLS:CGraphSettingsPage]
 Type=0
@@ -3101,4 +3101,5 @@ ImplementationFile=GraphSettingsPage.cpp
 BaseClass=CPropertyPage
 Filter=D
 VirtualFilter=idWC
+LastObject=CGraphSettingsPage
 
index 54d07f9..d1e02b2 100644 (file)
@@ -1672,10 +1672,10 @@ BEGIN
     CONTROL         "DateTimePicker2",IDC_TIME_FROM,"SysDateTimePick32",
                     DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
                     WS_TABSTOP | 0x8,237,44,46,15
-    CONTROL         "DateTimePicker1",IDC_DATE_FROM2,"SysDateTimePick32",
+    CONTROL         "DateTimePicker1",IDC_DATE_TO,"SysDateTimePick32",
                     DTS_RIGHTALIGN | DTS_APPCANPARSE | WS_TABSTOP,171,73,62,
                     15
-    CONTROL         "DateTimePicker2",IDC_TIME_FROM2,"SysDateTimePick32",
+    CONTROL         "DateTimePicker2",IDC_TIME_TO,"SysDateTimePick32",
                     DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
                     WS_TABSTOP | 0x8,237,73,46,15
     CONTROL         "&Back from now",IDC_RADIO_FROM_NOW,"Button",
@@ -1737,8 +1737,8 @@ BEGIN
     RTEXT           "15",IDC_STATIC,86,176,8,8,SS_CENTERIMAGE
     RTEXT           "16",IDC_STATIC,121,176,8,8,SS_CENTERIMAGE
     GROUPBOX        "Time Frame",IDC_STATIC,165,7,125,185
-    LTEXT           "From",IDC_STATIC,171,34,16,8
-    LTEXT           "To",IDC_STATIC,171,63,10,8
+    LTEXT           "From",IDC_STATIC_FROM,171,34,16,8
+    LTEXT           "To",IDC_STATIC_TO,171,63,10,8
 END
 
 
index 05d5825..bb0dd39 100644 (file)
 #define IDC_RADIO_FROM_NOW              1241
 #define IDC_DATE_FROM                   1242
 #define IDC_TIME_FROM                   1243
-#define IDC_DATE_FROM2                  1244
-#define IDC_TIME_FROM2                  1245
+#define IDC_DATE_TO                     1244
+#define IDC_TIME_TO                     1245
 #define IDC_EDIT_COUNT                  1246
 #define IDC_COMBO_UNITS                 1247
+#define IDC_STATIC_FROM                 1248
+#define IDC_STATIC_TO                   1249
 #define IDR_PACKAGE_MGR                 8156
 #define IDR_DEPLOYMENT_VIEW             8157
 #define IDR_LAST_VALUES_VIEW            8158
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        270
 #define _APS_NEXT_COMMAND_VALUE         32920
-#define _APS_NEXT_CONTROL_VALUE         1248
+#define _APS_NEXT_CONTROL_VALUE         1250
 #define _APS_NEXT_SYMED_VALUE           121
 #endif
 #endif