~chenluhua/Bond2.git

			@@ -21,6 +21,7 @@

			#if !defined(AFX_RESOURCE_DLL) \|\| defined(AFX_TARG_CHS)
			LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
			#pragma code_page(936)

			#ifdef APSTUDIO_INVOKED
			/////////////////////////////////////////////////////////////////////////////
			@@ -542,8 +543,35 @@
			PUSHBUTTON "取消",IDCANCEL,130,140,50,14
			END

			IDD_DIALOG_REPORT_EDIT DIALOGEX 0, 0, 320, 240
			STYLE DS_SETFONT \| DS_MODALFRAME \| DS_FIXEDSYS \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
			CAPTION "报告"
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			LTEXT "报告ID：",IDC_STATIC,12,12,50,8
			EDITTEXT IDC_EDIT_RPT_ID,70,10,170,14,ES_AUTOHSCROLL \| ES_READONLY
			LTEXT "选择变量：",IDC_STATIC_SELECT_VARS,12,32,60,8
			CONTROL "",IDC_LIST_RPT_VARS,"SysListView32",LVS_REPORT \| LVS_SHOWSELALWAYS \| WS_BORDER \| WS_TABSTOP,12,42,296,150
			DEFPUSHBUTTON "确定",IDOK,170,200,50,14
			PUSHBUTTON "取消",IDCANCEL,230,200,50,14
			END


			IDD_DIALOG_EVENT_EDIT DIALOGEX 0, 0, 340, 220
			STYLE DS_SETFONT \| DS_MODALFRAME \| DS_FIXEDSYS \| WS_POPUP \| WS_CAPTION \| WS_SYSMENU
			CAPTION "事件"
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			LTEXT "事件ID：",IDC_STATIC,12,12,50,8
			EDITTEXT IDC_EDIT_EVT_ID,70,10,170,14,ES_AUTOHSCROLL \| ES_READONLY
			LTEXT "名称：",IDC_STATIC,12,32,50,8
			EDITTEXT IDC_EDIT_EVT_NAME,70,30,260,14,ES_AUTOHSCROLL
			LTEXT "描述：",IDC_STATIC,12,52,50,8
			EDITTEXT IDC_EDIT_EVT_DESC,70,50,260,34,ES_MULTILINE \| ES_AUTOVSCROLL \| ES_AUTOHSCROLL \| WS_VSCROLL
			LTEXT "选择Report：",IDC_STATIC_SELECT_VARS,12,90,70,8
			CONTROL "",IDC_LIST_EVT_RPTS,"SysListView32",LVS_REPORT \| LVS_SHOWSELALWAYS \| WS_BORDER \| WS_TABSTOP,12,100,316,90
			DEFPUSHBUTTON "确定",IDOK,200,196,50,14
			PUSHBUTTON "取消",IDCANCEL,260,196,50,14
			END

			IDD_PAGE_LINK_SIGNAL DIALOGEX 0, 0, 543, 239
			STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD \| WS_SYSMENU
			@@ -778,6 +806,53 @@
			DEFPUSHBUTTON "确定",IDOK,283,238,50,14
			PUSHBUTTON "取消",IDCANCEL,338,238,50,14
			CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT \| LVS_ALIGNLEFT \| WS_BORDER \| WS_TABSTOP,7,7,381,226
			END

			IDD_PANEL_PRODUCTION DIALOGEX 0, 0, 311, 254
			STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD \| WS_SYSMENU
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			CONTROL "Custom1",IDC_LINE1,"BYVerticalLine",WS_TABSTOP,286,7,18,240
			CONTROL "Custom1",IDC_ACCORDION_WND1,"AccordionWnd",WS_TABSTOP,7,7,271,240
			END

			IDD_PROD_OVERVIEW DIALOGEX 0, 0, 271, 159
			STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD \| WS_SYSMENU
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			CTEXT "0",IDC_PROD_DAY_OUTPUT,16,12,68,45,SS_CENTERIMAGE
			CTEXT "0",IDC_PROD_NIGHT_OUTPUT,126,12,68,45,SS_CENTERIMAGE
			CTEXT "-",IDC_PROD_DAY_TAKT,16,82,68,45,SS_CENTERIMAGE
			CTEXT "-",IDC_PROD_NIGHT_TAKT,126,82,68,45,SS_CENTERIMAGE
			END

			IDD_PROD_CTRL_STATE DIALOGEX 0, 0, 216, 97
			STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_CHILD \| WS_SYSMENU
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			PUSHBUTTON "Offline",IDC_BUTTON_OFFLINE,9,15,58,27
			PUSHBUTTON "Online Local",IDC_BUTTON_ONLINE_LOCAL,74,15,58,27
			PUSHBUTTON "Online Remote",IDC_BUTTON_ONLINE_REMOTE,138,15,58,27
			END

			IDD_DIALOG_POPUP_ALARM DIALOGEX 0, 0, 379, 247
			STYLE DS_SETFONT \| DS_FIXEDSYS \| WS_POPUP \| WS_SYSMENU
			FONT 8, "MS Shell Dlg", 400, 0, 0x1
			BEGIN
			PUSHBUTTON "<< 上一条",IDC_BUTTON_PREV,8,224,50,14,NOT WS_VISIBLE
			PUSHBUTTON "下一条 >>",IDC_BUTTON_NEXT,62,224,50,14,NOT WS_VISIBLE
			LTEXT "警告",IDC_LABEL_TITLE,27,6,212,17,SS_CENTERIMAGE \| NOT WS_VISIBLE
			ICON "",IDC_ICON_ALARM,29,28,20,20
			ICON "",IDC_ICON_TITLE,7,8,20,20,NOT WS_VISIBLE
			LTEXT "等级：--",IDC_LABEL_LEVEL,75,26,161,18
			LTEXT "警告名称",IDC_LABEL_NAME,120,45,251,24
			PUSHBUTTON "",IDC_POPUP_BTN_CLOSE,354,0,24,22
			CONTROL "Custom1",IDC_LINE1,"BYHorizontalLine",WS_TABSTOP,7,78,364,8
			PUSHBUTTON "静音",IDC_BUTTON_SOUND_OFF,228,216,68,22,WS_DISABLED
			PUSHBUTTON "异常解除",IDC_BUTTON_ALARM_OFF,304,216,68,22,WS_DISABLED
			CONTROL "Custom1",IDC_LINE2,"BYHorizontalLine",WS_TABSTOP,7,202,364,8
			LTEXT "警告描述：",IDC_LABEL_DESCRIPTION,18,98,329,89
			CTEXT "当前没有警告",IDC_LABEL_NO_ALARM,18,98,329,89,SS_CENTERIMAGE \| NOT WS_VISIBLE
			END


			@@ -1209,6 +1284,38 @@
			TOPMARGIN, 7
			BOTTOMMARGIN, 252
			END

			IDD_PANEL_PRODUCTION, DIALOG
			BEGIN
			LEFTMARGIN, 7
			RIGHTMARGIN, 304
			TOPMARGIN, 7
			BOTTOMMARGIN, 247
			END

			IDD_PROD_OVERVIEW, DIALOG
			BEGIN
			LEFTMARGIN, 7
			RIGHTMARGIN, 264
			TOPMARGIN, 7
			BOTTOMMARGIN, 152
			END

			IDD_PROD_CTRL_STATE, DIALOG
			BEGIN
			LEFTMARGIN, 7
			RIGHTMARGIN, 209
			TOPMARGIN, 7
			BOTTOMMARGIN, 90
			END

			IDD_DIALOG_POPUP_ALARM, DIALOG
			BEGIN
			LEFTMARGIN, 7
			RIGHTMARGIN, 371
			TOPMARGIN, 7
			BOTTOMMARGIN, 238
			END
			END
			#endif // APSTUDIO_INVOKED

			@@ -1458,6 +1565,26 @@
			0
			END

			IDD_PANEL_PRODUCTION AFX_DIALOG_LAYOUT
			BEGIN
			0
			END

			IDD_PROD_OVERVIEW AFX_DIALOG_LAYOUT
			BEGIN
			0
			END

			IDD_PROD_CTRL_STATE AFX_DIALOG_LAYOUT
			BEGIN
			0
			END

			IDD_DIALOG_POPUP_ALARM AFX_DIALOG_LAYOUT
			BEGIN
			0
			END


			/////////////////////////////////////////////////////////////////////////////
			//
			@@ -1506,17 +1633,25 @@
			END
			POPUP "测试(&T)"
			BEGIN
			MENUITEM "Test1", ID_MENU_TEST_ALARM_ON
			MENUITEM "Test2", ID_MENU_TEST_ALARM_OFF
			MENUITEM "Message &Set", ID_MENU_TEST_MESSAGE_SET
			MENUITEM "Message &Clear", ID_MENU_TEST_MESSAGE_CLEAR
			END
			POPUP "工具(&O)"
			BEGIN
			MENUITEM "曲线显示端列表(&C)", ID_MENU_TOOLS_CLIENT_LIST
			MENUITEM SEPARATOR
			MENUITEM "空腔调机曲线模式(&E)", ID_MENU_TOOLS_CURVE_EMPTY
			MENUITEM "生产曲线模式(&P)", ID_MENU_TOOLS_CURVE_PRODUCTION
			END
			POPUP "窗口(&W)"
			BEGIN
			MENUITEM "日志窗口(&L)", ID_MENU_WND_LOG
			MENUITEM "警告窗口(A)", 32781
			MENUITEM SEPARATOR
			MENUITEM "测试面板(T)", ID_MENU_WND_TEST_PANEL
			MENUITEM "生产面板(P)", ID_MENU_WND_PRO_PANEL
			END
			POPUP "帮助(&H)"
			BEGIN