Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 51993) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 51994) @@ -84,9 +84,10 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/hd_16px.png")); setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/hd_read_16px.png")); setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/hd_write_16px.png")); setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/hd_disabled_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -103,21 +104,25 @@ void updateAppearance() { - const CMachine &machine = m_session.GetMachine(); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", "

Indicates the activity " + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity " "of the virtual hard disks:%1

", "HDD tooltip"); - QString strFullData; + + /* Enumerate all the controllers: */ bool fAttachmentsPresent = false; - - const CStorageControllerVector &controllers = machine.GetStorageControllers(); - foreach (const CStorageController &controller, controllers) + foreach (const CStorageController &controller, machine.GetStorageControllers()) { QString strAttData; - const CMediumAttachmentVector &attachments = machine.GetMediumAttachmentsOfController(controller.GetName()); - foreach (const CMediumAttachment &attachment, attachments) + /* Enumerate all the attachments: */ + foreach (const CMediumAttachment &attachment, machine.GetMediumAttachmentsOfController(controller.GetName())) { + /* Skip unrelated attachments: */ if (attachment.GetType() != KDeviceType_HardDisk) continue; + /* Append attachment data: */ strAttData += QString("
 %1: %2") .arg(gpConverter->toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice()))) @@ -125,15 +130,16 @@ fAttachmentsPresent = true; } + /* Append controller data: */ if (!strAttData.isNull()) strFullData += QString("
%1").arg(controller.GetName()) + strAttData; } - /* For now we will hide that LED at all if there are no attachments! */ + /* Hide indicator if there are no attachments: */ if (!fAttachmentsPresent) - setHidden(true); - //if (!fAttachmentsPresent) - // strFullData += QApplication::translate("UIIndicatorsPool", "
No hard disks attached", "HDD tooltip"); - + hide(); + + /* Update tool-tip: */ setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ setState(fAttachmentsPresent ? KDeviceActivity_Idle : KDeviceActivity_Null); } @@ -151,9 +157,10 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/cd_16px.png")); setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/cd_read_16px.png")); setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/cd_write_16px.png")); setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/cd_disabled_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -170,22 +177,26 @@ void updateAppearance() { - const CMachine &machine = m_session.GetMachine(); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", "

Indicates the activity " + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity " "of the CD/DVD devices:%1

", "CD/DVD tooltip"); - QString strFullData; + + /* Enumerate all the controllers: */ bool fAttachmentsPresent = false; bool fAttachmentsMounted = false; - - const CStorageControllerVector &controllers = machine.GetStorageControllers(); - foreach (const CStorageController &controller, controllers) + foreach (const CStorageController &controller, machine.GetStorageControllers()) { QString strAttData; - const CMediumAttachmentVector &attachments = machine.GetMediumAttachmentsOfController(controller.GetName()); - foreach (const CMediumAttachment &attachment, attachments) + /* Enumerate all the attachments: */ + foreach (const CMediumAttachment &attachment, machine.GetMediumAttachmentsOfController(controller.GetName())) { + /* Skip unrelated attachments: */ if (attachment.GetType() != KDeviceType_DVD) continue; + /* Append attachment data: */ UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_DVD); strAttData += QString("
 %1: %2") @@ -196,15 +207,16 @@ fAttachmentsMounted = true; } + /* Append controller data: */ if (!strAttData.isNull()) strFullData += QString("
%1").arg(controller.GetName()) + strAttData; } - /* For now we will hide that LED at all if there are no attachments! */ + /* Hide indicator if there are no attachments: */ if (!fAttachmentsPresent) - setHidden(true); - //if (!fAttachmentsPresent) - // strFullData = QApplication::translate("UIIndicatorsPool", "
No CD/DVD devices attached", "CD/DVD tooltip"); - + hide(); + + /* Update tool-tip: */ setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ setState(fAttachmentsMounted ? KDeviceActivity_Idle : KDeviceActivity_Null); } @@ -222,9 +234,10 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/fd_16px.png")); setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/fd_read_16px.png")); setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/fd_write_16px.png")); setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/fd_disabled_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -241,22 +254,26 @@ void updateAppearance() { - const CMachine &machine = m_session.GetMachine(); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", "

Indicates the activity " + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity " "of the floppy devices:%1

", "FD tooltip"); - QString strFullData; + + /* Enumerate all the controllers: */ bool fAttachmentsPresent = false; bool fAttachmentsMounted = false; - - const CStorageControllerVector &controllers = machine.GetStorageControllers(); - foreach (const CStorageController &controller, controllers) + foreach (const CStorageController &controller, machine.GetStorageControllers()) { QString strAttData; - const CMediumAttachmentVector &attachments = machine.GetMediumAttachmentsOfController(controller.GetName()); - foreach (const CMediumAttachment &attachment, attachments) + /* Enumerate all the attachments: */ + foreach (const CMediumAttachment &attachment, machine.GetMediumAttachmentsOfController(controller.GetName())) { + /* Skip unrelated attachments: */ if (attachment.GetType() != KDeviceType_Floppy) continue; + /* Append attachment data: */ UIMedium vboxMedium(attachment.GetMedium(), UIMediumType_Floppy); strAttData += QString("
 %1: %2") @@ -267,16 +284,83 @@ fAttachmentsMounted = true; } + /* Append controller data: */ if (!strAttData.isNull()) strFullData += QString("
%1").arg(controller.GetName()) + strAttData; } - /* For now we will hide that LED at all if there are no attachments! */ + /* Hide indicator if there are no attachments: */ if (!fAttachmentsPresent) - setHidden(true); - //if (!fAttachmentsPresent) - // strFullData = QApplication::translate("UIIndicatorsPool", "
No floppy devices attached", "FD tooltip"); - + hide(); + + /* Update tool-tip: */ setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ setState(fAttachmentsMounted ? KDeviceActivity_Idle : KDeviceActivity_Null); + } +}; + +/** UISessionStateStatusBarIndicator extension for Runtime UI: USB indicator. */ +class UIIndicatorUSB : public UISessionStateStatusBarIndicator +{ + Q_OBJECT; + +public: + + /** Constructor, passes @a session to the UISessionStateStatusBarIndicator constructor. */ + UIIndicatorUSB(CSession &session) + : UISessionStateStatusBarIndicator(session) + { + /* Assign state-icons: */ + setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/usb_16px.png")); + setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/usb_read_16px.png")); + setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/usb_write_16px.png")); + setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/usb_disabled_16px.png")); + /* Translate finally: */ + retranslateUi(); + } + +private: + + /** Retranslation routine. */ + void retranslateUi() + { + updateAppearance(); + } + + /** Update routine. */ + void updateAppearance() + { + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity of " + "the attached USB devices:%1

