~chenluhua/Bond2.git

			@@ -8,9 +8,6 @@
			#include "Common.h"


			#define SHOW_BATCH 1
			#define SHOW_CT 1

			// CTopToolbar 对话框

			IMPLEMENT_DYNAMIC(CTopToolbar, CDialogEx)
			@@ -37,6 +34,7 @@
			DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
			DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
			DDX_Control(pDX, IDC_BUTTON_PORT_CONFIG, m_btnPortConfig);
			DDX_Control(pDX, IDC_BUTTON_CASSETTE, m_btnCassette);
			DDX_Control(pDX, IDC_BUTTON_ROBOT, m_btnRobot);
			DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
			}
			@@ -66,10 +64,16 @@
			InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
			InitBtn(m_btnRobot, "Robot_High_32.ico", "Robot_Gray_32.ico");
			InitBtn(m_btnPortConfig, "PortConfig_High_32.ico", "PortConfig_Gray_32.ico");
			InitBtn(m_btnCassette, "Cassette_High_32.ico", "Cassette_Gray_32.ico");
			InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico");
			HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR));
			m_btnOperator.SetMenu(hMenu);


			CString strIniFile;
			strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
			bool bEnableRunCT = GetPrivateProfileInt("APP", _T("EnableRunCT"), 0, strIniFile) != 0;
			m_btnRunCt.ShowWindow(bEnableRunCT ? SW_SHOW : SW_HIDE);

			return TRUE; // return TRUE unless you set the focus to a control
			// 异常: OCX 属性页应返回 FALSE
			@@ -125,19 +129,19 @@
			x += BTN_WIDTH;
			x += 2;

			#ifdef SHOW_BATCH
			pItem = GetDlgItem(IDC_BUTTON_RUN_BATCH);
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;
			#endif
			if (::IsWindowVisible(pItem->GetSafeHwnd())) {
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;
			}

			#ifdef SHOW_CT
			pItem = GetDlgItem(IDC_BUTTON_RUN_CT);
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;
			#endif
			if (::IsWindowVisible(pItem->GetSafeHwnd())) {
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;
			}

			pItem = GetDlgItem(IDC_BUTTON_STOP);
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			@@ -164,6 +168,11 @@
			x += 2;

			pItem = GetDlgItem(IDC_BUTTON_PORT_CONFIG);
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;

			pItem = GetDlgItem(IDC_BUTTON_CASSETTE);
			pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
			x += BTN_WIDTH;
			x += 2;
			@@ -225,6 +234,7 @@
			case IDC_BUTTON_ALARM:
			case IDC_BUTTON_SETTINGS:
			case IDC_BUTTON_PORT_CONFIG:
			case IDC_BUTTON_CASSETTE:
			case IDC_BUTTON_ROBOT:
			GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
			break;