Changeset 66626 in vbox
- Timestamp:
- Apr 20, 2017 11:57:56 AM (8 years ago)
- svn:sync-xref-src-repo-rev:
- 114674
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
r66614 r66626 1071 1071 } 1072 1072 1073 void UIMessageCenter::cannotSaveDisplaySettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1074 {1075 error(pParent, MessageType_Error,1076 tr("Cannot save display settings."),1077 formatErrorInfo(comProperties));1078 }1079 1080 void UIMessageCenter::cannotSaveGeneralSettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1081 {1082 error(pParent, MessageType_Error,1083 tr("Cannot save general settings."),1084 formatErrorInfo(comProperties));1085 }1086 1087 void UIMessageCenter::cannotSaveInputSettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1088 {1089 error(pParent, MessageType_Error,1090 tr("Cannot save input settings."),1091 formatErrorInfo(comProperties));1092 }1093 1094 void UIMessageCenter::cannotSaveLanguageSettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1095 {1096 error(pParent, MessageType_Error,1097 tr("Cannot save language settings."),1098 formatErrorInfo(comProperties));1099 }1100 1101 void UIMessageCenter::cannotLoadNetworkSettings(const CVirtualBox &comVBox, QWidget *pParent /* = 0 */)1102 {1103 error(pParent, MessageType_Error,1104 tr("Cannot load network settings."),1105 formatErrorInfo(comVBox));1106 }1107 1108 void UIMessageCenter::cannotLoadNetworkSettings(const CHost &comHost, QWidget *pParent /* = 0 */)1109 {1110 error(pParent, MessageType_Error,1111 tr("Cannot load network settings."),1112 formatErrorInfo(comHost));1113 }1114 1115 void UIMessageCenter::cannotSaveNetworkNatSettings(const CNATNetwork &comNetwork, QWidget *pParent /* = 0 */)1116 {1117 error(pParent, MessageType_Error,1118 tr("Cannot save NAT network settings."),1119 formatErrorInfo(comNetwork));1120 }1121 1122 void UIMessageCenter::cannotSaveNetworkHostSettings(const CHostNetworkInterface &comInterface, QWidget *pParent /* = 0 */)1123 {1124 error(pParent, MessageType_Error,1125 tr("Cannot save host-only network settings."),1126 formatErrorInfo(comInterface));1127 }1128 1129 void UIMessageCenter::cannotSaveDHCPServerSettings(const CDHCPServer &comServer, QWidget *pParent /* = 0 */)1130 {1131 error(pParent, MessageType_Error,1132 tr("Cannot save DHCP server settings."),1133 formatErrorInfo(comServer));1134 }1135 1136 void UIMessageCenter::cannotSaveProxySettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1137 {1138 error(pParent, MessageType_Error,1139 tr("Cannot save proxy settings."),1140 formatErrorInfo(comProperties));1141 }1142 1143 void UIMessageCenter::cannotSaveUpdateSettings(const CSystemProperties &comProperties, QWidget *pParent /* = 0 */)1144 {1145 error(pParent, MessageType_Error,1146 tr("Cannot save update settings."),1147 formatErrorInfo(comProperties));1148 }1149 1150 1073 void UIMessageCenter::warnAboutUnaccessibleUSB(const COMBaseWithEI &object, QWidget *pParent /* = 0*/) const 1151 1074 { … … 1229 1152 QString() /* cancel button text */, 1230 1153 false /* ok button by default? */); 1231 }1232 1233 void UIMessageCenter::cannotSaveAudioSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1234 {1235 error(pParent, MessageType_Error,1236 tr("Cannot save audio settings."),1237 formatErrorInfo(comMachine));1238 }1239 1240 void UIMessageCenter::cannotSaveAudioAdapterSettings(const CAudioAdapter &comAdapter, QWidget *pParent /* = 0 */)1241 {1242 error(pParent, MessageType_Error,1243 tr("Cannot save audio adapter settings."),1244 formatErrorInfo(comAdapter));1245 }1246 1247 void UIMessageCenter::cannotSaveDisplaySettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1248 {1249 error(pParent, MessageType_Error,1250 tr("Cannot save display settings."),1251 formatErrorInfo(comMachine));1252 }1253 1254 void UIMessageCenter::cannotSaveRemoteDisplayServerSettings(const CVRDEServer &comServer, QWidget *pParent /* = 0 */)1255 {1256 error(pParent, MessageType_Error,1257 tr("Cannot save remote display server settings."),1258 formatErrorInfo(comServer));1259 }1260 1261 void UIMessageCenter::cannotSaveGeneralSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1262 {1263 error(pParent, MessageType_Error,1264 tr("Cannot save general settings."),1265 formatErrorInfo(comMachine));1266 }1267 1268 void UIMessageCenter::cannotSaveStorageAttachmentSettings(const CMediumAttachment &comAttachment, QWidget *pParent /* = 0 */)1269 {1270 error(pParent, MessageType_Error,1271 tr("Cannot save storage attachment settings."),1272 formatErrorInfo(comAttachment));1273 }1274 1275 void UIMessageCenter::cannotSaveStorageMediumSettings(const CMedium &comMedium, QWidget *pParent /* = 0 */)1276 {1277 error(pParent, MessageType_Error,1278 tr("Cannot save storage medium settings."),1279 formatErrorInfo(comMedium));1280 }1281 1282 void UIMessageCenter::cannotSaveInterfaceSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1283 {1284 error(pParent, MessageType_Error,1285 tr("Cannot save user interface settings."),1286 formatErrorInfo(comMachine));1287 }1288 1289 void UIMessageCenter::cannotSaveNetworkSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1290 {1291 error(pParent, MessageType_Error,1292 tr("Cannot save network settings."),1293 formatErrorInfo(comMachine));1294 }1295 1296 void UIMessageCenter::cannotSaveNetworkAdapterSettings(const CNetworkAdapter &comAdapter, QWidget *pParent /* = 0 */)1297 {1298 error(pParent, MessageType_Error,1299 tr("Cannot save network adapter settings."),1300 formatErrorInfo(comAdapter));1301 }1302 1303 void UIMessageCenter::cannotSaveNATEngineSettings(const CNATEngine &comEngine, QWidget *pParent /* = 0 */)1304 {1305 error(pParent, MessageType_Error,1306 tr("Cannot save NAT engine settings."),1307 formatErrorInfo(comEngine));1308 }1309 1310 void UIMessageCenter::cannotSaveParallelSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1311 {1312 error(pParent, MessageType_Error,1313 tr("Cannot save parallel ports settings."),1314 formatErrorInfo(comMachine));1315 }1316 1317 void UIMessageCenter::cannotSaveParallelPortSettings(const CParallelPort &comPort, QWidget *pParent /* = 0 */)1318 {1319 error(pParent, MessageType_Error,1320 tr("Cannot save parallel port settings."),1321 formatErrorInfo(comPort));1322 }1323 1324 void UIMessageCenter::cannotSaveSerialSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1325 {1326 error(pParent, MessageType_Error,1327 tr("Cannot save serial ports settings."),1328 formatErrorInfo(comMachine));1329 }1330 1331 void UIMessageCenter::cannotSaveSerialPortSettings(const CSerialPort &comPort, QWidget *pParent /* = 0 */)1332 {1333 error(pParent, MessageType_Error,1334 tr("Cannot save serial port settings."),1335 formatErrorInfo(comPort));1336 }1337 1338 void UIMessageCenter::cannotLoadFoldersSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1339 {1340 error(pParent, MessageType_Error,1341 tr("Cannot load shared folders settings."),1342 formatErrorInfo(comMachine));1343 }1344 1345 void UIMessageCenter::cannotSaveFoldersSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1346 {1347 error(pParent, MessageType_Error,1348 tr("Cannot save shared folders settings."),1349 formatErrorInfo(comMachine));1350 }1351 1352 void UIMessageCenter::cannotLoadFoldersSettings(const CConsole &comConsole, QWidget *pParent /* = 0 */)1353 {1354 error(pParent, MessageType_Error,1355 tr("Cannot load shared folders settings."),1356 formatErrorInfo(comConsole));1357 }1358 1359 void UIMessageCenter::cannotSaveFoldersSettings(const CConsole &comConsole, QWidget *pParent /* = 0 */)1360 {1361 error(pParent, MessageType_Error,1362 tr("Cannot save shared folders settings."),1363 formatErrorInfo(comConsole));1364 }1365 1366 void UIMessageCenter::cannotLoadFolderSettings(const CSharedFolder &comFolder, QWidget *pParent /* = 0 */)1367 {1368 error(pParent, MessageType_Error,1369 tr("Cannot load shared folder settings."),1370 formatErrorInfo(comFolder));1371 }1372 1373 void UIMessageCenter::cannotSaveFolderSettings(const CSharedFolder &comFolder, QWidget *pParent /* = 0 */)1374 {1375 error(pParent, MessageType_Error,1376 tr("Cannot save shared folder settings."),1377 formatErrorInfo(comFolder));1378 }1379 1380 void UIMessageCenter::cannotSaveStorageSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1381 {1382 error(pParent, MessageType_Error,1383 tr("Cannot save storage settings."),1384 formatErrorInfo(comMachine));1385 }1386 1387 void UIMessageCenter::cannotSaveStorageControllerSettings(const CStorageController &comController, QWidget *pParent /* = 0 */)1388 {1389 error(pParent, MessageType_Error,1390 tr("Cannot save storage controller settings."),1391 formatErrorInfo(comController));1392 }1393 1394 void UIMessageCenter::cannotSaveSystemSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1395 {1396 error(pParent, MessageType_Error,1397 tr("Cannot save system settings."),1398 formatErrorInfo(comMachine));1399 }1400 1401 void UIMessageCenter::cannotSaveUSBSettings(const CMachine &comMachine, QWidget *pParent /* = 0 */)1402 {1403 error(pParent, MessageType_Error,1404 tr("Cannot save USB settings."),1405 formatErrorInfo(comMachine));1406 }1407 1408 void UIMessageCenter::cannotSaveUSBControllerSettings(const CUSBController &comController, QWidget *pParent /* = 0 */)1409 {1410 error(pParent, MessageType_Error,1411 tr("Cannot save USB controller settings."),1412 formatErrorInfo(comController));1413 }1414 1415 void UIMessageCenter::cannotSaveUSBDeviceFiltersSettings(const CUSBDeviceFilters &comFilters, QWidget *pParent /* = 0 */)1416 {1417 error(pParent, MessageType_Error,1418 tr("Cannot save USB device filters settings."),1419 formatErrorInfo(comFilters));1420 }1421 1422 void UIMessageCenter::cannotSaveUSBDeviceFilterSettings(const CUSBDeviceFilter &comFilter, QWidget *pParent /* = 0 */)1423 {1424 error(pParent, MessageType_Error,1425 tr("Cannot save USB device filter settings."),1426 formatErrorInfo(comFilter));1427 1154 } 1428 1155 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
r66614 r66626 229 229 void cannotRemoveHostInterface(const CProgress &progress, const QString &strInterfaceName, QWidget *pParent = 0); 230 230 void cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent = 0) const; 231 void cannotSaveDisplaySettings(const CSystemProperties &comProperties, QWidget *pParent = 0);232 void cannotSaveGeneralSettings(const CSystemProperties &comProperties, QWidget *pParent = 0);233 void cannotSaveInputSettings(const CSystemProperties &comProperties, QWidget *pParent = 0);234 void cannotSaveLanguageSettings(const CSystemProperties &comProperties, QWidget *pParent = 0);235 void cannotLoadNetworkSettings(const CVirtualBox &comVBox, QWidget *pParent = 0);236 void cannotLoadNetworkSettings(const CHost &comHost, QWidget *pParent = 0);237 void cannotSaveNetworkNatSettings(const CNATNetwork &comNetwork, QWidget *pParent = 0);238 void cannotSaveNetworkHostSettings(const CHostNetworkInterface &comInterface, QWidget *pParent = 0);239 void cannotSaveDHCPServerSettings(const CDHCPServer &comServer, QWidget *pParent = 0);240 void cannotSaveProxySettings(const CSystemProperties &comProperties, QWidget *pParent = 0);241 void cannotSaveUpdateSettings(const CSystemProperties &comProperties, QWidget *pParent = 0);242 231 243 232 /* API: Machine settings warnings: */ … … 249 238 int confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const; 250 239 int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const; 251 void cannotSaveAudioSettings(const CMachine &comMachine, QWidget *pParent = 0);252 void cannotSaveAudioAdapterSettings(const CAudioAdapter &comAdapter, QWidget *pParent = 0);253 void cannotSaveDisplaySettings(const CMachine &comMachine, QWidget *pParent = 0);254 void cannotSaveRemoteDisplayServerSettings(const CVRDEServer &comServer, QWidget *pParent = 0);255 void cannotSaveGeneralSettings(const CMachine &comMachine, QWidget *pParent = 0);256 void cannotSaveStorageAttachmentSettings(const CMediumAttachment &comAttachment, QWidget *pParent = 0);257 void cannotSaveStorageMediumSettings(const CMedium &comMedium, QWidget *pParent = 0);258 void cannotSaveInterfaceSettings(const CMachine &comMachine, QWidget *pParent = 0);259 void cannotSaveNetworkSettings(const CMachine &comMachine, QWidget *pParent = 0);260 void cannotSaveNetworkAdapterSettings(const CNetworkAdapter &comAdapter, QWidget *pParent = 0);261 void cannotSaveNATEngineSettings(const CNATEngine &comEngine, QWidget *pParent = 0);262 void cannotSaveParallelSettings(const CMachine &comMachine, QWidget *pParent = 0);263 void cannotSaveParallelPortSettings(const CParallelPort &comPort, QWidget *pParent = 0);264 void cannotSaveSerialSettings(const CMachine &comMachine, QWidget *pParent = 0);265 void cannotSaveSerialPortSettings(const CSerialPort &comPort, QWidget *pParent = 0);266 void cannotLoadFoldersSettings(const CMachine &comMachine, QWidget *pParent = 0);267 void cannotSaveFoldersSettings(const CMachine &comMachine, QWidget *pParent = 0);268 void cannotLoadFoldersSettings(const CConsole &comConsole, QWidget *pParent = 0);269 void cannotSaveFoldersSettings(const CConsole &comConsole, QWidget *pParent = 0);270 void cannotLoadFolderSettings(const CSharedFolder &comFolder, QWidget *pParent = 0);271 void cannotSaveFolderSettings(const CSharedFolder &comFolder, QWidget *pParent = 0);272 void cannotSaveStorageSettings(const CMachine &comMachine, QWidget *pParent = 0);273 void cannotSaveStorageControllerSettings(const CStorageController &comController, QWidget *pParent = 0);274 void cannotSaveSystemSettings(const CMachine &comMachine, QWidget *pParent = 0);275 void cannotSaveUSBSettings(const CMachine &comMachine, QWidget *pParent = 0);276 void cannotSaveUSBControllerSettings(const CUSBController &comController, QWidget *pParent = 0);277 void cannotSaveUSBDeviceFiltersSettings(const CUSBDeviceFilters &comFilters, QWidget *pParent = 0);278 void cannotSaveUSBDeviceFilterSettings(const CUSBDeviceFilter &comFilter, QWidget *pParent = 0);279 240 void cannotAttachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0); 280 241 bool warnAboutIncorrectPort(QWidget *pParent = 0) const; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp
r66593 r66626 39 39 , m_fIsValidatorBlocked(true) 40 40 { 41 } 42 43 void UISettingsPage::notifyOperationProgressError(const QString &strErrorInfo) 44 { 45 QMetaObject::invokeMethod(this, 46 "sigOperationProgressError", 47 Qt::BlockingQueuedConnection, 48 Q_ARG(QString, strErrorInfo)); 41 49 } 42 50 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h
r66593 r66626 107 107 virtual void saveFromCacheTo(QVariant &data) = 0; 108 108 109 /** Notifies listeners about particular COM error. 110 * @param strErrorInfo Brings the details of the error happened. */ 111 void notifyOperationProgressError(const QString &strErrorInfo); 112 109 113 /* Validation stuff: */ 110 114 void setValidator(UIPageValidator *pValidator); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp
r66600 r66626 250 250 const UIDataSettingsGlobalDisplay &newDisplayData = m_pCache->data(); 251 251 252 // Here could go changes for m_properties.253 254 /* Show error message if necessary: */255 if (!fSuccess)256 msgCenter().cannotSaveDisplaySettings(m_properties, this);257 258 252 /* Save maximum guest resolution policy and/or value: */ 259 253 if ( fSuccess -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp
r66600 r66626 211 211 /* Show error message if necessary: */ 212 212 if (!fSuccess) 213 msgCenter().cannotSaveGeneralSettings(m_properties, this);213 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_properties)); 214 214 215 215 /* Save new general data from the cache: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
r66600 r66626 1159 1159 const UIDataSettingsGlobalInput &newInputData = m_pCache->data(); 1160 1160 1161 // Here could go changes for m_properties.1162 1163 /* Show error message if necessary: */1164 if (!fSuccess)1165 msgCenter().cannotSaveInputSettings(m_properties, this);1166 1167 1161 /* Save new host-combo shortcut from the cache: */ 1168 1162 const UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString()); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
r66600 r66626 457 457 const UIDataSettingsGlobalLanguage &newLanguageData = m_pCache->data(); 458 458 459 // Here could go changes for m_properties.460 461 /* Show error message if necessary: */462 if (!fSuccess)463 msgCenter().cannotSaveLanguageSettings(m_properties, this);464 465 459 /* Save new language data from the cache: */ 466 460 if (newLanguageData.m_strLanguageId != oldLanguageData.m_strLanguageId) -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
r66623 r66626 1121 1121 /* Show error message if necessary: */ 1122 1122 if (!fSuccess) 1123 msgCenter().cannotLoadNetworkSettings(comVBox, this);1123 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comVBox)); 1124 1124 else 1125 1125 { … … 1238 1238 /* Show error message if necessary: */ 1239 1239 if (!fSuccess) 1240 msgCenter().cannotSaveNetworkNatSettings(comNetwork, this);1240 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comNetwork)); 1241 1241 } 1242 1242 } … … 1333 1333 /* Show error message if necessary: */ 1334 1334 if (!fSuccess) 1335 msgCenter().cannotLoadNetworkSettings(comHost, this);1335 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comHost)); 1336 1336 else 1337 1337 { … … 1381 1381 /* Show error message if necessary: */ 1382 1382 if (!fSuccess) 1383 msgCenter().cannotSaveNetworkHostSettings(comInterface, this);1383 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comInterface)); 1384 1384 else 1385 1385 { … … 1392 1392 /* Show error message if necessary: */ 1393 1393 if (!fSuccess) 1394 msgCenter().cannotLoadNetworkSettings(comVBox, this);1394 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comVBox)); 1395 1395 else 1396 1396 { … … 1415 1415 /* Show error message if necessary: */ 1416 1416 if (!fSuccess) 1417 msgCenter().cannotSaveDHCPServerSettings(comServer, this); 1418 // if (!comServer.isOk()) 1419 // emit sigOperationProgressError(UIMessageCenter::formatErrorInfo(comServer)); 1417 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comServer)); 1420 1418 } 1421 1419 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
r66600 r66626 264 264 const UIDataSettingsGlobalProxy &newProxyData = m_pCache->data(); 265 265 266 // Here could go changes for m_properties.267 268 /* Show error message if necessary: */269 if (!fSuccess)270 msgCenter().cannotSaveProxySettings(m_properties, this);271 272 266 /* Save new proxy data from the cache: */ 273 267 UIProxyManager proxyManager; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
r66600 r66626 259 259 const UIDataSettingsGlobalUpdate &newUpdateData = m_pCache->data(); 260 260 261 // Here could go changes for m_properties.262 263 /* Show error message if necessary: */264 if (!fSuccess)265 msgCenter().cannotSaveUpdateSettings(m_properties, this);266 267 261 /* Save new update data from the cache: */ 268 262 const VBoxUpdateData newData(newUpdateData.m_periodIndex, newUpdateData.m_branchIndex); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp
r66555 r66626 273 273 /* Show error message if necessary: */ 274 274 if (!fSuccess) 275 msgCenter().cannotSaveAudioSettings(m_machine, this);275 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 276 276 else 277 277 { … … 297 297 /* Show error message if necessary: */ 298 298 if (!fSuccess) 299 msgCenter().cannotSaveAudioAdapterSettings(comAdapter, this);299 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comAdapter)); 300 300 } 301 301 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
r66555 r66626 1275 1275 /* Show error message if necessary: */ 1276 1276 if (!fSuccess) 1277 msgCenter().cannotSaveDisplaySettings(m_machine, this);1277 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1278 1278 1279 1279 /* Save guest-screen scale-factor: */ … … 1308 1308 /* Show error message if necessary: */ 1309 1309 if (!fSuccess) 1310 msgCenter().cannotSaveDisplaySettings(m_machine, this);1310 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1311 1311 else 1312 1312 { … … 1346 1346 /* Show error message if necessary: */ 1347 1347 if (!fSuccess) 1348 msgCenter().cannotSaveRemoteDisplayServerSettings(comServer, this);1348 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comServer)); 1349 1349 } 1350 1350 } … … 1485 1485 /* Show error message if necessary: */ 1486 1486 if (!fSuccess) 1487 msgCenter().cannotSaveDisplaySettings(m_machine, this);1487 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1488 1488 } 1489 1489 /* Return result: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
r66555 r66626 717 717 /* Show error message if necessary: */ 718 718 if (!fSuccess) 719 msgCenter().cannotSaveGeneralSettings(m_machine, this);719 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 720 720 } 721 721 /* Return result: */ … … 764 764 /* Show error message if necessary: */ 765 765 if (!fSuccess) 766 msgCenter().cannotSaveGeneralSettings(m_machine, this);766 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 767 767 } 768 768 /* Return result: */ … … 791 791 /* Show error message if necessary: */ 792 792 if (!fSuccess) 793 msgCenter().cannotSaveGeneralSettings(m_machine, this);793 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 794 794 } 795 795 /* Return result: */ … … 834 834 /* Show error message if necessary: */ 835 835 if (!fSuccess) 836 msgCenter().cannotSaveGeneralSettings(m_machine, this);836 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 837 837 838 838 /* For each attachment: */ … … 859 859 /* Show error message if necessary: */ 860 860 if (!fSuccess) 861 msgCenter().cannotSaveStorageAttachmentSettings(comAttachment, this);861 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comAttachment)); 862 862 else 863 863 { … … 913 913 } 914 914 915 // TODO: Decide what to do with it (also below).916 // if (!comMedium.isOk())917 // {918 // QMetaObject::invokeMethod(this, "sigOperationProgressError", Qt::BlockingQueuedConnection,919 // Q_ARG(QString, UIMessageCenter::formatErrorInfo(comMedium)));920 // continue;921 // }922 923 915 /* Create encryption update progress dialog: */ 924 916 QPointer<UIProgress> pDlg; 925 917 if (fSuccess) 926 918 { 927 // TODO: Decide what to do with it (also above).928 // This dialog connected to settings serializer, not to message-center directly.929 // What's the better approach in that case? Probably connect everything to serializer?930 919 pDlg = new UIProgress(comProgress); 931 920 connect(pDlg, SIGNAL(sigProgressChange(ulong, QString, ulong, ulong)), … … 948 937 /* Show error message if necessary: */ 949 938 if (!fSuccess) 950 msgCenter().cannotSaveStorageMediumSettings(comMedium, this);939 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comMedium)); 951 940 } 952 941 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
r66625 r66626 1499 1499 /* Show error message if necessary: */ 1500 1500 if (!fSuccess) 1501 msgCenter().cannotSaveNetworkSettings(m_machine, this);1501 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1502 1502 else 1503 1503 { … … 1601 1601 /* Show error message if necessary: */ 1602 1602 if (!fSuccess) 1603 msgCenter().cannotSaveNetworkAdapterSettings(comAdapter, this);1603 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comAdapter)); 1604 1604 else 1605 1605 { … … 1638 1638 /* Show error message if necessary: */ 1639 1639 if (!fSuccess) 1640 msgCenter().cannotSaveNATEngineSettings(comEngine, this);1640 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comEngine)); 1641 1641 } 1642 1642 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp
r66559 r66626 573 573 /* Show error message if necessary: */ 574 574 if (!fSuccess) 575 msgCenter().cannotSaveParallelSettings(m_machine, this);575 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 576 576 else 577 577 { … … 603 603 /* Show error message if necessary: */ 604 604 if (!fSuccess) 605 msgCenter().cannotSaveParallelPortSettings(comPort, this);605 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comPort)); 606 606 } 607 607 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp
r66555 r66626 869 869 /* Show error message if necessary: */ 870 870 if (!fSuccess) 871 msgCenter().cannotLoadFoldersSettings(m_machine, this);871 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 872 872 873 873 break; … … 883 883 /* Show error message if necessary: */ 884 884 if (!fSuccess) 885 msgCenter().cannotLoadFoldersSettings(m_console, this);885 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_console)); 886 886 887 887 break; … … 915 915 /* Show error message if necessary: */ 916 916 if (!fSuccess) 917 msgCenter().cannotLoadFolderSettings(comCurrentFolder, this);917 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comCurrentFolder)); 918 918 919 919 /* If that's the folder we are looking for => take it: */ … … 988 988 { 989 989 /* Show error message: */ 990 msgCenter().cannotSaveFoldersSettings(m_machine, this);990 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 991 991 } 992 992 break; … … 1001 1001 { 1002 1002 /* Show error message: */ 1003 msgCenter().cannotSaveFoldersSettings(m_console, this);1003 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_console)); 1004 1004 } 1005 1005 break; … … 1054 1054 { 1055 1055 /* Show error message: */ 1056 msgCenter().cannotSaveFoldersSettings(m_machine, this);1056 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1057 1057 } 1058 1058 break; … … 1067 1067 { 1068 1068 /* Show error message: */ 1069 msgCenter().cannotSaveFoldersSettings(m_console, this);1069 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_console)); 1070 1070 } 1071 1071 break; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp
r66559 r66626 630 630 /* Show error message if necessary: */ 631 631 if (!fSuccess) 632 msgCenter().cannotSaveSerialSettings(m_machine, this);632 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 633 633 else 634 634 { … … 688 688 /* Show error message if necessary: */ 689 689 if (!fSuccess) 690 msgCenter().cannotSaveSerialPortSettings(comPort, this);690 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comPort)); 691 691 } 692 692 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
r66567 r66626 4026 4026 /* Show error message if necessary: */ 4027 4027 if (!fSuccess) 4028 msgCenter().cannotSaveStorageSettings(m_machine, this);4028 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4029 4029 } 4030 4030 /* Return result: */ … … 4058 4058 /* Show error message if necessary: */ 4059 4059 if (!fSuccess) 4060 msgCenter().cannotSaveStorageSettings(m_machine, this);4060 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4061 4061 else 4062 4062 { … … 4099 4099 /* Show error message if necessary: */ 4100 4100 if (!fSuccess) 4101 msgCenter().cannotSaveStorageControllerSettings(comController, this);4101 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comController)); 4102 4102 4103 4103 /* For each attachment: */ … … 4135 4135 /* Show error message if necessary: */ 4136 4136 if (!fSuccess) 4137 msgCenter().cannotSaveStorageSettings(m_machine, this);4137 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4138 4138 else 4139 4139 { … … 4177 4177 /* Show error message if necessary: */ 4178 4178 if (!fSuccess) 4179 msgCenter().cannotSaveStorageControllerSettings(comController, this);4179 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comController)); 4180 4180 4181 4181 /* For each attachment ('removing' step): */ … … 4245 4245 /* Show error message if necessary: */ 4246 4246 if (!fSuccess) 4247 msgCenter().cannotSaveStorageSettings(m_machine, this);4247 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4248 4248 } 4249 4249 /* Return result: */ … … 4335 4335 /* Show error message if necessary: */ 4336 4336 if (!fSuccess) 4337 msgCenter().cannotSaveStorageSettings(m_machine, this);4337 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4338 4338 } 4339 4339 /* Return result: */ … … 4423 4423 /* Show error message if necessary: */ 4424 4424 if (!fSuccess) 4425 msgCenter().cannotSaveStorageSettings(m_machine, this);4425 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 4426 4426 } 4427 4427 /* Return result: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
r66555 r66626 1139 1139 /* Show error message if necessary: */ 1140 1140 if (!fSuccess) 1141 msgCenter().cannotSaveSystemSettings(m_machine, this);1141 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1142 1142 } 1143 1143 /* Return result: */ … … 1178 1178 /* Show error message if necessary: */ 1179 1179 if (!fSuccess) 1180 msgCenter().cannotSaveSystemSettings(m_machine, this);1180 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1181 1181 } 1182 1182 /* Return result: */ … … 1217 1217 /* Show error message if necessary: */ 1218 1218 if (!fSuccess) 1219 msgCenter().cannotSaveSystemSettings(m_machine, this);1219 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1220 1220 } 1221 1221 /* Return result: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
r66555 r66626 1015 1015 /* Show error message if necessary: */ 1016 1016 if (!fSuccess) 1017 msgCenter().cannotSaveUSBSettings(m_machine, this);1017 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1018 1018 else 1019 1019 { … … 1060 1060 /* Show error message if necessary: */ 1061 1061 if (!fSuccess) 1062 msgCenter().cannotSaveUSBSettings(m_machine, this);1062 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1063 1063 1064 1064 /* For each controller: */ … … 1085 1085 /* Show error message if necessary: */ 1086 1086 if (!fSuccess) 1087 msgCenter().cannotSaveUSBControllerSettings(comController, this);1087 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comController)); 1088 1088 else 1089 1089 { … … 1101 1101 /* Show error message if necessary: */ 1102 1102 if (!fSuccess) 1103 msgCenter().cannotSaveUSBSettings(m_machine, this);1103 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1104 1104 } 1105 1105 } … … 1138 1138 /* Show error message if necessary: */ 1139 1139 if (!fSuccess) 1140 msgCenter().cannotSaveUSBSettings(m_machine, this);1140 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1141 1141 else 1142 1142 { … … 1160 1160 /* Show error message if necessary: */ 1161 1161 if (!fSuccess) 1162 msgCenter().cannotSaveUSBSettings(m_machine, this);1162 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1163 1163 } 1164 1164 … … 1188 1188 /* Show error message if necessary: */ 1189 1189 if (!fSuccess) 1190 msgCenter().cannotSaveUSBSettings(m_machine, this);1190 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1191 1191 } 1192 1192 … … 1209 1209 /* Show error message if necessary: */ 1210 1210 if (!fSuccess) 1211 msgCenter().cannotSaveUSBSettings(m_machine, this);1211 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(m_machine)); 1212 1212 } 1213 1213 … … 1236 1236 /* Show error message if necessary: */ 1237 1237 if (!fSuccess) 1238 msgCenter().cannotSaveUSBDeviceFiltersSettings(comFiltersObject, this);1238 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comFiltersObject)); 1239 1239 } 1240 1240 /* Return result: */ … … 1255 1255 /* Show error message if necessary: */ 1256 1256 if (!fSuccess) 1257 msgCenter().cannotSaveUSBDeviceFiltersSettings(comFiltersObject, this);1257 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comFiltersObject)); 1258 1258 else 1259 1259 { … … 1315 1315 /* Show error message if necessary: */ 1316 1316 if (!fSuccess) 1317 msgCenter().cannotSaveUSBDeviceFilterSettings(comFilter, this);1317 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comFilter)); 1318 1318 else 1319 1319 { … … 1324 1324 /* Show error message if necessary: */ 1325 1325 if (!fSuccess) 1326 msgCenter().cannotSaveUSBDeviceFiltersSettings(comFiltersObject, this);1326 notifyOperationProgressError(UIMessageCenter::formatErrorInfo(comFiltersObject)); 1327 1327 } 1328 1328 }
Note:
See TracChangeset
for help on using the changeset viewer.