", "USB device tooltip"); + QString strFullData; + + /* Check whether there is at least one USB controller with an available proxy. */ + bool fUSBEnabled = !machine.GetUSBDeviceFilters().isNull() + && !machine.GetUSBControllers().isEmpty() + && machine.GetUSBProxyAvailable(); + if (fUSBEnabled) + { + /* Enumerate all the USB devices: */ + const CConsole &console = m_session.GetConsole(); + foreach (const CUSBDevice &usbDevice, console.GetUSBDevices()) + strFullData += QString("
%1").arg(vboxGlobal().details(usbDevice)); + /* Handle 'no-usb-devices' case: */ + if (strFullData.isNull()) + strFullData = QApplication::translate("UIIndicatorsPool", "
No USB devices attached", "USB device tooltip"); + } + + /* Hide indicator if there are USB controllers: */ + if (!fUSBEnabled) + hide(); + + /* Update tool-tip: */ + setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ + setState(fUSBEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null); } }; @@ -292,14 +376,20 @@ UIIndicatorNetwork(CSession &session) : UISessionStateStatusBarIndicator(session) - , m_pUpdateTimer(new QTimer(this)) - { + , m_pTimerAutoUpdate(0) + { + /* Assign state-icons: */ setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/nw_16px.png")); setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/nw_read_16px.png")); setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/nw_write_16px.png")); setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/nw_disabled_16px.png")); - - connect(m_pUpdateTimer, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs())); - m_pUpdateTimer->start(5000); - + /* Create auto-update timer: */ + m_pTimerAutoUpdate = new QTimer(this); + if (m_pTimerAutoUpdate) + { + /* Configure auto-update timer: */ + connect(m_pTimerAutoUpdate, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs())); + m_pTimerAutoUpdate->start(5000); + } + /* Translate finally: */ retranslateUi(); } @@ -324,25 +414,25 @@ void updateAppearance() { - const CMachine &machine = m_session.GetMachine(); + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity of the " + "network interfaces:%1

