Merge Master into V3 Branch

- German translation update
- Virtual power in realtime

Conflicts:
src/DeviceConfiguration.cpp - needed to adjust
to use appsettings for read/write of application
settings.
This commit is contained in:
Mark Liversedge
2011-01-09 19:37:05 +00:00
13 changed files with 357 additions and 280 deletions

View File

@@ -224,6 +224,7 @@ ConfigDialog::devaddClicked()
add.type = devicePage->typeSelector->itemData(devicePage->typeSelector->currentIndex()).toInt();
add.portSpec = devicePage->deviceSpecifier->displayText();
add.deviceProfile = devicePage->deviceProfile->displayText();
add.postProcess = devicePage->virtualPower->currentIndex();
// NOT IMPLEMENTED IN THIS RELEASE XXX
//add.isDefaultDownload = devicePage->isDefaultDownload->isChecked() ? true : false;