Changeset 68394 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Aug 11, 2017 1:14:04 PM (7 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 15 deleted
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r68392 r68394 418 418 src/settings/machine/UIMachineSettingsInterface.h \ 419 419 src/settings/machine/UIMachineSettingsNetwork.h \ 420 src/settings/machine/UIMachineSettingsParallel.h \421 420 src/settings/machine/UIMachineSettingsPortForwardingDlg.h \ 422 421 src/settings/machine/UIMachineSettingsSF.h \ … … 560 559 src/settings/global/UIGlobalSettingsInput.cpp \ 561 560 src/settings/machine/UIMachineSettingsNetwork.cpp \ 562 src/settings/machine/UIMachineSettingsParallel.cpp \563 561 src/settings/machine/UIMachineSettingsSerial.cpp \ 564 562 src/settings/machine/UIMachineSettingsStorage.cpp \ … … 736 734 src/settings/machine/UIMachineSettingsInterface.cpp \ 737 735 src/settings/machine/UIMachineSettingsNetwork.cpp \ 738 src/settings/machine/UIMachineSettingsParallel.cpp \739 736 src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \ 740 737 src/settings/machine/UIMachineSettingsSF.cpp \ -
trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro
r67535 r68394 40 40 src/settings/machine/UIMachineSettingsNetwork.ui \ 41 41 src/settings/machine/UIMachineSettingsSerial.ui \ 42 src/settings/machine/UIMachineSettingsParallel.ui \43 42 src/settings/machine/UIMachineSettingsUSB.ui \ 44 43 src/settings/machine/UIMachineSettingsUSBFilterDetails.ui \ -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
r68368 r68394 29 29 <file alias="os_xandros.png">images/os_xandros.png</file> 30 30 <file alias="os_xandros_64.png">images/os_xandros_64.png</file> 31 <file alias="parallel_port_16px.png">images/parallel_port_16px.png</file>32 <file alias="parallel_port_24px.png">images/parallel_port_24px.png</file>33 <file alias="parallel_port_32px.png">images/parallel_port_32px.png</file>34 <file alias="parallel_port_warning_16px.png">images/parallel_port_warning_16px.png</file>35 31 <file alias="pin_16px.png">images/pin_16px.png</file> 36 32 <file alias="preview_empty_16to10_242x167px.png">images/preview_empty_16to10_242x167px.png</file> -
trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc
r68368 r68394 38 38 <file alias="os_xandros_64_hidpi.png">images/hidpi/os_xandros_64_hidpi.png</file> 39 39 <file alias="os_xandros_hidpi.png">images/hidpi/os_xandros_hidpi.png</file> 40 <file alias="parallel_port_16px_hidpi.png">images/hidpi/parallel_port_16px_hidpi.png</file>41 <file alias="parallel_port_24px_hidpi.png">images/hidpi/parallel_port_24px_hidpi.png</file>42 <file alias="parallel_port_32px_hidpi.png">images/hidpi/parallel_port_32px_hidpi.png</file>43 <file alias="parallel_port_warning_16px_hidpi.png">images/hidpi/parallel_port_warning_16px_hidpi.png</file>44 40 <file alias="pin_16px_hidpi.png">images/hidpi/pin_16px_hidpi.png</file> 45 41 <file alias="preview_empty_16to10_242x167px_hidpi.png">images/hidpi/preview_empty_16to10_242x167px_hidpi.png</file> -
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
r68342 r68394 976 976 case DetailsElementType_Network: strResult = QApplication::translate("VBoxGlobal", "Network", "DetailsElementType"); break; 977 977 case DetailsElementType_Serial: strResult = QApplication::translate("VBoxGlobal", "Serial ports", "DetailsElementType"); break; 978 #ifdef VBOX_WITH_PARALLEL_PORTS979 case DetailsElementType_Parallel: strResult = QApplication::translate("VBoxGlobal", "Parallel ports", "DetailsElementType"); break;980 #endif /* VBOX_WITH_PARALLEL_PORTS */981 978 case DetailsElementType_USB: strResult = QApplication::translate("VBoxGlobal", "USB", "DetailsElementType"); break; 982 979 case DetailsElementType_SF: strResult = QApplication::translate("VBoxGlobal", "Shared folders", "DetailsElementType"); break; … … 1006 1003 keys << QApplication::translate("VBoxGlobal", "Network", "DetailsElementType"); values << DetailsElementType_Network; 1007 1004 keys << QApplication::translate("VBoxGlobal", "Serial ports", "DetailsElementType"); values << DetailsElementType_Serial; 1008 #ifdef VBOX_WITH_PARALLEL_PORTS1009 keys << QApplication::translate("VBoxGlobal", "Parallel ports", "DetailsElementType"); values << DetailsElementType_Parallel;1010 #endif /* VBOX_WITH_PARALLEL_PORTS */1011 1005 keys << QApplication::translate("VBoxGlobal", "USB", "DetailsElementType"); values << DetailsElementType_USB; 1012 1006 keys << QApplication::translate("VBoxGlobal", "Shared folders", "DetailsElementType"); values << DetailsElementType_SF; … … 1034 1028 case DetailsElementType_Network: strResult = "network"; break; 1035 1029 case DetailsElementType_Serial: strResult = "serialPorts"; break; 1036 #ifdef VBOX_WITH_PARALLEL_PORTS1037 case DetailsElementType_Parallel: strResult = "parallelPorts"; break;1038 #endif /* VBOX_WITH_PARALLEL_PORTS */1039 1030 case DetailsElementType_USB: strResult = "usb"; break; 1040 1031 case DetailsElementType_SF: strResult = "sharedFolders"; break; … … 1064 1055 keys << "network"; values << DetailsElementType_Network; 1065 1056 keys << "serialPorts"; values << DetailsElementType_Serial; 1066 #ifdef VBOX_WITH_PARALLEL_PORTS1067 keys << "parallelPorts"; values << DetailsElementType_Parallel;1068 #endif /* VBOX_WITH_PARALLEL_PORTS */1069 1057 keys << "usb"; values << DetailsElementType_USB; 1070 1058 keys << "sharedFolders"; values << DetailsElementType_SF; … … 1091 1079 case DetailsElementType_Network: return UIIconPool::iconSet(":/nw_16px.png"); 1092 1080 case DetailsElementType_Serial: return UIIconPool::iconSet(":/serial_port_16px.png"); 1093 #ifdef VBOX_WITH_PARALLEL_PORTS1094 case DetailsElementType_Parallel: return UIIconPool::iconSet(":/parallel_port_16px.png");1095 #endif /* VBOX_WITH_PARALLEL_PORTS */1096 1081 case DetailsElementType_USB: return UIIconPool::iconSet(":/usb_16px.png"); 1097 1082 case DetailsElementType_SF: return UIIconPool::iconSet(":/sf_16px.png"); … … 1317 1302 case MachineSettingsPageType_Ports: strResult = "Ports"; break; 1318 1303 case MachineSettingsPageType_Serial: strResult = "Serial"; break; 1319 case MachineSettingsPageType_Parallel: strResult = "Parallel"; break;1320 1304 case MachineSettingsPageType_USB: strResult = "USB"; break; 1321 1305 case MachineSettingsPageType_SF: strResult = "SharedFolders"; break; … … 1344 1328 keys << "Ports"; values << MachineSettingsPageType_Ports; 1345 1329 keys << "Serial"; values << MachineSettingsPageType_Serial; 1346 keys << "Parallel"; values << MachineSettingsPageType_Parallel;1347 1330 keys << "USB"; values << MachineSettingsPageType_USB; 1348 1331 keys << "SharedFolders"; values << MachineSettingsPageType_SF; … … 1368 1351 case MachineSettingsPageType_Ports: return UIIconPool::pixmap(":/serial_port_warning_16px.png"); 1369 1352 case MachineSettingsPageType_Serial: return UIIconPool::pixmap(":/serial_port_warning_16px.png"); 1370 case MachineSettingsPageType_Parallel: return UIIconPool::pixmap(":/parallel_port_warning_16px.png");1371 1353 case MachineSettingsPageType_USB: return UIIconPool::pixmap(":/usb_warning_16px.png"); 1372 1354 case MachineSettingsPageType_SF: return UIIconPool::pixmap(":/sf_warning_16px.png"); … … 1732 1714 case InformationElementType_Network: strResult = QApplication::translate("VBoxGlobal", "Network", "InformationElementType"); break; 1733 1715 case InformationElementType_Serial: strResult = QApplication::translate("VBoxGlobal", "Serial ports", "InformationElementType"); break; 1734 #ifdef VBOX_WITH_PARALLEL_PORTS1735 case InformationElementType_Parallel: strResult = QApplication::translate("VBoxGlobal", "Parallel ports", "InformationElementType"); break;1736 #endif /* VBOX_WITH_PARALLEL_PORTS */1737 1716 case InformationElementType_USB: strResult = QApplication::translate("VBoxGlobal", "USB", "InformationElementType"); break; 1738 1717 case InformationElementType_SharedFolders: strResult = QApplication::translate("VBoxGlobal", "Shared folders", "InformationElementType"); break; … … 1765 1744 keys << QApplication::translate("VBoxGlobal", "Network", "InformationElementType"); values << InformationElementType_Network; 1766 1745 keys << QApplication::translate("VBoxGlobal", "Serial ports", "InformationElementType"); values << InformationElementType_Serial; 1767 #ifdef VBOX_WITH_PARALLEL_PORTS1768 keys << QApplication::translate("VBoxGlobal", "Parallel ports", "InformationElementType"); values << InformationElementType_Parallel;1769 #endif /* VBOX_WITH_PARALLEL_PORTS */1770 1746 keys << QApplication::translate("VBoxGlobal", "USB", "InformationElementType"); values << InformationElementType_USB; 1771 1747 keys << QApplication::translate("VBoxGlobal", "Shared folders", "InformationElementType"); values << InformationElementType_SharedFolders; … … 1796 1772 case InformationElementType_Network: strResult = "network"; break; 1797 1773 case InformationElementType_Serial: strResult = "serialPorts"; break; 1798 #ifdef VBOX_WITH_PARALLEL_PORTS1799 case InformationElementType_Parallel: strResult = "parallelPorts"; break;1800 #endif /* VBOX_WITH_PARALLEL_PORTS */1801 1774 case InformationElementType_USB: strResult = "usb"; break; 1802 1775 case InformationElementType_SharedFolders: strResult = "sharedFolders"; break; … … 1827 1800 keys << "network"; values << InformationElementType_Network; 1828 1801 keys << "serialPorts"; values << InformationElementType_Serial; 1829 #ifdef VBOX_WITH_PARALLEL_PORTS1830 keys << "parallelPorts"; values << InformationElementType_Parallel;1831 #endif /* VBOX_WITH_PARALLEL_PORTS */1832 1802 keys << "usb"; values << InformationElementType_USB; 1833 1803 keys << "sharedFolders"; values << InformationElementType_SharedFolders; … … 1855 1825 case InformationElementType_Network: return UIIconPool::iconSet(":/nw_16px.png"); 1856 1826 case InformationElementType_Serial: return UIIconPool::iconSet(":/serial_port_16px.png"); 1857 #ifdef VBOX_WITH_PARALLEL_PORTS1858 case InformationElementType_Parallel: return UIIconPool::iconSet(":/parallel_port_16px.png");1859 #endif /* VBOX_WITH_PARALLEL_PORTS */1860 1827 case InformationElementType_USB: return UIIconPool::iconSet(":/usb_16px.png"); 1861 1828 case InformationElementType_SharedFolders: return UIIconPool::iconSet(":/sf_16px.png"); -
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
r68304 r68394 573 573 MachineSettingsPageType_Ports, 574 574 MachineSettingsPageType_Serial, 575 MachineSettingsPageType_Parallel,576 575 MachineSettingsPageType_USB, 577 576 MachineSettingsPageType_SF, … … 635 634 DetailsElementType_Network, 636 635 DetailsElementType_Serial, 637 #ifdef VBOX_WITH_PARALLEL_PORTS638 DetailsElementType_Parallel,639 #endif /* VBOX_WITH_PARALLEL_PORTS */640 636 DetailsElementType_USB, 641 637 DetailsElementType_SF, … … 754 750 InformationElementType_Network, 755 751 InformationElementType_Serial, 756 #ifdef VBOX_WITH_PARALLEL_PORTS757 InformationElementType_Parallel,758 #endif /* VBOX_WITH_PARALLEL_PORTS */759 752 InformationElementType_USB, 760 753 InformationElementType_SharedFolders, -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
r68190 r68394 61 61 # include "CAudioAdapter.h" 62 62 # include "CNATEngine.h" 63 # include "CParallelPort.h"64 63 # include "CSerialPort.h" 65 64 # include "CSharedFolder.h" -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
r68315 r68394 103 103 # include "CNetworkAdapter.h" 104 104 # include "CSerialPort.h" 105 # include "CParallelPort.h"106 105 # include "CUSBController.h" 107 106 # include "CHostUSBDevice.h" -
trunk/src/VBox/Frontends/VirtualBox/src/precomp.h
r68392 r68394 385 385 #include "CNetworkAdapter.h" 386 386 //#include "CNetworkAdapterChangedEvent.h" - only used once 387 #include "CParallelPort.h"388 387 #include "CProgress.h" 389 388 //#include "CRuntimeErrorEvent.h" - only used once … … 517 516 #include "UIMachineSettingsInterface.h" 518 517 #include "UIMachineSettingsNetwork.h" 519 #include "UIMachineSettingsParallel.h"520 518 #include "UIMachineSettingsPortForwardingDlg.h" 521 519 #include "UIMachineSettingsSF.h" -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp
r65337 r68394 127 127 } 128 128 129 #ifdef VBOX_WITH_PARALLEL_PORTS130 /* Create parallel-ports data-item: */131 UIInformationDataItem *pParallelPorts = new UIInformationDataParallelPorts(m_machine, m_console, m_pModel);132 AssertPtrReturnVoid(pParallelPorts);133 {134 /* Add parallel-ports data-item to model: */135 m_pModel->addItem(pParallelPorts);136 }137 #endif /* VBOX_WITH_PARALLEL_PORTS */138 139 129 /* Create usb data-item: */ 140 130 UIInformationDataItem *pUSB = new UIInformationDataUSB(m_machine, m_console, m_pModel); -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp
r65891 r68394 38 38 # include "CVRDEServer.h" 39 39 # include "CAudioAdapter.h" 40 # include "CParallelPort.h"41 40 # include "CSharedFolder.h" 42 41 # include "CUSBController.h" … … 506 505 507 506 508 #ifdef VBOX_WITH_PARALLEL_PORTS509 /*********************************************************************************************************************************510 * Class UIInformationDataParallelPorts implementation. *511 *********************************************************************************************************************************/512 513 UIInformationDataParallelPorts::UIInformationDataParallelPorts(const CMachine &machine, const CConsole &console, UIInformationModel *pModel)514 : UIInformationDataItem(InformationElementType_Parallel, machine, console, pModel)515 {516 }517 518 QVariant UIInformationDataParallelPorts::data(const QModelIndex &index, int role) const519 {520 /* For particular role: */521 switch (role)522 {523 case Qt::DecorationRole:524 {525 return QString(":/parallel_port_16px.png");526 }527 528 case Qt::UserRole + 1:529 {530 ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetParallelPortCount();531 for (ulong slot = 0; slot < count; slot ++)532 {533 CParallelPort port = m_machine.GetParallelPort(slot);534 if (port.GetEnabled())535 {536 QString data = vboxGlobal().toLPTPortName(port.GetIRQ(), port.GetIOBase()) +537 QString(" (<nobr>%1</nobr>)")538 .arg(QDir::toNativeSeparators(port.GetPath()));539 p_text << UITextTableLine(tr("Port %1", "details report (parallel ports)").arg(port.GetSlot() + 1), data);540 }541 }542 if (p_text.count() == 0)543 p_text << UITextTableLine(tr("Disabled", "details report (parallel ports)"), QString());544 }545 546 default:547 break;548 }549 return QVariant();550 }551 #endif /* VBOX_WITH_PARALLEL_PORTS */552 553 554 507 /********************************************************************************************************************************* 555 508 * Class UIInformationDataUSB implementation. * -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.h
r65287 r68394 203 203 204 204 205 #ifdef VBOX_WITH_PARALLEL_PORTS206 /** UIInformationDataItem extension for the details-element type 'Parallel ports'. */207 class UIInformationDataParallelPorts : public UIInformationDataItem208 {209 Q_OBJECT;210 211 public:212 213 /** Constructs details-element object.214 * @param machine Brings the machine reference.215 * @param console Brings the machine console reference.216 * @param pModel Brings the information model this item belings to. */217 UIInformationDataParallelPorts(const CMachine &machine, const CConsole &console, UIInformationModel *pModel);218 219 /** Returns data for item specified by @a index for the @a iRole. */220 virtual QVariant data(const QModelIndex &index, int iRole = Qt::DisplayRole) const;221 };222 #endif /* VBOX_WITH_PARALLEL_PORTS */223 224 225 205 /** UIInformationDataItem extension for the details-element type 'USB'. */ 226 206 class UIInformationDataUSB : public UIInformationDataItem -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp
r68366 r68394 53 53 # include "CMediumAttachment.h" 54 54 # include "CNetworkAdapter.h" 55 # ifdef VBOX_WITH_PARALLEL_PORTS56 # include "CParallelPort.h"57 # endif58 55 # include "CSerialPort.h" 59 56 # include "CSharedFolder.h" … … 963 960 AssertPtrReturnVoid(m_details[DetailsElementType_Serial]); 964 961 pLayout2->addWidget(m_details[DetailsElementType_Serial]); 965 966 #ifdef VBOX_WITH_PARALLEL_PORTS967 /* Create 'Parallel' element: */968 m_details[DetailsElementType_Parallel] = createDetailsElement(DetailsElementType_Parallel);969 AssertPtrReturnVoid(m_details[DetailsElementType_Parallel]);970 pLayout2->addWidget(m_details[DetailsElementType_Parallel]);971 #endif972 962 973 963 /* Create 'USB' element: */ … … 1669 1659 break; 1670 1660 } 1671 #ifdef VBOX_WITH_PARALLEL_PORTS1672 case DetailsElementType_Parallel:1673 {1674 /* Nothing: */1675 int iRowCount = 0;1676 QString strItem;1677 1678 /* Enumerate all the serial ports (up to acquired/limited count): */1679 const ulong iCount = vboxGlobal().virtualBox().GetSystemProperties().GetParallelPortCount();1680 for (ulong iSlot = 0; iSlot < iCount; ++iSlot)1681 {1682 /* Get current parallel port: */1683 const CParallelPort &comParallel = comMachine.GetParallelPort(iSlot);1684 if (comParallel.GetEnabled())1685 {1686 /* Compose the data: */1687 QString strData = toLPTPortName(comParallel.GetIRQ(), comParallel.GetIOBase())1688 + QString(" (<nobr>%1</nobr>)").arg(QDir::toNativeSeparators(comParallel.GetPath()));1689 /* Here goes the record: */1690 ++iRowCount;1691 strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Port %1", "details (parallel)")1692 .arg(comParallel.GetSlot() + 1),1693 strData);1694 }1695 }1696 1697 /* Handle side-case: */1698 if (strItem.isNull())1699 {1700 ++iRowCount;1701 strItem = QString(sSectionItemTpl1).arg(QApplication::translate("UIGDetails", "Disabled", "details (parallel)"));1702 }1703 1704 /* Append report: */1705 strReport += strSectionTpl1706 .arg(1 + iRowCount) /* rows */1707 .arg("details://parallelPorts", /* icon */1708 QString::number(iIconArea), /* icon area */1709 gpConverter->toString(enmType), /* title */1710 strItem); /* items */1711 1712 break;1713 }1714 #endif /* VBOX_WITH_PARALLEL_PORTS */1715 1661 case DetailsElementType_USB: 1716 1662 { -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
r68340 r68394 46 46 # include "CNetworkAdapter.h" 47 47 # include "CSerialPort.h" 48 # include "CParallelPort.h"49 48 # include "CUSBController.h" 50 49 # include "CUSBDeviceFilters.h" … … 742 741 743 742 744 #ifdef VBOX_WITH_PARALLEL_PORTS745 void UIGDetailsUpdateTaskParallel::run()746 {747 /* Acquire corresponding machine: */748 CMachine machine = property("machine").value<CMachine>();749 if (machine.isNull())750 return;751 752 /* Prepare table: */753 UITextTable table;754 755 /* Gather information: */756 if (machine.GetAccessible())757 {758 bool fSomeInfo = false;759 ulong uCount = vboxGlobal().virtualBox().GetSystemProperties().GetParallelPortCount();760 for (ulong uSlot = 0; uSlot < uCount; ++uSlot)761 {762 const CParallelPort &port = machine.GetParallelPort(uSlot);763 if (port.GetEnabled())764 {765 QString data = vboxGlobal().toLPTPortName(port.GetIRQ(), port.GetIOBase()) +766 QString(" (<nobr>%1</nobr>)").arg(QDir::toNativeSeparators(port.GetPath()));767 table << UITextTableLine(QApplication::translate("UIGDetails", "Port %1", "details (parallel)").arg(port.GetSlot() + 1), data);768 fSomeInfo = true;769 }770 }771 if (!fSomeInfo)772 table << UITextTableLine(QApplication::translate("UIGDetails", "Disabled", "details (parallel)"), QString());773 }774 else775 table << UITextTableLine(QApplication::translate("UIGDetails", "Information Inaccessible", "details"), QString());776 777 /* Save the table as property: */778 setProperty("table", QVariant::fromValue(table));779 }780 #endif /* VBOX_WITH_PARALLEL_PORTS */781 782 783 743 void UIGDetailsUpdateTaskUSB::run() 784 744 { -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h
r62493 r68394 368 368 369 369 370 #ifdef VBOX_WITH_PARALLEL_PORTS371 /** UITask extension used as update task for the details-element type 'Parallel'. */372 class UIGDetailsUpdateTaskParallel : public UIGDetailsUpdateTask373 {374 Q_OBJECT;375 376 public:377 378 /** Constructs update task passing @a machine to the base-class. */379 UIGDetailsUpdateTaskParallel(const CMachine &machine)380 : UIGDetailsUpdateTask(machine) {}381 382 private:383 384 /** Contains update task body. */385 void run();386 };387 388 /** UIGDetailsElementInterface extension for the details-element type 'Parallel'. */389 class UIGDetailsElementParallel : public UIGDetailsElementInterface390 {391 Q_OBJECT;392 393 public:394 395 /** Constructs details-element object for passed @a pParent set.396 * @param fOpened brings whether the details-element should be visually opened. */397 UIGDetailsElementParallel(UIGDetailsSet *pParent, bool fOpened)398 : UIGDetailsElementInterface(pParent, DetailsElementType_Parallel, fOpened) {}399 400 private:401 402 /** Creates update task for this element. */403 UITask* createUpdateTask() { return new UIGDetailsUpdateTaskParallel(machine()); }404 };405 #endif /* VBOX_WITH_PARALLEL_PORTS */406 407 408 370 /** UITask extension used as update task for the details-element type 'USB'. */ 409 371 class UIGDetailsUpdateTaskUSB : public UIGDetailsUpdateTask -
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp
r63764 r68394 385 385 case DetailsElementType_Network: 386 386 case DetailsElementType_Serial: 387 #ifdef VBOX_WITH_PARALLEL_PORTS388 case DetailsElementType_Parallel:389 #endif390 387 case DetailsElementType_USB: 391 388 case DetailsElementType_SF: … … 446 443 case DetailsElementType_Network: 447 444 case DetailsElementType_Serial: 448 #ifdef VBOX_WITH_PARALLEL_PORTS449 case DetailsElementType_Parallel:450 #endif451 445 case DetailsElementType_USB: 452 446 case DetailsElementType_SF: … … 502 496 case DetailsElementType_Network: 503 497 case DetailsElementType_Serial: 504 #ifdef VBOX_WITH_PARALLEL_PORTS505 case DetailsElementType_Parallel:506 #endif507 498 case DetailsElementType_USB: 508 499 case DetailsElementType_SF: … … 592 583 case DetailsElementType_Network: return new UIGDetailsElementNetwork(this, fOpen); 593 584 case DetailsElementType_Serial: return new UIGDetailsElementSerial(this, fOpen); 594 #ifdef VBOX_WITH_PARALLEL_PORTS595 case DetailsElementType_Parallel: return new UIGDetailsElementParallel(this, fOpen);596 #endif597 585 case DetailsElementType_USB: return new UIGDetailsElementUSB(this, fOpen); 598 586 case DetailsElementType_SF: return new UIGDetailsElementSF(this, fOpen); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
r66593 r68394 51 51 # include "UIMachineSettingsNetwork.h" 52 52 # include "UIMachineSettingsSerial.h" 53 # include "UIMachineSettingsParallel.h"54 53 # include "UIMachineSettingsUSB.h" 55 54 # include "UIMachineSettingsSF.h" … … 419 418 break; 420 419 } 421 /* Parallel page: */422 case MachineSettingsPageType_Parallel:423 {424 pSettingsPage = new UIMachineSettingsParallelPage;425 addItem(":/parallel_port_32px.png", ":/parallel_port_24px.png", ":/parallel_port_16px.png",426 iPageIndex, "#parallelPorts", pSettingsPage, MachineSettingsPageType_Ports);427 break;428 }429 420 /* USB page: */ 430 421 case MachineSettingsPageType_USB: … … 598 589 m_pSelector->widget()->setWhatsThis(tr("Allows to navigate through VM Settings categories")); 599 590 600 /* We have to make sure that the Network, Serial & Parallelpages are retranslated591 /* We have to make sure that the Network, Serial pages are retranslated 601 592 * before they are revalidated. Cause: They do string comparing within 602 593 * vboxGlobal which is retranslated at that point already: */ … … 606 597 if (QWidget *pPage = m_pSelector->idToPage(MachineSettingsPageType_Serial)) 607 598 qApp->sendEvent(pPage, &event); 608 if (QWidget *pPage = m_pSelector->idToPage(MachineSettingsPageType_Parallel))609 qApp->sendEvent(pPage, &event);610 599 611 600 /* General page: */ … … 632 621 /* Serial page: */ 633 622 m_pSelector->setItemText(MachineSettingsPageType_Serial, tr("Serial Ports")); 634 635 /* Parallel page: */636 m_pSelector->setItemText(MachineSettingsPageType_Parallel, tr("Parallel Ports"));637 623 638 624 /* USB page: */ … … 844 830 return false; 845 831 break; 846 }847 case MachineSettingsPageType_Parallel:848 {849 /* Depends on ports availability: */850 if (!isPageAvailable(MachineSettingsPageType_Ports))851 return false;852 /* But for now this page is always disabled: */853 return false;854 832 } 855 833 case MachineSettingsPageType_USB: -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp
r66626 r68394 353 353 m_pCache->clear(); 354 354 355 /* Prepare old parallel data: */355 /* Prepare old serial data: */ 356 356 UIDataSettingsMachineSerial oldSerialData; 357 357
Note:
See TracChangeset
for help on using the changeset viewer.