", "Network adapters tooltip"); QString strFullData; - ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", - "

Indicates the activity of the " - "network interfaces:%1

", "Network adapters tooltip"); - + /* Gather adapter properties: */ RTTIMESPEC time; uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time)); - QString strFlags, strCount; LONG64 iTimestamp; machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, iTimestamp, strFlags); bool fPropsValid = (u64Now - iTimestamp < UINT64_C(60000000000)); /* timeout beacon */ - + ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(machine.GetChipsetType()); QStringList ipList, macList; if (fPropsValid) { - int cAdapters = RT_MIN(strCount.toInt(), (int)uMaxCount); + const int cAdapters = RT_MIN(strCount.toInt(), (int)uMaxCount); for (int i = 0; i < cAdapters; ++i) { @@ -352,5 +442,6 @@ } - ulong uEnabled = 0; + /* Enumerate up to uMaxCount adapters: */ + bool fAdaptersPresent = false; for (ulong uSlot = 0; uSlot < uMaxCount; ++uSlot) { @@ -358,14 +449,16 @@ if (adapter.GetEnabled()) { + fAdaptersPresent = true; QString strGuestIp; if (fPropsValid) { - QString strGuestMac = adapter.GetMACAddress(); + const QString strGuestMac = adapter.GetMACAddress(); int iIp = macList.indexOf(strGuestMac); if (iIp >= 0) strGuestIp = ipList[iIp]; } + /* Append adapter data: */ strFullData += QApplication::translate("UIIndicatorsPool", - "
Adapter %1 (%2): %3 cable %4", "Network adapters tooltip") + "
Adapter %1 (%2): %3 cable %4", "Network adapters tooltip") .arg(uSlot + 1) .arg(gpConverter->toString(adapter.GetAttachmentType())) @@ -374,83 +467,23 @@ QApplication::translate("UIIndicatorsPool", "connected", "Network adapters tooltip") : QApplication::translate("UIIndicatorsPool", "disconnected", "Network adapters tooltip")); - ++uEnabled; } } - - setState(uEnabled > 0 ? KDeviceActivity_Idle : KDeviceActivity_Null); - if (!uEnabled) - setHidden(true); - + /* Handle 'no-adapters' case: */ if (strFullData.isNull()) strFullData = QApplication::translate("UIIndicatorsPool", "
All network adapters are disabled", "Network adapters tooltip"); + /* Hide indicator if there are no enabled adapters: */ + if (!fAdaptersPresent) + hide(); + + /* Update tool-tip: */ setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ + setState(fAdaptersPresent ? KDeviceActivity_Idle : KDeviceActivity_Null); } /** Holds the auto-update timer instance. */ - QTimer *m_pUpdateTimer; -}; - -/** UISessionStateStatusBarIndicator extension for Runtime UI: USB indicator. */ -class UIIndicatorUSB : public UISessionStateStatusBarIndicator -{ - Q_OBJECT; - -public: - - /** Constructor, passes @a session to the UISessionStateStatusBarIndicator constructor. */ - UIIndicatorUSB(CSession &session) - : UISessionStateStatusBarIndicator(session) - { - setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/usb_16px.png")); - setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/usb_read_16px.png")); - setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/usb_write_16px.png")); - setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/usb_disabled_16px.png")); - - retranslateUi(); - } - -private: - - /** Retranslation routine. */ - void retranslateUi() - { - updateAppearance(); - } - - /** Update routine. */ - void updateAppearance() - { - const CMachine &machine = m_session.GetMachine(); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", "

Indicates the activity of " - "the attached USB devices:%1

