1.3 merge r870 into trunk and 1.4

This commit is contained in:
tehwan 2011-01-21 03:56:00 +00:00
parent 4496f36a80
commit bac6e971e3
7 changed files with 118 additions and 15 deletions

View file

@ -73,6 +73,12 @@ CGlobalOptions::init(HWND hwnd)
setItemChecked(child, false);
child = getItem(hwnd, IDC_GLOBAL_TWO_TAP_TIME);
setWindowText(child, buffer);
child = getItem(hwnd, IDC_GLOBAL_NEEDS_SHIFT);
setItemChecked(child, false);
child = getItem(hwnd, IDC_GLOBAL_NEEDS_CONTROL);
setItemChecked(child, false);
child = getItem(hwnd, IDC_GLOBAL_NEEDS_ALT);
setItemChecked(child, false);
sprintf(buffer, "%d", m_heartbeatTime);
child = getItem(hwnd, IDC_GLOBAL_HEARTBEAT_CHECK);
setItemChecked(child, false);
@ -110,6 +116,18 @@ CGlobalOptions::init(HWND hwnd)
setWindowText(child, buffer);
}
}
else if (id == kOptionScreenSwitchNeedsShift) {
child = getItem(hwnd, IDC_GLOBAL_NEEDS_SHIFT);
setItemChecked(child, (value != 0));
}
else if (id == kOptionScreenSwitchNeedsControl) {
child = getItem(hwnd, IDC_GLOBAL_NEEDS_CONTROL);
setItemChecked(child, (value != 0));
}
else if (id == kOptionScreenSwitchNeedsAlt) {
child = getItem(hwnd, IDC_GLOBAL_NEEDS_ALT);
setItemChecked(child, (value != 0));
}
else if (id == kOptionHeartbeat) {
if (value > 0) {
sprintf(buffer, "%d", value);
@ -197,6 +215,9 @@ CGlobalOptions::save(HWND hwnd)
m_config->removeOption("", kOptionScreenSaverSync);
m_config->removeOption("", kOptionRelativeMouseMoves);
m_config->removeOption("", kOptionWin32KeepForeground);
m_config->removeOption("", kOptionScreenSwitchNeedsAlt);
m_config->removeOption("", kOptionScreenSwitchNeedsShift);
m_config->removeOption("", kOptionScreenSwitchNeedsControl);
// add requested options
child = getItem(hwnd, IDC_GLOBAL_DELAY_CHECK);
@ -207,6 +228,18 @@ CGlobalOptions::save(HWND hwnd)
if (isItemChecked(child)) {
m_config->addOption("", kOptionScreenSwitchTwoTap, newTwoTapTime);
}
child = getItem(hwnd, IDC_GLOBAL_NEEDS_SHIFT);
if (isItemChecked(child)) {
m_config->addOption("", kOptionScreenSwitchNeedsShift, 1);
}
child = getItem(hwnd, IDC_GLOBAL_NEEDS_CONTROL);
if (isItemChecked(child)) {
m_config->addOption("", kOptionScreenSwitchNeedsControl, 1);
}
child = getItem(hwnd, IDC_GLOBAL_NEEDS_ALT);
if (isItemChecked(child)) {
m_config->addOption("", kOptionScreenSwitchNeedsAlt, 1);
}
child = getItem(hwnd, IDC_GLOBAL_HEARTBEAT_CHECK);
if (isItemChecked(child)) {
m_config->addOption("", kOptionHeartbeat, newHeartbeatTime);