", "USB device tooltip"); - QString strFullData; - - /* Check whether there is at least one USB controller with an available proxy. */ - bool fUSBEnabled = !machine.GetUSBDeviceFilters().isNull() - && !machine.GetUSBControllers().isEmpty() - && machine.GetUSBProxyAvailable(); - - setState(fUSBEnabled ? KDeviceActivity_Idle : KDeviceActivity_Null); - if (fUSBEnabled) - { - const CConsole &console = m_session.GetConsole(); - - const CUSBDeviceVector &devsvec = console.GetUSBDevices(); - for (int i = 0; i < devsvec.size(); ++ i) - { - CUSBDevice usb = devsvec[i]; - strFullData += QString("
%1").arg(vboxGlobal().details(usb)); - } - if (strFullData.isNull()) - strFullData = QApplication::translate("UIIndicatorsPool", "
No USB devices attached", "USB device tooltip"); - } - else - strFullData = QApplication::translate("UIIndicatorsPool", "
USB Controller is disabled", "USB device tooltip"); - - setToolTip(strToolTip.arg(strFullData)); - } + QTimer *m_pTimerAutoUpdate; }; @@ -466,9 +499,10 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(KDeviceActivity_Idle, UIIconPool::iconSet(":/sf_16px.png")); setStateIcon(KDeviceActivity_Reading, UIIconPool::iconSet(":/sf_read_16px.png")); setStateIcon(KDeviceActivity_Writing, UIIconPool::iconSet(":/sf_write_16px.png")); setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/sf_disabled_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -485,34 +519,25 @@ void updateAppearance() { - const CMachine &machine = m_session.GetMachine(); - const CConsole &console = m_session.GetConsole(); - - QString strToolTip = QApplication::translate("UIIndicatorsPool", "

Indicates the activity of " - "the machine's shared folders:%1

", "Shared folders tooltip"); - + /* Get machine: */ + const CMachine machine = m_session.GetMachine(); + const CConsole console = m_session.GetConsole(); + + /* Prepare tool-tip: */ + QString strToolTip = QApplication::translate("UIIndicatorsPool", + "

Indicates the activity of " + "the machine's shared folders:%1

", "Shared folders tooltip"); QString strFullData; + + /* Enumerate all the folders: */ QMap sfs; - - /* Permanent folders */ - const CSharedFolderVector &psfvec = machine.GetSharedFolders(); - - for (int i = 0; i < psfvec.size(); ++ i) - { - const CSharedFolder &sf = psfvec[i]; + foreach (const CSharedFolder &sf, machine.GetSharedFolders()) sfs.insert(sf.GetName(), sf.GetHostPath()); - } - - /* Transient folders */ - const CSharedFolderVector &tsfvec = console.GetSharedFolders(); - - for (int i = 0; i < tsfvec.size(); ++ i) - { - const CSharedFolder &sf = tsfvec[i]; + foreach (const CSharedFolder &sf, console.GetSharedFolders()) sfs.insert(sf.GetName(), sf.GetHostPath()); - } - - for (QMap::const_iterator it = sfs.constBegin(); it != sfs.constEnd(); ++ it) - { - /* Select slashes depending on the OS type */ + + /* Append attachment data: */ + for (QMap::const_iterator it = sfs.constBegin(); it != sfs.constEnd(); ++it) + { + /* Select slashes depending on the OS type: */ if (VBoxGlobal::isDOSType(console.GetGuest().GetOSTypeId())) strFullData += QString("
\\\\vboxsvr\\%1 %2") @@ -522,10 +547,12 @@ .arg(it.key(), it.value()); } - - if (sfs.count() == 0) + /* Handle 'no-folders' case: */ + if (sfs.isEmpty()) strFullData = QApplication::translate("UIIndicatorsPool", "
No shared folders", "Shared folders tooltip"); + /* Update tool-tip: */ + setToolTip(strToolTip.arg(strFullData)); + /* Update indicator state: */ setState(!sfs.isEmpty() ? KDeviceActivity_Idle : KDeviceActivity_Null); - setToolTip(strToolTip.arg(strFullData)); } }; @@ -554,13 +581,11 @@ , m_dRotationAngle(0) { - /* Assign state icons: */ + /* Assign state-icons: */ setStateIcon(UIIndicatorStateVideoCapture_Disabled, UIIconPool::iconSet(":/video_capture_16px.png")); setStateIcon(UIIndicatorStateVideoCapture_Enabled, UIIconPool::iconSet(":/movie_reel_16px.png")); - - /* Prepare *enabled* state animation: */ + /* Create *enabled* state animation: */ m_pAnimation = UIAnimationLoop::installAnimationLoop(this, "rotationAngle", "rotationAngleStart", "rotationAngleFinal", 1000); - /* Translate finally: */ retranslateUi(); @@ -623,10 +648,7 @@ { /* Get machine: */ - CMachine machine = m_session.GetMachine(); - - /* Update LED state: */ - setState(machine.GetVideoCaptureEnabled()); - - /* Update LED tool-tip: */ + const CMachine machine = m_session.GetMachine(); + + /* Prepare tool-tip: */ QString strToolTip = QApplication::translate("UIIndicatorsPool", "Indicates video capturing activity:
%1"); switch (state()) @@ -646,5 +668,9 @@ break; } + + /* Update tool-tip: */ setToolTip(strToolTip); + /* Update indicator state: */ + setState(machine.GetVideoCaptureEnabled()); } @@ -675,7 +701,8 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(0, UIIconPool::iconSet(":/vtx_amdv_disabled_16px.png")); setStateIcon(1, UIIconPool::iconSet(":/vtx_amdv_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -692,12 +719,15 @@ void updateAppearance() { - const CConsole &console = m_session.GetConsole(); + /* Get console: */ + const CConsole console = m_session.GetConsole(); if (console.isNull()) return; - const CMachineDebugger &debugger = console.GetDebugger(); + /* Get debugger: */ + const CMachineDebugger debugger = console.GetDebugger(); if (debugger.isNull()) return; + /* VT-x/AMD-V feature: */ bool bVirtEnabled = debugger.GetHWVirtExEnabled(); QString virtualization = bVirtEnabled ? @@ -705,4 +735,5 @@ VBoxGlobal::tr("Disabled", "details report (VT-x/AMD-V)"); + /* Nested Paging feature: */ bool bNestEnabled = debugger.GetHWVirtExNestedPagingEnabled(); QString nestedPaging = bNestEnabled ? @@ -710,4 +741,5 @@ VBoxGlobal::tr("Disabled", "details report (Nested Paging)"); + /* Unrestricted Execution feature: */ bool bUXEnabled = debugger.GetHWVirtExUXEnabled(); QString unrestrictExec = bUXEnabled ? @@ -715,6 +747,8 @@ VBoxGlobal::tr("Disabled", "details report (Unrestricted Execution)"); + /* CPU Execution Cap feature: */ QString strCPUExecCap = QString::number(console.GetMachine().GetCPUExecutionCap()); + /* Prepare tool-tip: */ QString tip(QApplication::translate("UIIndicatorsPool", "Additional feature status:" @@ -729,4 +763,5 @@ .arg(VBoxGlobal::tr("Execution Cap", "details report"), strCPUExecCap)); + /* CPU count: */ int cpuCount = console.GetMachine().GetCPUCount(); if (cpuCount > 1) @@ -734,5 +769,7 @@ .arg(VBoxGlobal::tr("Processor(s)", "details report")).arg(cpuCount); + /* Update tool-tip: */ setToolTip(tip); + /* Update indicator state: */ setState(bVirtEnabled); } @@ -750,4 +787,5 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(0, UIIconPool::iconSet(":/mouse_disabled_16px.png")); setStateIcon(1, UIIconPool::iconSet(":/mouse_16px.png")); @@ -755,5 +793,5 @@ setStateIcon(3, UIIconPool::iconSet(":/mouse_can_seamless_16px.png")); setStateIcon(4, UIIconPool::iconSet(":/mouse_can_seamless_uncaptured_16px.png")); - + /* Translate finally: */ retranslateUi(); } @@ -806,9 +844,10 @@ : UISessionStateStatusBarIndicator(session) { + /* Assign state-icons: */ setStateIcon(0, UIIconPool::iconSet(":/hostkey_16px.png")); setStateIcon(1, UIIconPool::iconSet(":/hostkey_captured_16px.png")); setStateIcon(2, UIIconPool::iconSet(":/hostkey_pressed_16px.png")); setStateIcon(3, UIIconPool::iconSet(":/hostkey_captured_pressed_16px.png")); - + /* Translate finally: */ retranslateUi(); }